From 91394572031b08d128984b339a4fdee421f5aa95 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Mon, 1 Apr 2024 22:11:01 +0800
Subject: [PATCH] 240401

---
 pom.xml                                       |   26 +-
 .../apps/constants/EquipmentConstants.java    |   10 -
 .../apps/constants/HualalaConstants.java      |   18 -
 .../apps/constants/SfExpressConstants.java    |   13 -
 .../apps/constants/TowerConstants.java        |   41 -
 .../apps/controller/BcAgentController.java    |  127 -
 .../apps/controller/BcCartController.java     |  217 -
 .../apps/controller/BcCookbookController.java |  139 -
 .../controller/BcEquipmentController.java     |  151 -
 .../apps/controller/BcExportController.java   |  282 -
 .../apps/controller/BcFoodController.java     |  286 -
 .../apps/controller/BcPlanController.java     |  144 -
 .../controller/BcStatisticsController.java    |  331 -
 .../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 -
 .../TowerWorksheetFrontController.java        |  712 --
 .../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   |   94 -
 .../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    |  304 -
 .../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 -
 .../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/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 -
 .../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/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 -
 .../cms/controller/ArticleController.java     |    8 +
 .../common/core/config/MybatisPlusConfig.java |   17 +-
 .../common/core/security/SecurityConfig.java  |    6 +-
 .../common/core/utils/AlipayConfigUtil.java   |  110 -
 .../common/core/web/BaseController.java       |   18 +-
 .../system/controller/AreaController.java     |  167 +
 .../system/controller/DictDataController.java |   12 +
 .../system/controller/FileController.java     |   12 +-
 .../system/controller/MainController.java     |   46 -
 .../controller/OrganizationController.java    |   11 +
 .../system/controller/UserController.java     |  216 +-
 .../system/entity/Area.java}                  |   32 +-
 .../common/system/entity/Organization.java    |    6 +
 .../gxwebsoft/common/system/entity/User.java  |   74 +-
 .../common/system/mapper/AreaMapper.java      |   37 +
 .../common/system/mapper/xml/AreaMapper.xml   |   35 +
 .../system/mapper/xml/OrganizationMapper.xml  |    9 +
 .../common/system/mapper/xml/UserMapper.xml   |   39 +
 .../system/param/AreaParam.java}              |   21 +-
 .../system/param/OrganizationParam.java       |    6 +
 .../common/system/param/UserImportParam.java  |   54 +-
 .../common/system/param/UserParam.java        |   39 +-
 .../common/system/service/AreaService.java    |   46 +
 .../system/service/DictDataService.java       |    2 +
 .../system/service/OrganizationService.java   |    2 +
 .../common/system/service/UserService.java    |    9 +
 .../system/service/impl/AreaServiceImpl.java  |   63 +
 .../service/impl/DictDataServiceImpl.java     |    6 +
 .../service/impl/OrganizationServiceImpl.java |    9 +
 .../system/service/impl/UserServiceImpl.java  |   42 +-
 .../open/controller/OpenAlipayController.java |  182 -
 .../controller/OpenBcAgentController.java     |  123 -
 .../open/controller/OpenBcController.java     |  481 --
 .../controller/OpenBcTemporaryController.java |  129 -
 .../open/controller/OpenCartController.java   |    2 +-
 .../controller/OpenEquipmentController.java   |  353 -
 .../open/controller/OpenFileController.java   |   10 +-
 .../open/controller/OpenOrderController.java  |  303 -
 .../shop/constants/OrderConstants.java        |   31 +-
 .../shop/controller/CategoryController.java   |    5 +
 .../shop/controller/GoodsController.java      |   79 +-
 .../controller/GoodsPhoneModelController.java |  134 +
 .../shop/controller/GoodsPriceController.java |  163 +
 .../shop/controller/OrderController.java      |  623 +-
 .../shop/controller/OrderGoodsController.java |    2 +-
 .../controller/OrderRefundController.java     |   13 -
 .../shop/controller/PaymentController.java    |  250 +-
 .../shop/controller/SchedulingController.java |   40 -
 .../controller/UserBalanceLogController.java  |  126 +-
 .../shop/controller/WxLoginController.java    |  402 +-
 .../shop/controller/WxPayController.java      |  220 +-
 .../java/com/gxwebsoft/shop/entity/Goods.java |   10 +
 .../shop/entity/GoodsPhoneModel.java          |   54 +
 .../com/gxwebsoft/shop/entity/GoodsPrice.java |  102 +
 .../java/com/gxwebsoft/shop/entity/Order.java |  118 +-
 .../gxwebsoft/shop/entity/OrderRefund.java    |    6 +-
 .../gxwebsoft/shop/entity/UserBalanceLog.java |   16 +-
 .../shop/mapper/GoodsPhoneModelMapper.java    |   37 +
 .../shop/mapper/GoodsPriceMapper.java         |   37 +
 .../gxwebsoft/shop/mapper/xml/GoodsMapper.xml |    6 +-
 .../mapper/xml/GoodsPhoneModelMapper.xml}     |   26 +-
 .../mapper/xml/GoodsPriceMapper.xml}          |   38 +-
 .../gxwebsoft/shop/mapper/xml/OrderMapper.xml |   53 +-
 .../param/GoodsPhoneModelParam.java}          |   24 +-
 .../param/GoodsPriceParam.java}               |   37 +-
 .../com/gxwebsoft/shop/param/OrderParam.java  |   29 +-
 .../shop/service/GoodsPhoneModelService.java  |   46 +
 .../shop/service/GoodsPriceService.java       |   44 +
 .../gxwebsoft/shop/service/GoodsService.java  |    6 +
 .../shop/service/OrderRefundService.java      |    2 +
 .../gxwebsoft/shop/service/OrderService.java  |   15 +-
 .../shop/service/PaymentService.java          |    1 -
 .../shop/service/UserBalanceLogService.java   |    3 +
 .../impl/GoodsPhoneModelServiceImpl.java      |   65 +
 .../service/impl/GoodsPriceServiceImpl.java   |   59 +
 .../shop/service/impl/GoodsServiceImpl.java   |   59 +
 .../service/impl/OrderRefundServiceImpl.java  |    9 +
 .../shop/service/impl/OrderServiceImpl.java   |  475 +-
 .../shop/service/impl/PaymentServiceImpl.java |    4 -
 .../impl/UserBalanceLogServiceImpl.java       |   19 +-
 .../controller/TowerAccessoryController.java  |  132 -
 .../controller/TowerContractController.java   |  159 -
 .../TowerContractEquipmentController.java     |  150 -
 .../TowerContractFileController.java          |  139 -
 .../TowerContractFinalSettleController.java   |  150 -
 ...owerContractFinalSettleLostController.java |  139 -
 ...owerContractSettleEquipmentController.java |  149 -
 .../TowerContractSettleRuleController.java    |  149 -
 .../controller/TowerCustomerController.java   |  139 -
 .../controller/TowerEquipmentController.java  |  349 -
 .../tower/controller/TowerFallController.java |  139 -
 .../TowerHistorySettleController.java         |  151 -
 .../controller/TowerIncomeController.java     |  195 -
 .../TowerIncomeEquipmentController.java       |  157 -
 .../controller/TowerInvoicingController.java  |  192 -
 .../TowerInvoicingSettleController.java       |  152 -
 .../controller/TowerLendingController.java    |  152 -
 .../TowerLendingSettleListController.java     |  153 -
 .../controller/TowerModelController.java      |  128 -
 .../tower/controller/TowerPartController.java |  136 -
 .../controller/TowerPartGoodsController.java  |  145 -
 .../controller/TowerPartStockController.java  |  136 -
 .../controller/TowerPlaceController.java      |  157 -
 .../TowerPlaceSafetyController.java           |  135 -
 .../TowerPlaceStandardController.java         |  129 -
 .../TowerProjectBuildingController.java       |  139 -
 .../controller/TowerProjectController.java    |  265 -
 .../TowerProjectOrderController.java          |  128 -
 .../TowerProjectPlaceController.java          |  130 -
 .../TowerProjectUserController.java           |  137 -
 .../controller/TowerPurchaseController.java   |  139 -
 .../tower/controller/TowerRentController.java |  136 -
 .../controller/TowerRentRecordController.java |  156 -
 .../controller/TowerSecurityController.java   |  184 -
 .../TowerSecurityPlantController.java         |  136 -
 .../TowerSecurityRecordController.java        |  142 -
 .../controller/TowerSettleController.java     |  158 -
 .../TowerSettleDetailController.java          |  186 -
 .../controller/TowerWarehouseController.java  |  132 -
 .../TowerWorksheetAuditController.java        |  139 -
 .../TowerWorksheetCarDispatchController.java  |  134 -
 .../TowerWorksheetCheckController.java        |  139 -
 .../controller/TowerWorksheetController.java  |  317 -
 .../TowerWorksheetDetailController.java       |  134 -
 .../TowerWorksheetPartsController.java        |  134 -
 .../TowerWorksheetSetUpController.java        |  134 -
 .../tower/entity/TowerAccessory.java          |  117 -
 .../gxwebsoft/tower/entity/TowerContract.java |  131 -
 .../tower/entity/TowerContractEquipment.java  |   94 -
 .../tower/entity/TowerContractFile.java       |   57 -
 .../entity/TowerContractFinalSettle.java      |   79 -
 .../entity/TowerContractFinalSettleLost.java  |   57 -
 .../entity/TowerContractSettleEquipment.java  |   90 -
 .../tower/entity/TowerContractSettleRule.java |   53 -
 .../gxwebsoft/tower/entity/TowerCustomer.java |   78 -
 .../tower/entity/TowerEquipment.java          |  185 -
 .../com/gxwebsoft/tower/entity/TowerFall.java |   94 -
 .../tower/entity/TowerHistorySettle.java      |  109 -
 .../gxwebsoft/tower/entity/TowerIncome.java   |  129 -
 .../tower/entity/TowerIncomeEquipment.java    |   54 -
 .../tower/entity/TowerInvoicing.java          |  110 -
 .../tower/entity/TowerInvoicingSettle.java    |   54 -
 .../gxwebsoft/tower/entity/TowerLending.java  |   84 -
 .../tower/entity/TowerLendingSettleList.java  |  124 -
 .../gxwebsoft/tower/entity/TowerModel.java    |   70 -
 .../com/gxwebsoft/tower/entity/TowerPart.java |   84 -
 .../tower/entity/TowerPartGoods.java          |  106 -
 .../tower/entity/TowerPartStock.java          |   99 -
 .../gxwebsoft/tower/entity/TowerPlace.java    |   85 -
 .../tower/entity/TowerPlaceSafety.java        |   82 -
 .../tower/entity/TowerPlaceStandard.java      |   47 -
 .../gxwebsoft/tower/entity/TowerProject.java  |  169 -
 .../tower/entity/TowerProjectOrder.java       |  109 -
 .../tower/entity/TowerProjectPlace.java       |   60 -
 .../tower/entity/TowerProjectUser.java        |   78 -
 .../gxwebsoft/tower/entity/TowerPurchase.java |   76 -
 .../com/gxwebsoft/tower/entity/TowerRent.java |  103 -
 .../tower/entity/TowerRentRecord.java         |  114 -
 .../gxwebsoft/tower/entity/TowerSecurity.java |  117 -
 .../tower/entity/TowerSecurityPlant.java      |  125 -
 .../tower/entity/TowerSecurityRecord.java     |  177 -
 .../gxwebsoft/tower/entity/TowerSettle.java   |   77 -
 .../tower/entity/TowerSettleDetail.java       |  105 -
 .../tower/entity/TowerWarehouse.java          |   88 -
 .../tower/entity/TowerWorksheet.java          |  204 -
 .../tower/entity/TowerWorksheetAudit.java     |   52 -
 .../entity/TowerWorksheetCarDispatch.java     |   50 -
 .../tower/entity/TowerWorksheetDetail.java    |  158 -
 .../tower/entity/TowerWorksheetParts.java     |   62 -
 .../tower/entity/TowerWorksheetSetUp.java     |   62 -
 .../tower/mapper/TowerAccessoryMapper.java    |   37 -
 .../mapper/TowerContractEquipmentMapper.java  |   38 -
 .../tower/mapper/TowerContractFileMapper.java |   37 -
 .../TowerContractFinalSettleLostMapper.java   |   37 -
 .../TowerContractFinalSettleMapper.java       |   38 -
 .../tower/mapper/TowerContractMapper.java     |   38 -
 .../TowerContractSettleEquipmentMapper.java   |   37 -
 .../mapper/TowerContractSettleRuleMapper.java |   37 -
 .../tower/mapper/TowerCustomerMapper.java     |   37 -
 .../tower/mapper/TowerEquipmentMapper.java    |   38 -
 .../tower/mapper/TowerFallMapper.java         |   37 -
 .../mapper/TowerHistorySettleMapper.java      |   38 -
 .../mapper/TowerIncomeEquipmentMapper.java    |   38 -
 .../tower/mapper/TowerIncomeMapper.java       |   38 -
 .../tower/mapper/TowerInvoicingMapper.java    |   38 -
 .../mapper/TowerInvoicingSettleMapper.java    |   38 -
 .../tower/mapper/TowerLendingMapper.java      |   38 -
 .../mapper/TowerLendingSettleListMapper.java  |   38 -
 .../tower/mapper/TowerModelMapper.java        |   37 -
 .../tower/mapper/TowerPartGoodsMapper.java    |   37 -
 .../tower/mapper/TowerPartMapper.java         |   37 -
 .../tower/mapper/TowerPartStockMapper.java    |   37 -
 .../tower/mapper/TowerPlaceMapper.java        |   37 -
 .../tower/mapper/TowerPlaceSafetyMapper.java  |   37 -
 .../mapper/TowerPlaceStandardMapper.java      |   37 -
 .../mapper/TowerProjectBuildingMapper.java    |   37 -
 .../tower/mapper/TowerProjectMapper.java      |   37 -
 .../tower/mapper/TowerProjectOrderMapper.java |   37 -
 .../tower/mapper/TowerProjectPlaceMapper.java |   37 -
 .../tower/mapper/TowerProjectUserMapper.java  |   37 -
 .../tower/mapper/TowerPurchaseMapper.java     |   37 -
 .../tower/mapper/TowerRentMapper.java         |   37 -
 .../tower/mapper/TowerRentRecordMapper.java   |   38 -
 .../tower/mapper/TowerSecurityMapper.java     |   37 -
 .../mapper/TowerSecurityPlantMapper.java      |   37 -
 .../mapper/TowerSecurityRecordMapper.java     |   37 -
 .../tower/mapper/TowerSettleDetailMapper.java |   37 -
 .../tower/mapper/TowerSettleMapper.java       |   37 -
 .../tower/mapper/TowerWarehouseMapper.java    |   37 -
 .../mapper/TowerWorksheetAuditMapper.java     |   37 -
 .../TowerWorksheetCarDispatchMapper.java      |   37 -
 .../mapper/TowerWorksheetCheckMapper.java     |   38 -
 .../mapper/TowerWorksheetDetailMapper.java    |   38 -
 .../tower/mapper/TowerWorksheetMapper.java    |   38 -
 .../mapper/TowerWorksheetPartsMapper.java     |   37 -
 .../mapper/TowerWorksheetSetUpMapper.java     |   37 -
 .../tower/mapper/xml/TowerAccessoryMapper.xml |   96 -
 .../xml/TowerContractEquipmentMapper.xml      |   74 -
 .../TowerContractFinalSettleLostMapper.xml    |   53 -
 .../xml/TowerContractFinalSettleMapper.xml    |   56 -
 .../tower/mapper/xml/TowerContractMapper.xml  |   92 -
 .../TowerContractSettleEquipmentMapper.xml    |   74 -
 .../xml/TowerContractSettleRuleMapper.xml     |   50 -
 .../tower/mapper/xml/TowerCustomerMapper.xml  |   80 -
 .../tower/mapper/xml/TowerEquipmentMapper.xml |  120 -
 .../tower/mapper/xml/TowerFallMapper.xml      |   88 -
 .../mapper/xml/TowerHistorySettleMapper.xml   |   80 -
 .../mapper/xml/TowerIncomeEquipmentMapper.xml |   50 -
 .../tower/mapper/xml/TowerIncomeMapper.xml    |   80 -
 .../tower/mapper/xml/TowerInvoicingMapper.xml |   68 -
 .../mapper/xml/TowerInvoicingSettleMapper.xml |   50 -
 .../tower/mapper/xml/TowerLendingMapper.xml   |   59 -
 .../xml/TowerLendingSettleListMapper.xml      |   98 -
 .../tower/mapper/xml/TowerModelMapper.xml     |   71 -
 .../tower/mapper/xml/TowerPartGoodsMapper.xml |   76 -
 .../tower/mapper/xml/TowerPartMapper.xml      |   77 -
 .../tower/mapper/xml/TowerPartStockMapper.xml |   81 -
 .../tower/mapper/xml/TowerPlaceMapper.xml     |   83 -
 .../mapper/xml/TowerPlaceSafetyMapper.xml     |   77 -
 .../mapper/xml/TowerPlaceStandardMapper.xml   |   44 -
 .../tower/mapper/xml/TowerProjectMapper.xml   |  107 -
 .../mapper/xml/TowerProjectOrderMapper.xml    |   77 -
 .../mapper/xml/TowerProjectPlaceMapper.xml    |   50 -
 .../mapper/xml/TowerProjectUserMapper.xml     |   55 -
 .../tower/mapper/xml/TowerPurchaseMapper.xml  |   59 -
 .../tower/mapper/xml/TowerRentMapper.xml      |   87 -
 .../mapper/xml/TowerRentRecordMapper.xml      |   77 -
 .../mapper/xml/TowerSecurityPlantMapper.xml   |   82 -
 .../mapper/xml/TowerSecurityRecordMapper.xml  |  160 -
 .../mapper/xml/TowerSettleDetailMapper.xml    |   83 -
 .../tower/mapper/xml/TowerSettleMapper.xml    |   62 -
 .../tower/mapper/xml/TowerWarehouseMapper.xml |   87 -
 .../xml/TowerWorksheetCarDispatchMapper.xml   |   50 -
 .../mapper/xml/TowerWorksheetCheckMapper.xml  |   59 -
 .../mapper/xml/TowerWorksheetDetailMapper.xml |  104 -
 .../tower/mapper/xml/TowerWorksheetMapper.xml |   65 -
 .../mapper/xml/TowerWorksheetPartsMapper.xml  |   50 -
 .../mapper/xml/TowerWorksheetSetUpMapper.xml  |   59 -
 .../tower/param/TowerAccessoryParam.java      |   90 -
 .../param/TowerContractEquipmentParam.java    |   78 -
 .../param/TowerContractFinalSettleParam.java  |   53 -
 .../tower/param/TowerContractParam.java       |   93 -
 .../TowerContractSettleEquipmentParam.java    |   75 -
 .../tower/param/TowerCustomerParam.java       |   66 -
 .../tower/param/TowerEquipmentParam.java      |  130 -
 .../gxwebsoft/tower/param/TowerFallParam.java |   78 -
 .../tower/param/TowerHistorySettleParam.java  |   87 -
 .../param/TowerIncomeEquipmentParam.java      |   50 -
 .../tower/param/TowerIncomeParam.java         |   82 -
 .../tower/param/TowerInvoicingParam.java      |   68 -
 .../param/TowerInvoicingSettleParam.java      |   50 -
 .../tower/param/TowerLendingParam.java        |   58 -
 .../param/TowerLendingSettleListParam.java    |  109 -
 .../tower/param/TowerModelParam.java          |   64 -
 .../tower/param/TowerPartGoodsParam.java      |   70 -
 .../gxwebsoft/tower/param/TowerPartParam.java |   82 -
 .../tower/param/TowerPartStockParam.java      |   86 -
 .../tower/param/TowerPlaceParam.java          |   81 -
 .../tower/param/TowerPlaceSafetyParam.java    |   76 -
 .../tower/param/TowerPlaceStandardParam.java  |   42 -
 .../tower/param/TowerProjectOrderParam.java   |   87 -
 .../tower/param/TowerProjectParam.java        |  145 -
 .../tower/param/TowerProjectPlaceParam.java   |   54 -
 .../tower/param/TowerProjectUserParam.java    |   66 -
 .../tower/param/TowerPurchaseParam.java       |   60 -
 .../gxwebsoft/tower/param/TowerRentParam.java |  100 -
 .../tower/param/TowerRentRecordParam.java     |   77 -
 .../tower/param/TowerSecurityParam.java       |   81 -
 .../tower/param/TowerSecurityPlantParam.java  |   79 -
 .../tower/param/TowerSecurityRecordParam.java |  157 -
 .../tower/param/TowerSettleDetailParam.java   |   86 -
 .../tower/param/TowerSettleParam.java         |   61 -
 .../tower/param/TowerWarehouseParam.java      |   77 -
 .../param/TowerWorksheetCarDispatchParam.java |   41 -
 .../param/TowerWorksheetDetailParam.java      |  113 -
 .../tower/param/TowerWorksheetParam.java      |   69 -
 .../tower/param/TowerWorksheetPartsParam.java |   47 -
 .../tower/param/TowerWorksheetSetUpParam.java |   61 -
 .../tower/service/TowerAccessoryService.java  |   42 -
 .../TowerContractEquipmentService.java        |   42 -
 .../service/TowerContractFileService.java     |   42 -
 .../TowerContractFinalSettleLostService.java  |   42 -
 .../TowerContractFinalSettleService.java      |   42 -
 .../tower/service/TowerContractService.java   |   42 -
 .../TowerContractSettleEquipmentService.java  |   42 -
 .../TowerContractSettleRuleService.java       |   42 -
 .../tower/service/TowerCustomerService.java   |   42 -
 .../tower/service/TowerEquipmentService.java  |   42 -
 .../tower/service/TowerFallService.java       |   42 -
 .../service/TowerHistorySettleService.java    |   42 -
 .../service/TowerIncomeEquipmentService.java  |   42 -
 .../tower/service/TowerIncomeService.java     |   42 -
 .../tower/service/TowerInvoicingService.java  |   42 -
 .../service/TowerInvoicingSettleService.java  |   42 -
 .../tower/service/TowerLendingService.java    |   42 -
 .../TowerLendingSettleListService.java        |   42 -
 .../tower/service/TowerModelService.java      |   42 -
 .../tower/service/TowerPartGoodsService.java  |   42 -
 .../tower/service/TowerPartService.java       |   42 -
 .../tower/service/TowerPartStockService.java  |   42 -
 .../service/TowerPlaceSafetyService.java      |   42 -
 .../tower/service/TowerPlaceService.java      |   42 -
 .../service/TowerPlaceStandardService.java    |   42 -
 .../service/TowerProjectBuildingService.java  |   42 -
 .../service/TowerProjectOrderService.java     |   42 -
 .../service/TowerProjectPlaceService.java     |   42 -
 .../tower/service/TowerProjectService.java    |   42 -
 .../service/TowerProjectUserService.java      |   42 -
 .../tower/service/TowerPurchaseService.java   |   42 -
 .../tower/service/TowerRentRecordService.java |   42 -
 .../tower/service/TowerRentService.java       |   42 -
 .../service/TowerSecurityPlantService.java    |   42 -
 .../service/TowerSecurityRecordService.java   |   42 -
 .../tower/service/TowerSecurityService.java   |   42 -
 .../service/TowerSettleDetailService.java     |   42 -
 .../tower/service/TowerSettleService.java     |   42 -
 .../tower/service/TowerWarehouseService.java  |   42 -
 .../service/TowerWorksheetAuditService.java   |   42 -
 .../TowerWorksheetCarDispatchService.java     |   42 -
 .../service/TowerWorksheetCheckService.java   |   42 -
 .../service/TowerWorksheetDetailService.java  |   42 -
 .../service/TowerWorksheetPartsService.java   |   42 -
 .../tower/service/TowerWorksheetService.java  |   42 -
 .../service/TowerWorksheetSetUpService.java   |   42 -
 .../impl/TowerAccessoryServiceImpl.java       |   47 -
 .../TowerContractEquipmentServiceImpl.java    |   47 -
 .../impl/TowerContractFileServiceImpl.java    |   47 -
 ...werContractFinalSettleLostServiceImpl.java |   47 -
 .../TowerContractFinalSettleServiceImpl.java  |   47 -
 .../impl/TowerContractServiceImpl.java        |   47 -
 ...werContractSettleEquipmentServiceImpl.java |   47 -
 .../TowerContractSettleRuleServiceImpl.java   |   47 -
 .../impl/TowerCustomerServiceImpl.java        |   47 -
 .../impl/TowerEquipmentServiceImpl.java       |   47 -
 .../service/impl/TowerFallServiceImpl.java    |   47 -
 .../impl/TowerHistorySettleServiceImpl.java   |   47 -
 .../impl/TowerIncomeEquipmentServiceImpl.java |   47 -
 .../service/impl/TowerIncomeServiceImpl.java  |   47 -
 .../impl/TowerInvoicingServiceImpl.java       |   47 -
 .../impl/TowerInvoicingSettleServiceImpl.java |   47 -
 .../service/impl/TowerLendingServiceImpl.java |   47 -
 .../TowerLendingSettleListServiceImpl.java    |   47 -
 .../service/impl/TowerModelServiceImpl.java   |   47 -
 .../impl/TowerPartGoodsServiceImpl.java       |   47 -
 .../service/impl/TowerPartServiceImpl.java    |   47 -
 .../impl/TowerPartStockServiceImpl.java       |   47 -
 .../impl/TowerPlaceSafetyServiceImpl.java     |   47 -
 .../service/impl/TowerPlaceServiceImpl.java   |   47 -
 .../impl/TowerPlaceStandardServiceImpl.java   |   47 -
 .../impl/TowerProjectBuildingServiceImpl.java |   47 -
 .../impl/TowerProjectOrderServiceImpl.java    |   47 -
 .../impl/TowerProjectPlaceServiceImpl.java    |   47 -
 .../service/impl/TowerProjectServiceImpl.java |   47 -
 .../impl/TowerProjectUserServiceImpl.java     |   47 -
 .../impl/TowerPurchaseServiceImpl.java        |   47 -
 .../impl/TowerRentRecordServiceImpl.java      |   47 -
 .../service/impl/TowerRentServiceImpl.java    |   47 -
 .../impl/TowerSecurityPlantServiceImpl.java   |   47 -
 .../impl/TowerSecurityRecordServiceImpl.java  |   47 -
 .../impl/TowerSecurityServiceImpl.java        |   47 -
 .../impl/TowerSettleDetailServiceImpl.java    |   47 -
 .../service/impl/TowerSettleServiceImpl.java  |   47 -
 .../impl/TowerWarehouseServiceImpl.java       |   47 -
 .../impl/TowerWorksheetAuditServiceImpl.java  |   47 -
 .../TowerWorksheetCarDispatchServiceImpl.java |   47 -
 .../impl/TowerWorksheetCheckServiceImpl.java  |   47 -
 .../impl/TowerWorksheetDetailServiceImpl.java |   47 -
 .../impl/TowerWorksheetPartsServiceImpl.java  |   47 -
 .../impl/TowerWorksheetServiceImpl.java       |   47 -
 .../impl/TowerWorksheetSetUpServiceImpl.java  |   47 -
 .../vivo/controller/DataController.java       |  135 +
 .../controller/VivoFixStoreController.java    |  151 +
 .../controller/VivoPayCodeController.java     |  148 +
 .../controller/VivoPhoneModelController.java  |  203 +
 .../vivo/controller/VivoStoreController.java  |  149 +
 .../gxwebsoft/vivo/entity/VivoFixStore.java   |   73 +
 .../entity/VivoPayCode.java}                  |   45 +-
 .../gxwebsoft/vivo/entity/VivoPhoneModel.java |   63 +
 .../entity/VivoStore.java}                    |   47 +-
 .../vivo/mapper/VivoFixStoreMapper.java       |   37 +
 .../vivo/mapper/VivoPayCodeMapper.java        |   37 +
 .../vivo/mapper/VivoPhoneModelMapper.java     |   37 +
 .../vivo/mapper/VivoStoreMapper.java          |   37 +
 .../mapper/xml/VivoFixStoreMapper.xml}        |   41 +-
 .../mapper/xml/VivoPayCodeMapper.xml}         |   27 +-
 .../mapper/xml/VivoPhoneModelMapper.xml}      |   31 +-
 .../mapper/xml/VivoStoreMapper.xml}           |   58 +-
 .../param/VivoFixStoreParam.java}             |   42 +-
 .../param/VivoPayCodeParam.java}              |   25 +-
 .../param/VivoPhoneModelParam.java}           |   31 +-
 .../param/VivoStoreParam.java}                |   39 +-
 .../vivo/service/VivoFixStoreService.java     |   49 +
 .../vivo/service/VivoPayCodeService.java      |   44 +
 .../vivo/service/VivoPhoneModelService.java   |   46 +
 .../vivo/service/VivoStoreService.java        |   46 +
 .../service/impl/VivoFixStoreServiceImpl.java |   86 +
 .../service/impl/VivoPayCodeServiceImpl.java  |   56 +
 .../impl/VivoPhoneModelServiceImpl.java       |   64 +
 .../service/impl/VivoStoreServiceImpl.java    |   64 +
 src/main/resources/application-dev.yml        |   15 +-
 src/main/resources/application-prod.yml       |   16 +-
 src/main/resources/application.yml            |   15 +-
 src/main/resources/cert/alipayPublicCert.crt  |   38 -
 src/main/resources/cert/alipayRootCert.crt    |   88 -
 src/main/resources/cert/apiclient_cert.p12    |  Bin 0 -> 2718 bytes
 src/main/resources/cert/apiclient_cert.pem    |   24 +
 src/main/resources/cert/apiclient_key.pem     |   28 +
 .../resources/cert/backup/apiclient_cert.p12  |  Bin 0 -> 2774 bytes
 .../resources/cert/backup/apiclient_cert.pem  |   25 +
 .../resources/cert/backup/apiclient_key.pem   |   28 +
 ...C92BA528729B58B39CC69E58D3855EACFF9DC4.pem |   24 +
 ...3231584E93B6AE77820074D07EADEACCB7E223.pem |   24 +
 src/test/java/com/gxwebsoft/TestMain.java     |   12 -
 .../gxwebsoft/generator/ShopGenerator.java    |   10 +-
 .../com/gxwebsoft/generator/SysGenerator.java |    8 +-
 ...TowerGenerator.java => VivoGenerator.java} |   44 +-
 websoft-api.log                               | 5850 +----------------
 622 files changed, 5520 insertions(+), 48434 deletions(-)
 delete mode 100644 src/main/java/com/gxwebsoft/apps/constants/EquipmentConstants.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/constants/HualalaConstants.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/constants/SfExpressConstants.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/constants/TowerConstants.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/BcAgentController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/BcCartController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/BcCookbookController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/BcEquipmentController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/BcExportController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/BcFoodController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/BcPlanController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/BcStatisticsController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/BcTemporaryController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/CashierController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/EquipmentAlarmController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/EquipmentController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/EquipmentFaultController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/EquipmentGoodsController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/EquipmentOrderController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/EquipmentOrderGoodsController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/EquipmentRecordController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/HualalaCardBenefitsController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/HualalaCardController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/HualalaCart.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/HualalaCartFoodController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/HualalaController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/HualalaFoodCategoryController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/HualalaFoodController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/HualalaShopController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/LinkController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/SfExpress.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/TestDataController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/controller/TowerWorksheetFrontController.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/BcAgent.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/BcCart.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/BcCookbook.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/BcEquipment.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/BcExport.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/BcFood.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/BcPlan.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/BcTemporary.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/Cashier.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/Equipment.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/EquipmentAlarm.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/EquipmentFault.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/EquipmentGoods.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/EquipmentOrder.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/EquipmentOrderGoods.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/EquipmentRecord.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/Hualala.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/HualalaCard.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/HualalaCardBenefits.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/HualalaCart.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/HualalaCartFood.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/HualalaFood.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/HualalaFoodCategory.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/HualalaShop.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/ItemVo.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/entity/Link.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/BcAgentMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/BcCookbookMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/BcEquipmentMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/BcExportMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/BcFoodMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/BcPlanMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/BcTemporaryMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/CashierMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/EquipmentAlarmMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/EquipmentFaultMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/EquipmentGoodsMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/EquipmentMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/EquipmentOrderGoodsMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/EquipmentOrderMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/EquipmentRecordMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/HualalaCardBenefitsMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/HualalaCardMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/HualalaCartFoodMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/HualalaFoodCategoryMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/HualalaFoodMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/HualalaMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/HualalaShopMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/LinkMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/TestDataMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/BcAgentMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/BcEquipmentMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/BcExportMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/BcFoodMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/BcPlanMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/BcTemporaryMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/CashierMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentAlarmMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentFaultMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentGoodsMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentOrderGoodsMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentOrderMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentRecordMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCardMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCartFoodMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaFoodCategoryMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaFoodMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaShopMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/LinkMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/TestDataMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/apps/param/BcAgentParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/param/BcCookbookParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/param/BcEquipmentParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/param/BcExportParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/param/BcFoodParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/param/BcPlanParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/param/BcTemporaryParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/param/CashierParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/param/EquipmentAlarmParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/param/EquipmentFaultParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/param/EquipmentGoodsParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/param/EquipmentOrderGoodsParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/param/EquipmentOrderParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/param/EquipmentParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/param/EquipmentRecordParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/param/HualalaCardBenefitsParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/param/HualalaCardParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/param/HualalaCartFoodParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/param/HualalaFoodCategoryParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/param/HualalaFoodParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/param/HualalaParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/param/HualalaShopParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/param/HxzParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/param/LinkParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/result/AllShopResult.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/result/CartResult.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/result/FoodCategoryResult.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/result/OpenFoodResult.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/result/OperateVo.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/result/ShopBaseInfoResult.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/BcAgentService.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/BcCookbookService.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/BcEquipmentService.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/BcExportService.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/BcFoodService.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/BcPlanService.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/BcTemporaryService.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/CashierService.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/EquipmentAlarmService.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/EquipmentFaultService.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/EquipmentGoodsService.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/EquipmentOrderGoodsService.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/EquipmentOrderService.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/EquipmentRecordService.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/EquipmentService.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/HualalaCardBenefitsService.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/HualalaCardService.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/HualalaCartFoodService.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/HualalaFoodCategoryService.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/HualalaFoodService.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/HualalaService.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/HualalaShopService.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/LinkService.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/TestDataService.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/BcAgentServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/BcCookbookServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/BcEquipmentServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/BcExportServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/BcFoodServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/BcPlanServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/BcTemporaryServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/CashierServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/EquipmentAlarmServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/EquipmentFaultServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/EquipmentGoodsServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/EquipmentOrderGoodsServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/EquipmentOrderServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/EquipmentRecordServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/EquipmentServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/HualalaCardBenefitsServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/HualalaCardServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/HualalaCartFoodServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/HualalaFoodCategoryServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/HualalaFoodServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/HualalaServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/HualalaShopServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/LinkServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/TestDataServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/apps/utils/BcUtil.java
 delete mode 100644 src/main/java/com/gxwebsoft/common/core/utils/AlipayConfigUtil.java
 create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/AreaController.java
 rename src/main/java/com/gxwebsoft/{apps/entity/TestData.java => common/system/entity/Area.java} (50%)
 create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/AreaMapper.java
 create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/AreaMapper.xml
 rename src/main/java/com/gxwebsoft/{apps/param/TestDataParam.java => common/system/param/AreaParam.java} (59%)
 create mode 100644 src/main/java/com/gxwebsoft/common/system/service/AreaService.java
 create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/AreaServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenAlipayController.java
 delete mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenBcAgentController.java
 delete mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenBcController.java
 delete mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenBcTemporaryController.java
 delete mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java
 delete mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenOrderController.java
 create mode 100644 src/main/java/com/gxwebsoft/shop/controller/GoodsPhoneModelController.java
 create mode 100644 src/main/java/com/gxwebsoft/shop/controller/GoodsPriceController.java
 create mode 100644 src/main/java/com/gxwebsoft/shop/entity/GoodsPhoneModel.java
 create mode 100644 src/main/java/com/gxwebsoft/shop/entity/GoodsPrice.java
 create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/GoodsPhoneModelMapper.java
 create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/GoodsPriceMapper.java
 rename src/main/java/com/gxwebsoft/{tower/mapper/xml/TowerProjectBuildingMapper.xml => shop/mapper/xml/GoodsPhoneModelMapper.xml} (59%)
 rename src/main/java/com/gxwebsoft/{apps/mapper/xml/BcCookbookMapper.xml => shop/mapper/xml/GoodsPriceMapper.xml} (57%)
 rename src/main/java/com/gxwebsoft/{tower/param/TowerProjectBuildingParam.java => shop/param/GoodsPhoneModelParam.java} (62%)
 rename src/main/java/com/gxwebsoft/{tower/param/TowerContractFinalSettleLostParam.java => shop/param/GoodsPriceParam.java} (60%)
 create mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsPhoneModelService.java
 create mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsPriceService.java
 create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsPhoneModelServiceImpl.java
 create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsPriceServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerAccessoryController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerContractController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerContractEquipmentController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerContractFileController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerContractFinalSettleController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerContractFinalSettleLostController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerContractSettleEquipmentController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerContractSettleRuleController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerCustomerController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerEquipmentController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerFallController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerHistorySettleController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerIncomeController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerIncomeEquipmentController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerInvoicingController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerInvoicingSettleController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerLendingController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerLendingSettleListController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerModelController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerPartController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerPartGoodsController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerPartStockController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerPlaceController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerPlaceSafetyController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerPlaceStandardController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerProjectBuildingController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerProjectController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerProjectOrderController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerProjectPlaceController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerProjectUserController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerPurchaseController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerRentController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerRentRecordController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerSecurityController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerSecurityPlantController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerSecurityRecordController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerSettleController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerSettleDetailController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerWarehouseController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetAuditController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetCarDispatchController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetCheckController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetDetailController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetPartsController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetSetUpController.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerAccessory.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerContract.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerContractEquipment.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerContractFile.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerContractFinalSettle.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerContractFinalSettleLost.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerContractSettleEquipment.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerContractSettleRule.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerCustomer.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerEquipment.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerFall.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerHistorySettle.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerIncome.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerIncomeEquipment.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerInvoicing.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerInvoicingSettle.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerLending.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerLendingSettleList.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerModel.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerPart.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerPartGoods.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerPartStock.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerPlace.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerPlaceSafety.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerPlaceStandard.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerProject.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerProjectOrder.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerProjectPlace.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerProjectUser.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerPurchase.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerRent.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerRentRecord.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerSecurity.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerSecurityPlant.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerSecurityRecord.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerSettle.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerSettleDetail.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerWarehouse.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerWorksheet.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerWorksheetAudit.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerWorksheetCarDispatch.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerWorksheetDetail.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerWorksheetParts.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerWorksheetSetUp.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerAccessoryMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerContractEquipmentMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerContractFileMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerContractFinalSettleLostMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerContractFinalSettleMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerContractMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerContractSettleEquipmentMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerContractSettleRuleMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerCustomerMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerEquipmentMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerFallMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerHistorySettleMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerIncomeEquipmentMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerIncomeMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerInvoicingMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerInvoicingSettleMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerLendingMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerLendingSettleListMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerModelMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerPartGoodsMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerPartMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerPartStockMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceSafetyMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceStandardMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerProjectBuildingMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerProjectMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerProjectOrderMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerProjectPlaceMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerProjectUserMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerPurchaseMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerRentMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerRentRecordMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerSecurityMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerSecurityPlantMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerSecurityRecordMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerSettleDetailMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerSettleMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerWarehouseMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetAuditMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetCarDispatchMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetCheckMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetDetailMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetPartsMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetSetUpMapper.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerAccessoryMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractEquipmentMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractFinalSettleLostMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractFinalSettleMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractSettleEquipmentMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractSettleRuleMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerCustomerMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerEquipmentMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerFallMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerHistorySettleMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerIncomeEquipmentMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerIncomeMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerInvoicingMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerInvoicingSettleMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerLendingMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerLendingSettleListMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerModelMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPartGoodsMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPartMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPartStockMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceSafetyMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceStandardMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectOrderMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectPlaceMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectUserMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPurchaseMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerRentMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerRentRecordMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSecurityPlantMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSecurityRecordMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSettleDetailMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSettleMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWarehouseMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetCarDispatchMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetCheckMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetDetailMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetPartsMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetSetUpMapper.xml
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerAccessoryParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerContractEquipmentParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerContractFinalSettleParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerContractParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerContractSettleEquipmentParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerCustomerParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerEquipmentParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerFallParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerHistorySettleParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerIncomeEquipmentParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerIncomeParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerInvoicingParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerInvoicingSettleParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerLendingParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerLendingSettleListParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerModelParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerPartGoodsParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerPartParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerPartStockParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerPlaceParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerPlaceSafetyParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerPlaceStandardParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerProjectOrderParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerProjectParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerProjectPlaceParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerProjectUserParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerPurchaseParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerRentParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerRentRecordParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerSecurityParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerSecurityPlantParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerSecurityRecordParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerSettleDetailParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerSettleParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerWarehouseParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerWorksheetCarDispatchParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerWorksheetDetailParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerWorksheetParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerWorksheetPartsParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerWorksheetSetUpParam.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerAccessoryService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerContractEquipmentService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerContractFileService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerContractFinalSettleLostService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerContractFinalSettleService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerContractService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerContractSettleEquipmentService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerContractSettleRuleService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerCustomerService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerEquipmentService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerFallService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerHistorySettleService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerIncomeEquipmentService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerIncomeService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerInvoicingService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerInvoicingSettleService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerLendingService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerLendingSettleListService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerModelService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerPartGoodsService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerPartService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerPartStockService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerPlaceSafetyService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerPlaceService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerPlaceStandardService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerProjectBuildingService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerProjectOrderService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerProjectPlaceService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerProjectService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerProjectUserService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerPurchaseService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerRentRecordService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerRentService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerSecurityPlantService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerSecurityRecordService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerSecurityService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerSettleDetailService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerSettleService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerWarehouseService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerWorksheetAuditService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerWorksheetCarDispatchService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerWorksheetCheckService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerWorksheetDetailService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerWorksheetPartsService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerWorksheetService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerWorksheetSetUpService.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerAccessoryServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerContractEquipmentServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerContractFileServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerContractFinalSettleLostServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerContractFinalSettleServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerContractServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerContractSettleEquipmentServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerContractSettleRuleServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerCustomerServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerEquipmentServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerFallServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerHistorySettleServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerIncomeEquipmentServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerIncomeServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerInvoicingServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerInvoicingSettleServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerLendingServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerLendingSettleListServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerModelServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerPartGoodsServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerPartServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerPartStockServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceSafetyServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceStandardServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectBuildingServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectOrderServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectPlaceServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectUserServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerPurchaseServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerRentRecordServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerRentServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityPlantServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityRecordServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerSettleDetailServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerSettleServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerWarehouseServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetAuditServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetCarDispatchServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetCheckServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetDetailServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetPartsServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetServiceImpl.java
 delete mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetSetUpServiceImpl.java
 create mode 100644 src/main/java/com/gxwebsoft/vivo/controller/DataController.java
 create mode 100644 src/main/java/com/gxwebsoft/vivo/controller/VivoFixStoreController.java
 create mode 100644 src/main/java/com/gxwebsoft/vivo/controller/VivoPayCodeController.java
 create mode 100644 src/main/java/com/gxwebsoft/vivo/controller/VivoPhoneModelController.java
 create mode 100644 src/main/java/com/gxwebsoft/vivo/controller/VivoStoreController.java
 create mode 100644 src/main/java/com/gxwebsoft/vivo/entity/VivoFixStore.java
 rename src/main/java/com/gxwebsoft/{tower/entity/TowerWorksheetCheck.java => vivo/entity/VivoPayCode.java} (55%)
 create mode 100644 src/main/java/com/gxwebsoft/vivo/entity/VivoPhoneModel.java
 rename src/main/java/com/gxwebsoft/{tower/entity/TowerProjectBuilding.java => vivo/entity/VivoStore.java} (51%)
 create mode 100644 src/main/java/com/gxwebsoft/vivo/mapper/VivoFixStoreMapper.java
 create mode 100644 src/main/java/com/gxwebsoft/vivo/mapper/VivoPayCodeMapper.java
 create mode 100644 src/main/java/com/gxwebsoft/vivo/mapper/VivoPhoneModelMapper.java
 create mode 100644 src/main/java/com/gxwebsoft/vivo/mapper/VivoStoreMapper.java
 rename src/main/java/com/gxwebsoft/{apps/mapper/xml/HualalaCardBenefitsMapper.xml => vivo/mapper/xml/VivoFixStoreMapper.xml} (52%)
 rename src/main/java/com/gxwebsoft/{tower/mapper/xml/TowerContractFileMapper.xml => vivo/mapper/xml/VivoPayCodeMapper.xml} (59%)
 rename src/main/java/com/gxwebsoft/{tower/mapper/xml/TowerWorksheetAuditMapper.xml => vivo/mapper/xml/VivoPhoneModelMapper.xml} (53%)
 rename src/main/java/com/gxwebsoft/{tower/mapper/xml/TowerSecurityMapper.xml => vivo/mapper/xml/VivoStoreMapper.xml} (51%)
 rename src/main/java/com/gxwebsoft/{tower/param/TowerContractSettleRuleParam.java => vivo/param/VivoFixStoreParam.java} (53%)
 rename src/main/java/com/gxwebsoft/{tower/param/TowerContractFileParam.java => vivo/param/VivoPayCodeParam.java} (60%)
 rename src/main/java/com/gxwebsoft/{tower/param/TowerWorksheetAuditParam.java => vivo/param/VivoPhoneModelParam.java} (56%)
 rename src/main/java/com/gxwebsoft/{tower/param/TowerWorksheetCheckParam.java => vivo/param/VivoStoreParam.java} (56%)
 create mode 100644 src/main/java/com/gxwebsoft/vivo/service/VivoFixStoreService.java
 create mode 100644 src/main/java/com/gxwebsoft/vivo/service/VivoPayCodeService.java
 create mode 100644 src/main/java/com/gxwebsoft/vivo/service/VivoPhoneModelService.java
 create mode 100644 src/main/java/com/gxwebsoft/vivo/service/VivoStoreService.java
 create mode 100644 src/main/java/com/gxwebsoft/vivo/service/impl/VivoFixStoreServiceImpl.java
 create mode 100644 src/main/java/com/gxwebsoft/vivo/service/impl/VivoPayCodeServiceImpl.java
 create mode 100644 src/main/java/com/gxwebsoft/vivo/service/impl/VivoPhoneModelServiceImpl.java
 create mode 100644 src/main/java/com/gxwebsoft/vivo/service/impl/VivoStoreServiceImpl.java
 delete mode 100644 src/main/resources/cert/alipayPublicCert.crt
 delete mode 100644 src/main/resources/cert/alipayRootCert.crt
 create mode 100644 src/main/resources/cert/apiclient_cert.p12
 create mode 100644 src/main/resources/cert/apiclient_cert.pem
 create mode 100644 src/main/resources/cert/apiclient_key.pem
 create mode 100755 src/main/resources/cert/backup/apiclient_cert.p12
 create mode 100755 src/main/resources/cert/backup/apiclient_cert.pem
 create mode 100755 src/main/resources/cert/backup/apiclient_key.pem
 create mode 100644 src/main/resources/cert/wechatpay_0BC92BA528729B58B39CC69E58D3855EACFF9DC4.pem
 create mode 100644 src/main/resources/cert/wechatpay_4A3231584E93B6AE77820074D07EADEACCB7E223.pem
 rename src/test/java/com/gxwebsoft/generator/{TowerGenerator.java => VivoGenerator.java} (81%)

diff --git a/pom.xml b/pom.xml
index 07d6e70..d015e8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,17 +104,17 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-core</artifactId>
-            <version>5.8.11</version>
+            <version>5.8.25</version>
         </dependency>
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-extra</artifactId>
-            <version>5.8.11</version>
+            <version>5.8.25</version>
         </dependency>
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-http</artifactId>
-            <version>5.8.11</version>
+            <version>5.8.16</version>
         </dependency>
         <dependency>
             <groupId>cn.hutool</groupId>
@@ -194,18 +194,6 @@
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
 
-        <!--  阿里SDK  -->
-        <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>aliyun-java-sdk-core</artifactId>
-            <version>4.4.3</version>
-        </dependency>
-        <!--阿里支付 老版本 SDK-->
-        <dependency>
-            <groupId>com.alipay.sdk</groupId>
-            <artifactId>alipay-sdk-java</artifactId>
-            <version>4.35.0.ALL</version>
-        </dependency>
         <!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on -->
         <dependency>
             <groupId>org.bouncycastle</groupId>
@@ -248,7 +236,13 @@
         <dependency>
             <groupId>com.github.binarywang</groupId>
             <artifactId>weixin-java-miniapp</artifactId>
-            <version>4.5.0</version>
+            <version>4.6.0</version>
+        </dependency>
+        <!--微信支付-->
+        <dependency>
+            <groupId>com.github.wechatpay-apiv3</groupId>
+            <artifactId>wechatpay-java</artifactId>
+            <version>0.2.12</version>
         </dependency>
     </dependencies>
 
diff --git a/src/main/java/com/gxwebsoft/apps/constants/EquipmentConstants.java b/src/main/java/com/gxwebsoft/apps/constants/EquipmentConstants.java
deleted file mode 100644
index 82a407c..0000000
--- a/src/main/java/com/gxwebsoft/apps/constants/EquipmentConstants.java
+++ /dev/null
@@ -1,10 +0,0 @@
-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
deleted file mode 100644
index c00e1da..0000000
--- a/src/main/java/com/gxwebsoft/apps/constants/HualalaConstants.java
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index c68ddfe..0000000
--- a/src/main/java/com/gxwebsoft/apps/constants/SfExpressConstants.java
+++ /dev/null
@@ -1,13 +0,0 @@
-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/constants/TowerConstants.java b/src/main/java/com/gxwebsoft/apps/constants/TowerConstants.java
deleted file mode 100644
index 67b96e1..0000000
--- a/src/main/java/com/gxwebsoft/apps/constants/TowerConstants.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.gxwebsoft.apps.constants;
-
-public class TowerConstants {
-    // 1班组组长2资料员3经营人员4生产主管
-    public static final Integer USER_LEVEL_NONE = 0;
-    public static final Integer USER_LEVEL_CLASS_MANAGER = 1;
-    public static final Integer USER_LEVEL_DOCUMENTER = 2;
-    public static final Integer USER_LEVEL_OPERATOR = 3;
-    public static final Integer USER_LEVEL_PRODUCTION_MANAGER = 4;
-    public static final Integer USER_LEVEL_AUDIT = 5;
-    public static final Integer USER_LEVEL_ASSET = 6;
-    public static final Integer USER_LEVEL_CAR_DISPATCH = 7;
-    public static final Integer USER_LEVEL_FIX = 8;
-
-    //派单类型:0安拆1质检2仓储3维保
-    public static final Integer WORKSHEET_TYPE_SET_UP = 0;
-    public static final Integer WORKSHEET_TYPE_CHECK = 1;
-    public static final Integer WORKSHEET_TYPE_STORE = 2;
-    public static final Integer WORKSHEET_TYPE_FIX = 3;
-
-    // 设备类型:(0塔式起重机;1施工升降机;2物料提升机)
-    public static final Integer WORKSHEET_EQUIP_TYPE_0 = 0;
-    public static final Integer WORKSHEET_EQUIP_TYPE_1 = 1;
-    public static final Integer WORKSHEET_EQUIP_TYPE_2 = 2;
-
-    // 设备类型:(0安装;1加高;2拆卸)
-    public static final Integer WORKSHEET_DETAIL_WORK_TYPE_0 = 0;
-    public static final Integer WORKSHEET_DETAIL_WORK_TYPE_1 = 1;
-    public static final Integer WORKSHEET_DETAIL_WORK_TYPE_2 = 2;
-
-
-    //状态 0已取消1待派单2待整理资料3待到场4待确认5已完成
-    public static final Integer WORKSHEET_STATUS_CANCEL = 0;
-    public static final Integer WORKSHEET_STATUS_TO_BE_SEND = 1;
-    public static final Integer WORKSHEET_STATUS_TO_BE_DOCUMENT = 2;
-    public static final Integer WORKSHEET_STATUS_TO_ARRIVE = 3;
-    public static final Integer WORKSHEET_STATUS_TO_CONFIRM = 4;
-    public static final Integer WORKSHEET_STATUS_DONE = 5;
-
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/BcAgentController.java b/src/main/java/com/gxwebsoft/apps/controller/BcAgentController.java
deleted file mode 100644
index 84c1ee9..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/BcAgentController.java
+++ /dev/null
@@ -1,127 +0,0 @@
-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<PageResult<BcAgent>> page(BcAgentParam param) {
-        // 使用关联查询
-      return success(bcAgentService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcAgent:list')")
-    @OperationLog
-    @ApiOperation("查询全部代报餐管理")
-    @GetMapping()
-    public ApiResult<List<BcAgent>> list(BcAgentParam param) {
-        // 使用关联查询
-        return success(bcAgentService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcAgent:list')")
-    @OperationLog
-    @ApiOperation("根据id查询代报餐管理")
-    @GetMapping("/{id}")
-    public ApiResult<BcAgent> 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<BcAgent> list) {
-        if (bcAgentService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcAgent:update')")
-    @OperationLog
-    @ApiOperation("批量修改代报餐管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcAgent> 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<Integer> 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
deleted file mode 100644
index 1287c69..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/BcCartController.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.gxwebsoft.apps.entity.BcCart;
-import com.gxwebsoft.apps.result.CartResult;
-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.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;
-
-/**
- * 批量报餐
- *
- * @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;
-
-  @ApiOperation("添加购物车")
-  @PostMapping("/addCart")
-  public ApiResult<?> addCart(@RequestBody BcCart vo) {
-    // 1. key = cache10048:cart651:2023-05-04
-    String key = "cache" + getTenantId() + ":cart" + getLoginUserId() + ":" + vo.getDeliveryTime();
-    // 2. 准备数据
-    final Goods goods = goodsService.getById(vo.getGoodsId());
-    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<BcCart> list = getCart(key);
-    final ArrayList<CartResult> 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<BcCart> 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<CartResult> cartAll = getCartAll();
-    if (cartAll.size() == 0) {
-      throw new BusinessException("订单不存在");
-    }
-    // 3.批量创建订单
-    Integer finalUserId = userId;
-    final ArrayList<Object> orderIds = new ArrayList<>();
-    cartAll.forEach(d -> {
-      System.out.println("批量创建订单d = " + d);
-      Order order = new Order();
-      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);
-      orderIds.add(order.getOrderId());
-      // 添加订单商品
-      final List<BcCart> items = d.getItems();
-      final ArrayList<OrderGoods> 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.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<String> keys = stringRedisTemplate.keys(key + "*");
-    System.out.println("清空购物车keys = " + keys);
-    assert keys != null;
-    stringRedisTemplate.delete(keys);
-  }
-
-  /**
-   * 获取购物车数据(按预定日期)
-   */
-  private List<BcCart> getCart(String key) {
-    // 获取购物车数据
-    List<Object> values = stringRedisTemplate.opsForHash().values(key);
-    return values.stream().map(item -> JSONUtil.parseObject(JSONUtil.toJSONString(item), BcCart.class)).collect(Collectors.toList());
-  }
-
-  /**
-   * 查询全部购物车数据
-   */
-  private ArrayList<CartResult> getCartAll() {
-    String key = "cache" + getTenantId() + ":cart" + getLoginUserId();
-    Set<String> keys = stringRedisTemplate.keys(key + "*");
-//    System.out.println("keys = " + keys);
-    assert keys != null;
-    final ArrayList<CartResult> list = new ArrayList<>();
-    keys.forEach(d -> {
-      final List<Object> values = stringRedisTemplate.opsForHash().values(d);
-      final CartResult cartResult = new CartResult();
-      final ArrayList<BcCart> dataList = new ArrayList<>();
-
-      values.forEach(item -> {
-        BcCart bcCart = JSONUtil.parseObject(item.toString(), BcCart.class);
-        assert bcCart != null;
-//        System.out.println("bcCart = " + bcCart);
-//        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);
-    });
-//    System.out.println("map = " + list);
-    return list;
-  }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/BcCookbookController.java b/src/main/java/com/gxwebsoft/apps/controller/BcCookbookController.java
deleted file mode 100644
index 5305f16..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/BcCookbookController.java
+++ /dev/null
@@ -1,139 +0,0 @@
-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<PageResult<BcCookbook>> page(BcCookbookParam param) {
-        PageParam<BcCookbook, BcCookbookParam> 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<BcCookbook>> list(BcCookbookParam param) {
-        PageParam<BcCookbook, BcCookbookParam> 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<BcCookbook> 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<BcCookbook> list) {
-        if (bcCookbookService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcCookbook:update')")
-    @OperationLog
-    @ApiOperation("批量修改常用菜谱")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcCookbook> 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<Integer> 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
deleted file mode 100644
index 0217f93..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/BcEquipmentController.java
+++ /dev/null
@@ -1,151 +0,0 @@
-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<PageResult<BcEquipment>> page(BcEquipmentParam param) {
-        PageParam<BcEquipment, BcEquipmentParam> 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<BcEquipment>> list(BcEquipmentParam param) {
-        PageParam<BcEquipment, BcEquipmentParam> 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<BcEquipment> 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<BcEquipment> list) {
-        if (bcEquipmentService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcEquipment:update')")
-    @OperationLog
-    @ApiOperation("批量修改报餐设备管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcEquipment> 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<Integer> 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
deleted file mode 100644
index 896c099..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/BcExportController.java
+++ /dev/null
@@ -1,282 +0,0 @@
-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<PageResult<BcExport>> page(BcExportParam param) {
-        PageParam<BcExport, BcExportParam> 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<BcExport>> list(BcExportParam param) {
-      LinkedList<BcExport> resutl = new LinkedList<>();
-        PageParam<BcExport, BcExportParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-      // 查询所有员工信息
-      final UserParam param1 = new UserParam();
-      param1.setOrganizationId(param.getOrganizationId());
-      final List<User> users = userService.listRel(param1);
-      if(CollectionUtils.isEmpty(users)){
-        return success(resutl);
-      }
-      final Set<Integer> userIds = users.stream().map(User::getUserId).collect(Collectors.toSet());
-
-      // 获取所有订单
-      final LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<Order>()
-        .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<Order> list = orderService.list(wrapper);
-      if(CollectionUtils.isEmpty(list)){
-        return success(resutl);
-      }
-      // 获取所有订单商品
-      final Set<Integer> orderIds = list.stream().map(Order::getOrderId).collect(Collectors.toSet());
-      final List<OrderGoods> orderGoods = orderGoodsService.list(new LambdaQueryWrapper<OrderGoods>().in(OrderGoods::getOrderId, orderIds));
-
-      // 按订单分组
-      final Map<Integer, List<OrderGoods>> orderGoodsCollect = orderGoods.stream().collect(Collectors.groupingBy(OrderGoods::getOrderId));
-      // 按员工分组
-      final Map<Integer, List<Order>> 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;
-      for (Integer userId : userCollect.keySet()) {
-        final List<Order> 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;
-        BigDecimal totalPrice = BigDecimal.ZERO;
-        for (Order order : userList) {
-          // 获取商品
-          totalPrice = totalPrice.add(order.getTotalPrice());
-          final List<OrderGoods> 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++;
-                }
-              }else if(goods.getCategoryId().equals(26)){
-                lCount++;
-                if(goods.getDeliveryStatus().equals(DELIVERY_STATUS_YES)){
-                  lSingCount++;
-                }
-              }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);
-        bcExport.setBreakfastPost(bCount);
-        bcExport.setBreakfastSign(bSingCount);
-        bcExport.setLunchPost(lCount);
-        bcExport.setLunchSign(lSingCount);
-        bcExport.setDinnerPost(dCount);
-        bcExport.setDinnerSign(dSingCount);
-        bcExport.setExpendMoney(totalPrice);
-        bcExport.setUserId(userId);
-        bcExport.setOrganizationName(user.getOrganizationName());
-        bcExport.setNickname(user.getNickname());
-
-        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.setOrganizationName("");
-      resutl.addFirst(totalBcExport);
-      return success(resutl);
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcExport:list')")
-    @OperationLog
-    @ApiOperation("根据id查询报餐统计导出")
-    @GetMapping("/{id}")
-    public ApiResult<BcExport> 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<BcExport> list) {
-        if (bcExportService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcExport:update')")
-    @OperationLog
-    @ApiOperation("批量修改报餐统计导出")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcExport> 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<Integer> 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
deleted file mode 100644
index b2219e3..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/BcFoodController.java
+++ /dev/null
@@ -1,286 +0,0 @@
-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.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
-      ArrayList goodsIds = JSONUtil.parseObject(plan.getGoodsIds(), ArrayList.class);
-      final HashMap<String, Object> map = new HashMap<>();
-      map.put("week",plan.getWeek());
-      map.put("list",goodsService.listByIds(goodsIds));
-      return success(map);
-    }
-
-    @ApiOperation("查询一周菜谱")
-    @GetMapping("/getWeekFood")
-    public ApiResult<?> getWeekFood() {
-      // 验证签名
-      isCheckSign();
-      final HashMap<String, Object> map = new HashMap<>();
-      // 今天日期
-      final DateTime today = DateUtil.parse(DateUtil.today());
-      // 本周一周开始的日期
-      final DateTime dateTime = DateUtil.beginOfWeek(today);
-      // 查询本周菜谱
-      final List<BcPlan> list = bcPlanService.list(new LambdaQueryWrapper<BcPlan>().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<UserReferee> 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<Order> orders = orderService.listRel(orderParam);
-          orders.forEach(o -> {
-            // 查询菜品信息
-            List<OrderGoods> orderGoods = orderGoodsService.list(new LambdaQueryWrapper<OrderGoods>()
-              .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<UserReferee> 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<Order> orders = orderService.listRel(orderParam);
-        orders.forEach(o -> {
-          // 查询菜品信息
-          OrderGoodsParam goodsParam = new OrderGoodsParam();
-          goodsParam.setOrderId(o.getOrderId());
-          List<OrderGoods> orderGoods = orderGoodsService.listRel(goodsParam);
-          o.setGoodsList(orderGoods);
-        });
-        d.setOrder(orders);
-      });
-      return success(list);
-    }
-
-    @ApiOperation("查询临时报餐信息")
-    @GetMapping("/getTemporaryOrder")
-    public ApiResult<?> getTemporaryOrder(OrderParam param) {
-      // 验证签名
-      isCheckSign();
-      LambdaQueryWrapper<Order> 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<OrderGoods> goods = orderGoodsService.list(new LambdaQueryWrapper<OrderGoods>().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<PageResult<BcFood>> page(BcFoodParam param) {
-        // 使用关联查询
-        return success(bcFoodService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcFood:list')")
-    @OperationLog
-    @ApiOperation("查询全部发布菜品明细")
-    @GetMapping()
-    public ApiResult<List<BcFood>> list(BcFoodParam param) {
-        // 使用关联查询
-        return success(bcFoodService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcFood:list')")
-    @OperationLog
-    @ApiOperation("根据id查询发布菜品明细")
-    @GetMapping("/{id}")
-    public ApiResult<BcFood> 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<BcFood> list) {
-        if (bcFoodService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcFood:update')")
-    @OperationLog
-    @ApiOperation("批量修改发布菜品明细")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcFood> 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<Integer> 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
deleted file mode 100644
index d2b92dc..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/BcPlanController.java
+++ /dev/null
@@ -1,144 +0,0 @@
-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<PageResult<BcPlan>> page(BcPlanParam param) {
-        // 使用关联查询
-        return success(bcPlanService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcPlan:list')")
-    @OperationLog
-    @ApiOperation("查询全部菜品发布管理")
-    @GetMapping()
-    public ApiResult<List<BcPlan>> list(BcPlanParam param) {
-        // 使用关联查询
-        return success(bcPlanService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcPlan:list')")
-    @OperationLog
-    @ApiOperation("根据id查询菜品发布管理")
-    @GetMapping("/{id}")
-    public ApiResult<BcPlan> 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<BcPlan>().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<BcPlan> list) {
-        if (bcPlanService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcPlan:update')")
-    @OperationLog
-    @ApiOperation("批量修改菜品发布管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcPlan> 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<Integer> 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
deleted file mode 100644
index beeb2e9..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/BcStatisticsController.java
+++ /dev/null
@@ -1,331 +0,0 @@
-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<Goods> list = goodsService.listByIds(goodsIds);
-    final ArrayList<Goods> goods = new ArrayList<>();
-
-    // 查询今日有效订单
-    final List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>()
-      .eq(Order::getDeliveryTime, param.getDayTime())
-      .eq(Order::getPayStatus, PAY_STATUS_SUCCESS)
-      .ne(Order::getOrderStatus, ORDER_STATUS_CANCEL)
-    );
-    final List<Integer> 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<OrderGoods>()
-          .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<OrderGoods>()
-          .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<Order> list = orderService.list(new LambdaQueryWrapper<Order>()
-      .eq(Order::getDeliveryTime, param.getDayTime())
-      .eq(Order::getPayStatus, PAY_STATUS_SUCCESS)
-      .ne(Order::getOrderStatus, ORDER_STATUS_CANCEL)
-    );
-    final List<Integer> orderIds = list.stream().map(Order::getOrderId).collect(Collectors.toList());
-//    System.out.println("list.size() = " + list.size());
-    final List<OrderGoods> list25 = orderGoodsService.list(new LambdaQueryWrapper<OrderGoods>()
-      .in(OrderGoods::getOrderId, orderIds)
-      .eq(OrderGoods::getCategoryId, param.getCategoryId())
-      .gt(OrderGoods::getTotalNum, 0)
-      .eq(OrderGoods::getDeleted, 0)
-    );
-    final List<Integer> userIds25 = list25.stream().map(OrderGoods::getUserId).collect(Collectors.toList());
-    final List<User> users25 = userService.listByIds(userIds25);
-    return success("查询成功", users25);
-  }
-
-  @ApiOperation("报餐统计")
-  @GetMapping("/baoCanUsers")
-  public ApiResult<?> baoCanUsers(OrderGoodsParam param) {
-    // 验证签名
-    isCheckSign();
-    System.out.println("param = " + param);
-    // 修复订单商品的支付状态
-//      repairPayPriceStatus();
-
-    final HashMap<Object, Object> map = new HashMap<>();
-
-    LambdaQueryWrapper<Order> 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<User> users = userService.list(new LambdaQueryWrapper<User>().eq(User::getOrganizationId,param.getOrganizationId()));
-      final List<Integer> 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<Order> list = orderService.list(wrapper);
-
-    if(list.size() == 0){
-      return success("查询成功",null);
-    }
-
-    System.out.println("报餐统计 = " + list.size());
-    final List<Integer> orderIds = list.stream().map(Order::getOrderId).collect(Collectors.toList());
-    System.out.println("orderIds = " + orderIds.size());
-
-    LambdaQueryWrapper<OrderGoods> 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<OrderGoods>()
-//      .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<OrderGoods>()
-//      .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<OrderGoods>()
-//      .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<OrderGoods>()
-//      .in(OrderGoods::getOrderId, orderIds)
-//      .eq(OrderGoods::getCategoryId, 25)
-//      .gt(OrderGoods::getTotalNum, 0)
-//      .eq(OrderGoods::getDeleted, 0)
-//    );
-//    final int post26 = orderGoodsService.count(new LambdaQueryWrapper<OrderGoods>()
-//      .in(OrderGoods::getOrderId, orderIds)
-//      .eq(OrderGoods::getCategoryId, 26)
-//      .gt(OrderGoods::getTotalNum, 0)
-//      .eq(OrderGoods::getDeleted, 0)
-//    );
-//    final int post27 = orderGoodsService.count(new LambdaQueryWrapper<OrderGoods>()
-//      .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<OrderGoods> 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<Order> 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<Order> list = orderService.list(wrapper);
-    System.out.println("修复数据list = " + list.size());
-    list.forEach(order -> {
-      final OrderGoodsParam orderGoodsParam = new OrderGoodsParam();
-      orderGoodsParam.setOrderId(order.getOrderId());
-      final List<OrderGoods> goods = orderGoodsService.listRel(orderGoodsParam);
-      goods.forEach(d -> {
-        d.setDeliveryTime(order.getDeliveryTime());
-        d.setPayStatus(order.getPayStatus());
-        orderGoodsService.updateById(d);
-        System.out.println("修复预定时间 = " + d.getOrderId());
-      });
-    });
-  }
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/BcTemporaryController.java b/src/main/java/com/gxwebsoft/apps/controller/BcTemporaryController.java
deleted file mode 100644
index 868029e..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/BcTemporaryController.java
+++ /dev/null
@@ -1,158 +0,0 @@
-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<PageResult<BcTemporary>> page(BcTemporaryParam param) {
-        // 使用关联查询
-        return success(bcTemporaryService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcTemporary:list')")
-    @OperationLog
-    @ApiOperation("查询全部临时报餐管理")
-    @GetMapping()
-    public ApiResult<List<BcTemporary>> list(BcTemporaryParam param) {
-        // 使用关联查询
-        return success(bcTemporaryService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcTemporary:list')")
-    @OperationLog
-    @ApiOperation("根据id查询临时报餐管理")
-    @GetMapping("/{id}")
-    public ApiResult<BcTemporary> 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<BcTemporary>()
-        .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<BcTemporary> list) {
-        if (bcTemporaryService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcTemporary:update')")
-    @OperationLog
-    @ApiOperation("批量修改临时报餐管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcTemporary> 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<Integer> 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
deleted file mode 100644
index 9cca5d8..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/CashierController.java
+++ /dev/null
@@ -1,137 +0,0 @@
-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<PageResult<Cashier>> page(CashierParam param) {
-        PageParam<Cashier, CashierParam> 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<Cashier>> list(CashierParam param) {
-        PageParam<Cashier, CashierParam> 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<Cashier> 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<Cashier> list) {
-        if (cashierService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:cashier:update')")
-    @OperationLog
-    @ApiOperation("批量修改海牛收银台记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Cashier> 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<Integer> 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
deleted file mode 100644
index a06c06e..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/EquipmentAlarmController.java
+++ /dev/null
@@ -1,140 +0,0 @@
-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<PageResult<EquipmentAlarm>> page(EquipmentAlarmParam param) {
-        PageParam<EquipmentAlarm, EquipmentAlarmParam> 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<EquipmentAlarm>> list(EquipmentAlarmParam param) {
-        PageParam<EquipmentAlarm, EquipmentAlarmParam> 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<EquipmentAlarm> 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<EquipmentAlarm> list) {
-        if (equipmentAlarmService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentAlarm:update')")
-    @OperationLog
-    @ApiOperation("批量修改故障报警记录")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<EquipmentAlarm> batchParam) {
-        if (batchParam.update(equipmentAlarmService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentAlarm:remove')")
-    @OperationLog
-    @ApiOperation("批量删除故障报警记录")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> 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
deleted file mode 100644
index 9f59ca3..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/EquipmentController.java
+++ /dev/null
@@ -1,253 +0,0 @@
-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<PageResult<Equipment>> 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<Equipment>> list(EquipmentParam param) {
-        PageParam<Equipment, EquipmentParam> 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<Equipment> 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<Equipment>()
-          .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<Equipment>().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<Equipment> list) {
-        if (equipmentService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipment:update')")
-    @OperationLog
-    @ApiOperation("批量修改设备管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Equipment> 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<Integer> 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
deleted file mode 100644
index f42c6cc..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/EquipmentFaultController.java
+++ /dev/null
@@ -1,140 +0,0 @@
-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<PageResult<EquipmentFault>> page(EquipmentFaultParam param) {
-        PageParam<EquipmentFault, EquipmentFaultParam> 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<EquipmentFault>> list(EquipmentFaultParam param) {
-        PageParam<EquipmentFault, EquipmentFaultParam> 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<EquipmentFault> 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<EquipmentFault> list) {
-        if (equipmentFaultService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentFault:update')")
-    @OperationLog
-    @ApiOperation("批量修改故障电池")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<EquipmentFault> batchParam) {
-        if (batchParam.update(equipmentFaultService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentFault:remove')")
-    @OperationLog
-    @ApiOperation("批量删除故障电池")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> 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
deleted file mode 100644
index 6279315..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/EquipmentGoodsController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-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<PageResult<EquipmentGoods>> page(EquipmentGoodsParam param) {
-        // 使用关联查询
-        return success(equipmentGoodsService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentGoods:list')")
-    @OperationLog
-    @ApiOperation("查询全部电池管理记录表")
-    @GetMapping()
-    public ApiResult<List<EquipmentGoods>> list(EquipmentGoodsParam param) {
-        // 使用关联查询
-        return success(equipmentGoodsService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentGoods:list')")
-    @OperationLog
-    @ApiOperation("根据id查询电池管理记录表")
-    @GetMapping("/{id}")
-    public ApiResult<EquipmentGoods> 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<EquipmentGoods> list) {
-        if (equipmentGoodsService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentGoods:update')")
-    @OperationLog
-    @ApiOperation("批量修改电池管理记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<EquipmentGoods> 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<Integer> 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
deleted file mode 100644
index 9774396..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/EquipmentOrderController.java
+++ /dev/null
@@ -1,140 +0,0 @@
-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<PageResult<EquipmentOrder>> page(EquipmentOrderParam param) {
-//        PageParam<EquipmentOrder, EquipmentOrderParam> 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<EquipmentOrder>> list(EquipmentOrderParam param) {
-        PageParam<EquipmentOrder, EquipmentOrderParam> 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<EquipmentOrder> 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<EquipmentOrder> list) {
-        if (equipmentOrderService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentOrder:update')")
-    @OperationLog
-    @ApiOperation("批量修改订单记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<EquipmentOrder> 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<Integer> 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
deleted file mode 100644
index 26afd4b..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/EquipmentOrderGoodsController.java
+++ /dev/null
@@ -1,148 +0,0 @@
-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<PageResult<EquipmentOrderGoods>> page(EquipmentOrderGoodsParam param) {
-        PageParam<EquipmentOrderGoods, EquipmentOrderGoodsParam> 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<EquipmentOrderGoods>> list(EquipmentOrderGoodsParam param) {
-//        PageParam<EquipmentOrderGoods, EquipmentOrderGoodsParam> 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<EquipmentOrderGoods> 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<EquipmentOrderGoods> 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<EquipmentOrderGoods> list) {
-        if (equipmentOrderGoodsService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:update')")
-    @OperationLog
-    @ApiOperation("批量修改电池管理记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<EquipmentOrderGoods> 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<Integer> 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
deleted file mode 100644
index 5469754..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/EquipmentRecordController.java
+++ /dev/null
@@ -1,144 +0,0 @@
-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<PageResult<EquipmentRecord>> page(EquipmentRecordParam param) {
-        PageParam<EquipmentRecord, EquipmentRecordParam> 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<EquipmentRecord>> list(EquipmentRecordParam param) {
-        PageParam<EquipmentRecord, EquipmentRecordParam> 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<EquipmentRecord> 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<EquipmentRecord> list) {
-        if (equipmentRecordService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentRecord:update')")
-    @OperationLog
-    @ApiOperation("批量修改前世今生")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<EquipmentRecord> batchParam) {
-        if (batchParam.update(equipmentRecordService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentRecord:remove')")
-    @OperationLog
-    @ApiOperation("批量删除前世今生")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> 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
deleted file mode 100644
index 1376585..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/HualalaCardBenefitsController.java
+++ /dev/null
@@ -1,134 +0,0 @@
-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<PageResult<HualalaCardBenefits>> page(HualalaCardBenefitsParam param) {
-        PageParam<HualalaCardBenefits, HualalaCardBenefitsParam> 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<HualalaCardBenefits>> list(HualalaCardBenefitsParam param) {
-        PageParam<HualalaCardBenefits, HualalaCardBenefitsParam> 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<HualalaCardBenefits> 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<HualalaCardBenefits> list) {
-        if (hualalaCardBenefitsService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:update')")
-    @OperationLog
-    @ApiOperation("批量修改会员权益")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<HualalaCardBenefits> batchParam) {
-        if (batchParam.update(hualalaCardBenefitsService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:remove')")
-    @OperationLog
-    @ApiOperation("批量删除会员权益")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> 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
deleted file mode 100644
index 66cea36..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/HualalaCardController.java
+++ /dev/null
@@ -1,140 +0,0 @@
-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<PageResult<HualalaCard>> page(HualalaCardParam param) {
-        PageParam<HualalaCard, HualalaCardParam> 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<HualalaCard>> list(HualalaCardParam param) {
-        PageParam<HualalaCard, HualalaCardParam> 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<HualalaCard> 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<HualalaCard> list) {
-        if (hualalaCardService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCard:update')")
-    @OperationLog
-    @ApiOperation("批量修改")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<HualalaCard> batchParam) {
-        if (batchParam.update(hualalaCardService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCard:remove')")
-    @OperationLog
-    @ApiOperation("批量删除")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> 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
deleted file mode 100644
index 5037c20..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/HualalaCart.java
+++ /dev/null
@@ -1,240 +0,0 @@
-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<Object> 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<String, Object> 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<String, Object> treeMap, String paySecret) {
-//    String secret = paySecret;  // 正式秘钥
-//    String secret = "aceb62c896d849c89d1c8b9a4416d1a7";  // 测试秘钥
-    TreeMap<String, String> tMap = new TreeMap<>();
-    for (Map.Entry<String, Object> 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<String, String> 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<Object> values = cacheClient.hValues(key);
-//    System.out.println("values = " + values);
-    List<ItemVo> 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
deleted file mode 100644
index 36072ef..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/HualalaCartFoodController.java
+++ /dev/null
@@ -1,134 +0,0 @@
-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<PageResult<HualalaCartFood>> page(HualalaCartFoodParam param) {
-        PageParam<HualalaCartFood, HualalaCartFoodParam> 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<HualalaCartFood>> list(HualalaCartFoodParam param) {
-        PageParam<HualalaCartFood, HualalaCartFoodParam> 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<HualalaCartFood> 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<HualalaCartFood> list) {
-        if (hualalaCartFoodService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCartFood:update')")
-    @OperationLog
-    @ApiOperation("批量修改购物车商品")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<HualalaCartFood> batchParam) {
-        if (batchParam.update(hualalaCartFoodService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCartFood:remove')")
-    @OperationLog
-    @ApiOperation("批量删除购物车商品")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> 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
deleted file mode 100644
index 1fe7a16..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/HualalaController.java
+++ /dev/null
@@ -1,384 +0,0 @@
-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<String, Object> params = hualalaParam.getParams();
-    // 执行请求
-    JSONObject response = hualalaService.doPost(apiUrl, params);
-    return success("请求成功",response);
-  }
-
-  @ApiOperation("查询集团店铺列表")
-  @PostMapping("/getAllShop")
-  public ApiResult<?> getAllShop(@RequestBody Map<String, Object> 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<HualalaShop> shopInfoList = result.getShopInfoList();
-    // 过滤非桂小厨品牌门店
-    List<HualalaShop> 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<String, Object> 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<String, Object> 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<String, Object> params) {
-    // 请求缓存数据
-    String key = getOpenFood.concat(":").concat(params.get("shopId").toString());
-    OpenFoodResult cache = cacheClient.get(key, OpenFoodResult.class);
-    if(cache != null){
-      // 计算加入购物车的商品数量
-      List<HualalaFood> 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<HualalaFood> foods = CommonUtil.toTreeData(cache.getFoodList(), null, HualalaFood::getParentFoodId, HualalaFood::getFoodOnlineCategoryId, HualalaFood::setChildren);
-      Map<String, List<HualalaFood>> 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<HualalaFood> foodList = result.getFoodList();
-    List<HualalaFood> foodList2 = foodList.stream().filter(d -> d.getTakeawayTag().equals("2")).collect(Collectors.toList());
-    // 筛选出可以点单的菜品
-    List<HualalaFood> 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<String, Object> params) {
-//    // 请求缓存数据
-//    String key = getOpenFood.concat(":").concat(params.get("shopId").toString());
-//    OpenFoodResult cache = cacheClient.get(key, OpenFoodResult.class);
-//    if(cache != null){
-//      // 计算加入购物车的商品数量
-//      List<HualalaFood> 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<HualalaFood> foodList = result.getFoodList();
-//      List<HualalaFood> foodList2 = foodList.stream().filter(d -> d.getTakeawayTag().equals("2")).collect(Collectors.toList());
-//      // 筛选出可以点单的菜品
-//      List<HualalaFood> 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<List<HualalaShop>> 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<OrderGoods> goodsInfo = orderGoodsMapper.selectByOrderId(orderId);
-    System.out.println("goodsInfo = " + goodsInfo);
-    // 菜品信息
-    ArrayList<Object> 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<Object> 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<String,Object> 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
deleted file mode 100644
index b65dfc0..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/HualalaFoodCategoryController.java
+++ /dev/null
@@ -1,134 +0,0 @@
-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<PageResult<HualalaFoodCategory>> page(HualalaFoodCategoryParam param) {
-        PageParam<HualalaFoodCategory, HualalaFoodCategoryParam> 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<HualalaFoodCategory>> list(HualalaFoodCategoryParam param) {
-        PageParam<HualalaFoodCategory, HualalaFoodCategoryParam> 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<HualalaFoodCategory> 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<HualalaFoodCategory> list) {
-        if (hualalaFoodCategoryService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:update')")
-    @OperationLog
-    @ApiOperation("批量修改菜品分类")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<HualalaFoodCategory> batchParam) {
-        if (batchParam.update(hualalaFoodCategoryService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:remove')")
-    @OperationLog
-    @ApiOperation("批量删除菜品分类")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> 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
deleted file mode 100644
index 1283490..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/HualalaFoodController.java
+++ /dev/null
@@ -1,134 +0,0 @@
-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<PageResult<HualalaFood>> page(HualalaFoodParam param) {
-        PageParam<HualalaFood, HualalaFoodParam> 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<HualalaFood>> list(HualalaFoodParam param) {
-        PageParam<HualalaFood, HualalaFoodParam> 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<HualalaFood> 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<HualalaFood> list) {
-        if (hualalaFoodService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaFood:update')")
-    @OperationLog
-    @ApiOperation("批量修改菜品分类")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<HualalaFood> batchParam) {
-        if (batchParam.update(hualalaFoodService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaFood:remove')")
-    @OperationLog
-    @ApiOperation("批量删除菜品分类")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> 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
deleted file mode 100644
index 8e44718..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/HualalaShopController.java
+++ /dev/null
@@ -1,134 +0,0 @@
-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<PageResult<HualalaShop>> page(HualalaShopParam param) {
-        PageParam<HualalaShop, HualalaShopParam> 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<HualalaShop>> list(HualalaShopParam param) {
-        PageParam<HualalaShop, HualalaShopParam> 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<HualalaShop> 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<HualalaShop> list) {
-        if (hualalaShopService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaShop:update')")
-    @OperationLog
-    @ApiOperation("批量修改哗啦啦门店管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<HualalaShop> 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<Integer> 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
deleted file mode 100644
index 15c42c8..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/LinkController.java
+++ /dev/null
@@ -1,140 +0,0 @@
-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<PageResult<Link>> page(LinkParam param) {
-        PageParam<Link, LinkParam> 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<Link>> list(LinkParam param) {
-        PageParam<Link, LinkParam> 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<Link> 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<Link> list) {
-        if (linkService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:link:update')")
-    @OperationLog
-    @ApiOperation("批量修改常用链接推荐记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Link> 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<Integer> 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
deleted file mode 100644
index b152ece..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/SfExpress.java
+++ /dev/null
@@ -1,115 +0,0 @@
-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
deleted file mode 100644
index a51ab70..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/TestDataController.java
+++ /dev/null
@@ -1,142 +0,0 @@
-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<PageResult<TestData>> page(TestDataParam param) {
-        PageParam<TestData, TestDataParam> 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<TestData>> list(TestDataParam param) {
-        PageParam<TestData, TestDataParam> 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<TestData> 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<TestData> list) {
-        if (testDataService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:testData:update')")
-    @OperationLog
-    @ApiOperation("批量修改测试数据表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TestData> batchParam) {
-        if (batchParam.update(testDataService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:testData:remove')")
-    @OperationLog
-    @ApiOperation("批量删除测试数据表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (testDataService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/TowerWorksheetFrontController.java b/src/main/java/com/gxwebsoft/apps/controller/TowerWorksheetFrontController.java
deleted file mode 100644
index 482baf8..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/TowerWorksheetFrontController.java
+++ /dev/null
@@ -1,712 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONArray;
-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.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.gxwebsoft.apps.constants.TowerConstants;
-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.common.system.param.UserParam;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.shop.entity.Category;
-import com.gxwebsoft.shop.param.CategoryParam;
-import com.gxwebsoft.shop.service.CategoryService;
-import com.gxwebsoft.tower.entity.*;
-import com.gxwebsoft.tower.param.*;
-import com.gxwebsoft.tower.service.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.beetl.android.util.ArrayMap;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.*;
-import java.util.stream.Collectors;
-
-
-@Api(tags = "派单管理")
-@RestController
-@RequestMapping("/api/apps/worksheet")
-public class TowerWorksheetFrontController extends BaseController {
-    @Resource
-    private TowerWorksheetService towerWorksheetService;
-    @Resource
-    private TowerWorksheetDetailService towerWorksheetDetailService;
-    @Resource
-    private TowerWorksheetSetUpService towerWorksheetSetUpService;
-    @Resource
-    private TowerWorksheetPartsService towerWorksheetPartsService;
-    @Resource
-    private TowerWorksheetCarDispatchService towerWorksheetCarDispatchService;
-    @Resource
-    private TowerWorksheetCheckService towerWorksheetCheckService;
-    @Resource
-    private TowerProjectService towerProjectService;
-    @Resource
-    private TowerEquipmentService towerEquipmentService;
-    @Resource
-    private UserService userService;
-    @Resource
-    private CategoryService categoryService;
-    @Resource
-    private TowerWorksheetAuditService towerWorksheetAuditService;
-    @Resource
-    private TowerProjectUserService towerProjectUserService;
-    @Resource
-    private TowerProjectOrderService towerProjectOrderService;
-
-    @ApiOperation("首页数据")
-    @PostMapping("/index-data")
-    public ApiResult<?> getData() {
-        User user = getLoginUser();
-        Map<String, Integer> data = new HashMap<>();
-        data.put("all", sumData(user, -1));
-        // 待派单
-        data.put("to_be_send", sumData(user, 1));
-        // 待整理资料
-        data.put("to_document", sumData(user, 2));
-        // 待到场
-        data.put("to_reach", sumData(user, 3));
-        // 待确认
-        data.put("to_confirm", sumData(user, 4));
-        // 已完成
-        data.put("done", sumData(user, 5));
-        // 审核中
-        data.put("auditing", sumData(user, -2));
-        // 资料员已完成
-        data.put("done_for_document", sumData(user, 2, true));
-        return success("成功", data);
-    }
-
-    @ApiOperation("派单列表")
-    @PostMapping("/worksheet/list")
-    public ApiResult<?> worksheetList(@RequestBody TowerWorksheetParam param) {
-        User user = getLoginUser();
-        Integer status = param.getStatus();
-        if (user.getUserLevel().equals(TowerConstants.USER_LEVEL_NONE)) return fail("无权限");
-        MPJLambdaWrapper<TowerWorksheet> mpjLambdaWrapper = new MPJLambdaWrapper<>();
-        if (user.getUserLevel().equals(TowerConstants.USER_LEVEL_CLASS_MANAGER)) {
-            mpjLambdaWrapper.eq("class_manager", user.getUserId());
-        } else if (user.getUserLevel().equals(TowerConstants.USER_LEVEL_DOCUMENTER)) {
-            mpjLambdaWrapper.eq("document_uid", user.getUserId());
-        } else if (user.getUserLevel().equals(TowerConstants.USER_LEVEL_OPERATOR)) {
-            mpjLambdaWrapper.eq("start_uid", user.getUserId());
-        } else if (user.getUserLevel().equals(TowerConstants.USER_LEVEL_PRODUCTION_MANAGER)) {
-            mpjLambdaWrapper.eq("production_manger_uid", user.getUserId());
-        } else if (user.getUserLevel().equals(TowerConstants.USER_LEVEL_ASSET)) {
-            mpjLambdaWrapper.eq("asset_uid", user.getUserId());
-        } else if (user.getUserLevel().equals(TowerConstants.USER_LEVEL_CAR_DISPATCH)) {
-            mpjLambdaWrapper.eq("car_dispatch_uid", user.getUserId());
-        } else if (user.getUserLevel().equals(TowerConstants.USER_LEVEL_FIX)) {
-            mpjLambdaWrapper.eq("fix_uid", user.getUserId());
-        }
-        if (!status.equals(-1)) {
-            if (status.equals(-2)) mpjLambdaWrapper.eq("t.audit_status", 1);
-            else mpjLambdaWrapper.eq("t.status", status);
-        }
-        mpjLambdaWrapper.selectAll(TowerWorksheet.class)
-                .select(TowerProject::getProjectName)
-                .leftJoin(TowerProject.class, TowerProject::getProjectId, TowerWorksheet::getProjectId);
-        PageParam<TowerWorksheet, TowerWorksheetParam> page = new PageParam<>(param);
-        page.setDefaultOrder("update_time desc");
-        IPage<TowerWorksheet> towerWorksheetIPage = towerWorksheetService.page(page, mpjLambdaWrapper);
-        List<TowerWorksheet> towerWorksheets = towerWorksheetIPage.getRecords();
-        for (TowerWorksheet towerWorksheet : towerWorksheets) {
-            formatWorksheet(towerWorksheet, false);
-            if (towerWorksheet.getStatus().equals(2) && towerWorksheet.getAuditStatus().equals(1)
-                    && (user.getUserLevel().equals(5) || user.getUserLevel().equals(9))) {
-                TowerWorksheetAudit audit = towerWorksheetAuditService.getOne(
-                        new LambdaQueryWrapper<TowerWorksheetAudit>()
-                                .eq(TowerWorksheetAudit::getWorksheetId, towerWorksheet.getWorksheetId())
-                                .eq(TowerWorksheetAudit::getUserId, getLoginUserId())
-                );
-                if (audit != null) towerWorksheet.setNeedAudit(audit.getStatus().equals(0));
-            }
-            towerWorksheet.setHasCarDispatch(
-                    towerWorksheetCarDispatchService.count(
-                            new LambdaQueryWrapper<TowerWorksheetCarDispatch>()
-                                    .eq(TowerWorksheetCarDispatch::getWorksheetId, towerWorksheet.getWorksheetId())
-                    ) > 0
-            );
-        }
-        IPage<TowerWorksheet> pages = new Page<>(param.getPage(), param.getLimit());
-        pages.setRecords(towerWorksheets);
-        pages.setTotal(towerWorksheetIPage.getTotal());
-        return success(pages);
-    }
-
-    @ApiOperation("派单详情")
-    @PostMapping("/worksheet/info")
-    public ApiResult<TowerWorksheet> worksheetInfo(@RequestBody TowerWorksheetParam param) {
-        User user = getLoginUser();
-        MPJLambdaWrapper<TowerWorksheet> mpjLambdaWrapper = new MPJLambdaWrapper<>();
-        mpjLambdaWrapper.eq(TowerWorksheet::getWorksheetId, param.getWorksheetId())
-                .selectAll(TowerWorksheet.class)
-                .select(TowerProject::getProjectName)
-                .select(TowerProject::getProjectAddress)
-                .select(TowerProject::getProjectRegion)
-                .leftJoin(TowerProject.class, TowerProject::getProjectId, TowerWorksheet::getProjectId);
-        TowerWorksheet towerWorksheet = towerWorksheetService.getOne(mpjLambdaWrapper);
-        if (towerWorksheet.getStatus().equals(2) && towerWorksheet.getAuditStatus().equals(1)
-                && (user.getUserLevel().equals(5) || user.getUserLevel().equals(9))) {
-            TowerWorksheetAudit audit = towerWorksheetAuditService.getOne(
-                    new LambdaQueryWrapper<TowerWorksheetAudit>()
-                            .eq(TowerWorksheetAudit::getWorksheetId, towerWorksheet.getWorksheetId())
-                            .eq(TowerWorksheetAudit::getUserId, getLoginUserId())
-            );
-            if (audit != null) towerWorksheet.setNeedAudit(audit.getStatus().equals(0));
-        }
-        formatWorksheet(towerWorksheet, true);
-        return success(towerWorksheet);
-    }
-
-    @ApiOperation("派单修改状态")
-    @PostMapping("/worksheet/change-status")
-    public ApiResult<?> worksheetChangeStatus(@RequestBody TowerWorksheet towerWorksheet) {
-        towerWorksheetService.updateById(towerWorksheet);
-        if (towerWorksheet.getStatus().equals(TowerConstants.WORKSHEET_STATUS_TO_ARRIVE)) {
-            QueryWrapper<TowerWorksheetCheck> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("worksheet_id", towerWorksheet.getWorksheetId());
-            towerWorksheetCheckService.remove(queryWrapper);
-        } else if (towerWorksheet.getStatus().equals(TowerConstants.WORKSHEET_STATUS_DONE)) {
-            TowerWorksheetDetail detail = towerWorksheetDetailService.getOne(
-                    new LambdaQueryWrapper<TowerWorksheetDetail>()
-                            .eq(TowerWorksheetDetail::getWorksheetId, towerWorksheet.getWorksheetId())
-            );
-            // 拆卸单修改设备状态
-            if (detail.getWorkType().equals(2)) {
-                towerEquipmentService.update(
-                        new LambdaUpdateWrapper<TowerEquipment>()
-                                .eq(TowerEquipment::getEquipmentId, detail.getEquipmentId())
-                                .set(TowerEquipment::getStatus, 0)
-                );
-                TowerProject project = towerProjectService.getById(detail.getProjectId());
-                project.setProjectStatus("完工");
-                towerProjectService.updateById(project);
-            }
-        }
-        return success("修改成功");
-    }
-
-    @ApiOperation("派单修改完成")
-    @PostMapping("/worksheet/change-done")
-    public ApiResult<?> worksheetChangeDone(@RequestBody TowerWorksheet towerWorksheet) {
-        if (towerWorksheet.getDocumentHasDone() != null) towerWorksheet.setDocumentDoneTime(LocalDateTime.now());
-        if (towerWorksheet.getAssetHasDone() != null) towerWorksheet.setAssetDoneTime(LocalDateTime.now());
-        if (towerWorksheet.getFixHasDone() != null) towerWorksheet.setFixDoneTime(LocalDateTime.now());
-        towerWorksheetService.updateById(towerWorksheet);
-        TowerWorksheet towerWorksheet1 = towerWorksheetService.getById(towerWorksheet.getWorksheetId());
-//        int carDispatchNum = towerWorksheetCarDispatchService.count(
-//                new LambdaQueryWrapper<TowerWorksheetCarDispatch>().eq(TowerWorksheetCarDispatch::getWorksheetId, towerWorksheet.getWorksheetId())
-//        );
-        if (towerWorksheet1.getAssetHasDone().equals(1) && towerWorksheet1.getDocumentHasDone().equals(1) && towerWorksheet1.getFixHasDone().equals(1))
-            towerWorksheet.setStatus(1);
-        towerWorksheetService.updateById(towerWorksheet);
-        return success("修改成功");
-    }
-
-    @ApiOperation("派单设置车辆")
-    @PostMapping("/worksheet/set-car-dispatch")
-    public ApiResult<?> worksheetSetCarDispatch(@RequestBody Map<String, ?> postBody) {
-        Integer worksheetId = (Integer) postBody.get("worksheetId");
-//        TowerWorksheet towerWorksheet1 = towerWorksheetService.getById(worksheetId);
-        towerWorksheetCarDispatchService.remove(
-                new LambdaQueryWrapper<TowerWorksheetCarDispatch>()
-                        .eq(TowerWorksheetCarDispatch::getWorksheetId, worksheetId)
-        );
-        List<TowerWorksheetCarDispatch> carDispatchList = JSON.parseArray(JSON.toJSONBytes(postBody.get("carDispatchList")), TowerWorksheetCarDispatch.class);
-        towerWorksheetCarDispatchService.saveBatch(carDispatchList);
-//        if (towerWorksheet1.getAssetHasDone().equals(1) && towerWorksheet1.getDocumentHasDone().equals(1))
-//            towerWorksheet1.setStatus(1);
-//        towerWorksheetService.updateById(towerWorksheet1);
-        return success("设置成功");
-    }
-
-    @ApiOperation("派单核验详情")
-    @PostMapping("/worksheet/check/info")
-    public ApiResult<?> worksheetCheckInfo(@RequestBody TowerWorksheetCheck towerWorksheetCheck) {
-        return success(towerWorksheetCheckService.getOne(
-                new LambdaQueryWrapper<TowerWorksheetCheck>()
-                        .eq(TowerWorksheetCheck::getWorksheetId, towerWorksheetCheck.getWorksheetId())
-                        .eq(TowerWorksheetCheck::getDeleted, 0)
-        ));
-    }
-
-    @ApiOperation("派单核验")
-    @PostMapping("/worksheet/check")
-    public ApiResult<?> worksheetCheck(@RequestBody TowerWorksheetCheck towerWorksheetCheck) {
-        towerWorksheetCheckService.remove(
-                new LambdaQueryWrapper<TowerWorksheetCheck>()
-                        .eq(TowerWorksheetCheck::getWorksheetId, towerWorksheetCheck.getWorksheetId())
-        );
-        towerWorksheetCheckService.save(towerWorksheetCheck);
-        if (towerWorksheetCheck.getSave()) {
-            TowerWorksheet towerWorksheet = new TowerWorksheet();
-            towerWorksheet.setWorksheetId(towerWorksheetCheck.getWorksheetId());
-            towerWorksheet.setStatus(TowerConstants.WORKSHEET_STATUS_TO_CONFIRM);
-            towerWorksheetService.updateById(towerWorksheet);
-            return success("核验成功");
-        }
-        return success("保存成功");
-    }
-
-    @ApiOperation("派单操作")
-    @PostMapping("/worksheet/action")
-    public ApiResult<?> worksheetAction(@RequestBody Map<String, ?> postBody) {
-        Integer projectId = (Integer) postBody.get("projectId");
-        Integer equipmentType = (Integer) postBody.get("equipmentType");
-        Integer workType = (Integer) postBody.get("workType");
-        TowerWorksheetDetail towerWorksheetDetail = JSON.parseObject(JSON.toJSONBytes(postBody.get("detail")), TowerWorksheetDetail.class);
-        TowerWorksheet towerWorksheet;
-        if (postBody.get("worksheetId") == null) {
-            // 检查安装单
-            TowerWorksheetDetail hasWorkType0 = towerWorksheetDetailService
-                    .getOne(new QueryWrapper<TowerWorksheetDetail>()
-                            .eq("work_type", TowerConstants.WORKSHEET_DETAIL_WORK_TYPE_0)
-                            .eq("project_id", projectId)
-                            .eq("equipment_id", towerWorksheetDetail.getEquipmentId())
-                            .last("limit 1")
-                    );
-//            if (hasWorkType0 != null) {
-//                if (workType.equals(TowerConstants.WORKSHEET_DETAIL_WORK_TYPE_0)) return fail("已存在安装单");
-//            } else {
-            if (hasWorkType0 == null && !workType.equals(TowerConstants.WORKSHEET_DETAIL_WORK_TYPE_0))
-                return fail("没有安装单,无法创建");
-//            }
-
-            if (workType.equals(TowerConstants.WORKSHEET_DETAIL_WORK_TYPE_2)) {
-                // 检查拆卸单
-                int workType2num = towerWorksheetDetailService
-                        .count(new QueryWrapper<TowerWorksheetDetail>()
-                                .eq("work_type", TowerConstants.WORKSHEET_DETAIL_WORK_TYPE_2)
-                                .eq("project_id", projectId)
-                                .eq("equipment_id", towerWorksheetDetail.getEquipmentId())
-                        );
-                System.out.println("workType2num: " + workType2num);
-                if (workType2num > 0) return fail("已有拆卸单,无法创建");
-            }
-            towerWorksheet = new TowerWorksheet();
-        } else towerWorksheet = towerWorksheetService.getById((Integer) postBody.get("worksheetId"));
-        towerWorksheet.setType((Integer) postBody.get("type"));
-        towerWorksheet.setStartUid((Integer) postBody.get("startUid"));
-        towerWorksheet.setProjectId(projectId);
-        towerWorksheet.setReceiveDate((String) postBody.get("receiveDate"));
-        towerWorksheet.setProductionMangerUid((Integer) postBody.get("productionMangerUid"));
-        towerWorksheet.setWorkType(workType);
-        towerWorksheet.setEquipmentType(equipmentType);
-        towerWorksheet.setPlanInDateInit((String) postBody.get("planInDateInit"));
-        towerWorksheet.setContactPhone((String) postBody.get("contactPhone"));
-        towerWorksheet.setDocumentUid((Integer) postBody.get("documentUid"));
-        towerWorksheet.setAssetUid((Integer) postBody.get("assetUid"));
-        towerWorksheet.setCarDispatchUid((Integer) postBody.get("carDispatchUid"));
-        towerWorksheet.setFixUid((Integer) postBody.get("fixUid"));
-        towerWorksheet.setParentWorksheetId((Integer) postBody.get("parentWorksheetId"));
-        towerWorksheet.setAddress((String) postBody.get("address"));
-
-        List<TowerWorksheetAudit> auditList = JSON.parseArray(JSON.toJSONBytes(postBody.get("auditList")), TowerWorksheetAudit.class);
-        boolean hasAudit = !auditList.isEmpty();
-        if (hasAudit) towerWorksheet.setAuditStatus(1);
-        else towerWorksheet.setAuditStatus(0);
-        if (towerWorksheet.getWorksheetId() == null) towerWorksheetService.save(towerWorksheet);
-        else towerWorksheetService.updateById(towerWorksheet);
-        Integer worksheetId = towerWorksheet.getWorksheetId();
-        towerWorksheetDetail.setWorksheetId(worksheetId);
-        towerWorksheetDetail.setProjectId(projectId);
-        if (!hasAudit) towerEquipmentService.update(
-                new LambdaUpdateWrapper<TowerEquipment>()
-                        .eq(TowerEquipment::getEquipmentId, towerWorksheetDetail.getEquipmentId())
-                        .set(TowerEquipment::getStatus, 4)
-        );
-        if (towerWorksheetDetail.getDetailId() == null) towerWorksheetDetailService.save(towerWorksheetDetail);
-        else towerWorksheetDetailService.updateById(towerWorksheetDetail);
-        // 更新设备为在用
-        TowerEquipment equipment = towerEquipmentService.getById(towerWorksheetDetail.getEquipmentId());
-        equipment.setStatus(4);
-        towerEquipmentService.updateById(equipment);
-        // 审核人
-        if (hasAudit) {
-            for (TowerWorksheetAudit audit : auditList) {
-                audit.setWorksheetId(worksheetId);
-            }
-            towerWorksheetAuditService.remove(
-                    new LambdaQueryWrapper<TowerWorksheetAudit>().eq(TowerWorksheetAudit::getWorksheetId, worksheetId)
-            );
-            towerWorksheetAuditService.saveBatch(auditList);
-        }
-        // 项目成员
-        List<TowerProjectUser> projectUserList = new ArrayList<>();
-        TowerProjectUser startUser = new TowerProjectUser();
-        startUser.setUserId((Integer) postBody.get("startUid"));
-        startUser.setRole(20);
-        startUser.setProjectId(projectId);
-        projectUserList.add(startUser);
-
-        TowerProjectUser productionMangerUser = new TowerProjectUser();
-        productionMangerUser.setUserId((Integer) postBody.get("productionMangerUid"));
-        productionMangerUser.setRole(30);
-        productionMangerUser.setProjectId(projectId);
-        projectUserList.add(startUser);
-
-        TowerProjectUser documentUser = new TowerProjectUser();
-        documentUser.setUserId((Integer) postBody.get("documentUid"));
-        documentUser.setRole(20);
-        documentUser.setProjectId(projectId);
-        projectUserList.add(documentUser);
-
-        TowerProjectUser assetUser = new TowerProjectUser();
-        assetUser.setUserId((Integer) postBody.get("assetUid"));
-        assetUser.setRole(20);
-        assetUser.setProjectId(projectId);
-        projectUserList.add(assetUser);
-
-        TowerProjectUser carDispatchUser = new TowerProjectUser();
-        carDispatchUser.setUserId((Integer) postBody.get("carDispatchUid"));
-        carDispatchUser.setRole(20);
-        carDispatchUser.setProjectId(projectId);
-        projectUserList.add(carDispatchUser);
-
-
-        towerProjectUserService.saveBatch(projectUserList);
-        return success("创建成功");
-    }
-
-    @ApiOperation("派单")
-    @PostMapping("/worksheet/send")
-    public ApiResult<?> worksheetSend(@RequestBody Map<String, ?> postBody) {
-        TowerWorksheet towerWorksheet = postBody.get("worksheet") != null ? JSON.parseObject(JSON.toJSONBytes(postBody.get("worksheet")), TowerWorksheet.class) : null;
-        TowerWorksheetDetail towerWorksheetDetail = postBody.get("detail") != null ? JSON.parseObject(JSON.toJSONBytes(postBody.get("detail")), TowerWorksheetDetail.class) : null;
-        TowerWorksheetSetUp towerWorksheetSetUp = postBody.get("setUp") != null ? JSON.parseObject(JSON.toJSONBytes(postBody.get("setUp")), TowerWorksheetSetUp.class) : null;
-        List<TowerWorksheetParts> towerWorksheetParts = postBody.get("parts") != null ? JSON.parseArray(JSON.toJSONBytes(postBody.get("parts")), TowerWorksheetParts.class) : null;
-        List<TowerWorksheetCarDispatch> towerWorksheetCarDispatches = postBody.get("carDispatchList") != null ? JSON.parseArray(JSON.toJSONBytes(postBody.get("carDispatchList")), TowerWorksheetCarDispatch.class) : null;
-
-        if (towerWorksheet != null) towerWorksheetService.updateById(towerWorksheet);
-        if (towerWorksheetDetail != null) towerWorksheetDetailService.updateById(towerWorksheetDetail);
-        if (towerWorksheetSetUp != null) towerWorksheetSetUpService.save(towerWorksheetSetUp);
-        if (towerWorksheetParts != null) towerWorksheetPartsService.saveBatch(towerWorksheetParts);
-        if (towerWorksheetCarDispatches != null)
-            towerWorksheetCarDispatchService.saveBatch(towerWorksheetCarDispatches);
-
-        return success("派单成功");
-    }
-
-    @ApiOperation("取消")
-    @PostMapping("/worksheet/cancel")
-    public ApiResult<?> worksheetCancel(@RequestBody TowerWorksheet towerWorksheet) {
-        TowerWorksheet worksheet = towerWorksheetService.getById(towerWorksheet.getWorksheetId());
-        if (!worksheet.getAuditStatus().equals(2) && worksheet.getStatus().equals(2)) {
-            if (towerWorksheetService.removeById(towerWorksheet)) return success("取消成功");
-        }
-        return fail("无法取消");
-    }
-
-    @ApiOperation("配件列表")
-    @PostMapping("/cate")
-    public ApiResult<List<Category>> cateList(@RequestBody CategoryParam param) {
-        List<Category> list = categoryService.listRel(param);
-        for (Category category : list) {
-            QueryWrapper<Category> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("parent_id", category.getCategoryId());
-            category.setChildren(categoryService.list(queryWrapper));
-        }
-        return success(list);
-    }
-
-    @ApiOperation("生产主管列表")
-    @PostMapping("/user/list-by-user-level")
-    public ApiResult<List<User>> productionManagerList(@RequestBody UserParam userParam) {
-        userParam.setDeleted(0);
-        System.out.println("userParam   " + userParam);
-        return success(userService.listRel(userParam));
-    }
-
-    @ApiOperation("项目列表")
-    @PostMapping("/project/list")
-    public ApiResult<PageResult<TowerProject>> getProjectList(@RequestBody TowerProjectParam param) {
-        param.setDeleted(0);
-        PageResult<TowerProject> list = towerProjectService.pageRel(param);
-        // 检查各种派单数量
-        for (TowerProject towerProject : list.getList()) {
-            Map<Integer, Integer> resList = new ArrayMap<>();
-            QueryWrapper<TowerWorksheet> queryWrapper0 = new QueryWrapper<>();
-            queryWrapper0.eq("type", TowerConstants.WORKSHEET_TYPE_SET_UP)
-                    .eq("equipment_type", param.getWorksheetEquipType())
-                    .eq("work_type", TowerConstants.WORKSHEET_DETAIL_WORK_TYPE_0);
-            resList.put(TowerConstants.WORKSHEET_DETAIL_WORK_TYPE_0, towerWorksheetService.count(queryWrapper0));
-
-            QueryWrapper<TowerWorksheet> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("type", TowerConstants.WORKSHEET_TYPE_SET_UP)
-                    .eq("equipment_type", param.getWorksheetEquipType())
-                    .eq("work_type", TowerConstants.WORKSHEET_DETAIL_WORK_TYPE_1);
-            resList.put(TowerConstants.WORKSHEET_DETAIL_WORK_TYPE_1, towerWorksheetService.count(queryWrapper1));
-
-            QueryWrapper<TowerWorksheet> queryWrapper2 = new QueryWrapper<>();
-            queryWrapper2.eq("type", TowerConstants.WORKSHEET_TYPE_SET_UP)
-                    .eq("equipment_type", param.getWorksheetEquipType())
-                    .eq("work_type", TowerConstants.WORKSHEET_DETAIL_WORK_TYPE_2);
-            resList.put(TowerConstants.WORKSHEET_DETAIL_WORK_TYPE_2, towerWorksheetService.count(queryWrapper2));
-            towerProject.setWorksheetWorkTypeNumList(resList);
-            towerProject.setOrders(
-                    new HashSet<>(
-                            towerProjectOrderService.list(
-                                    new MPJLambdaWrapper<TowerProjectOrder>()
-                                            .selectAll(TowerProjectOrder.class)
-                                            .select(TowerEquipment::getManufactor, TowerEquipment::getScrapDate)
-                                            .leftJoin(TowerEquipment.class, TowerEquipment::getEquipmentId, TowerProjectOrder::getEquipmentId)
-                                            .eq(TowerProjectOrder::getProjectId, towerProject.getProjectId())
-                                            .eq(TowerProjectOrder::getDeleted, 0)
-                                            .orderByDesc(TowerProjectOrder::getCreateTime)
-                            )
-                    )
-
-            );
-        }
-        return success(list);
-    }
-
-    @ApiOperation("型号列表")
-    @PostMapping("/equipment/list")
-    public ApiResult<List<TowerEquipment>> getEquipmentList(@RequestBody TowerEquipmentParam param) {
-        return success(towerEquipmentService.listRel(param));
-    }
-
-    @ApiOperation("审核详情")
-    @PostMapping("/worksheet/audit-info")
-    public ApiResult<TowerWorksheetAudit> worksheetAuditInfo(@RequestBody TowerWorksheetAuditParam param) {
-        TowerWorksheetAudit towerWorksheetAudit = towerWorksheetAuditService.getOne(
-                new LambdaQueryWrapper<TowerWorksheetAudit>()
-                        .eq(TowerWorksheetAudit::getWorksheetId, param.getWorksheetId())
-                        .eq(TowerWorksheetAudit::getUserId, getLoginUserId())
-        );
-        return success(towerWorksheetAudit);
-    }
-
-    @ApiOperation("审核列表")
-    @PostMapping("/worksheet/audit-list")
-    public ApiResult<List<TowerWorksheetAudit>> worksheetAuditList(@RequestBody TowerWorksheetAuditParam param) {
-        List<TowerWorksheetAudit> list = towerWorksheetAuditService.listRel(param);
-        for (TowerWorksheetAudit towerWorksheetAudit : list) {
-            towerWorksheetAudit.setUser(userService.getById(towerWorksheetAudit.getUserId()));
-        }
-        return success(list);
-    }
-
-    @ApiOperation("审核")
-    @PostMapping("/worksheet/audit")
-    public ApiResult<?> doWorksheetAudit(@RequestBody TowerWorksheetAudit towerWorksheetAudit) {
-        TowerWorksheet towerWorksheet = towerWorksheetService.getById(towerWorksheetAudit.getWorksheetId());
-        TowerWorksheetAudit towerWorksheetAudit1 = towerWorksheetAuditService.getOne(
-                new LambdaQueryWrapper<TowerWorksheetAudit>()
-                        .eq(TowerWorksheetAudit::getWorksheetId, towerWorksheetAudit.getWorksheetId())
-                        .eq(TowerWorksheetAudit::getUserId, getLoginUserId())
-        );
-        if (towerWorksheetAudit1 == null) return fail("无法操作审核");
-        int status = 2;
-        if (towerWorksheetAudit.getStatus().equals(2)) {
-            status = 3;
-            towerWorksheet.setRefuseReason(towerWorksheetAudit.getRefuseReason());
-        }
-        towerWorksheetAudit1.setStatus(towerWorksheet.getAuditStatus());
-        towerWorksheetAudit1.setRefuseReason(towerWorksheetAudit.getRefuseReason());
-        towerWorksheetAuditService.updateById(towerWorksheetAudit1);
-        List<TowerWorksheetAudit> auditList = towerWorksheetAuditService.list(
-                new LambdaQueryWrapper<TowerWorksheetAudit>()
-                        .eq(TowerWorksheetAudit::getWorksheetId, towerWorksheetAudit.getWorksheetId())
-        );
-        int passNum = 0;
-        int unAuditNum = 0;
-        for (TowerWorksheetAudit audit : auditList) {
-            if (audit.getStatus().equals(1)) passNum++;
-            else if (audit.getStatus().equals(0)) unAuditNum++;
-        }
-        if (unAuditNum == 0 && passNum == auditList.size()) status = 2;
-        else if (unAuditNum == 0 && passNum < auditList.size()) status = 3;
-        towerWorksheet.setAuditStatus(status);
-        if (status == 2) {
-            TowerWorksheetDetail towerWorksheetDetail = towerWorksheetDetailService.getOne(
-                    new LambdaQueryWrapper<TowerWorksheetDetail>()
-                            .eq(TowerWorksheetDetail::getWorksheetId, towerWorksheetAudit.getWorksheetId())
-            );
-            towerEquipmentService.update(
-                    new LambdaUpdateWrapper<TowerEquipment>()
-                            .eq(TowerEquipment::getEquipmentId, towerWorksheetDetail.getEquipmentId())
-                            .set(TowerEquipment::getStatus, 4)
-            );
-        }
-        towerWorksheetService.updateById(towerWorksheet);
-        return success();
-    }
-
-    @ApiOperation("审核")
-    @PostMapping("/equipment")
-    public ApiResult<?> equipment(@RequestBody TowerEquipmentParam towerEquipmentParam) {
-        return success(towerEquipmentService.getById(towerEquipmentParam.getEquipmentId()));
-    }
-
-    private Integer sumData(User user, Integer status) {
-        return sumData(user, status, false);
-    }
-
-    private Integer sumData(User user, Integer status, boolean statusIsNeq) {
-        MPJLambdaWrapper<TowerWorksheet> queryWrapper = makeQueryWrapper(user, status, statusIsNeq);
-        if (queryWrapper != null) return towerWorksheetService.count(queryWrapper);
-        else return -1;
-    }
-
-    private MPJLambdaWrapper<TowerWorksheet> makeQueryWrapper(User user, Integer status, boolean statusIsNeq) {
-        MPJLambdaWrapper<TowerWorksheet> towerWorksheetLambdaQueryWrapper = new MPJLambdaWrapper<>();
-        if (!status.equals(-2)) {
-            if (user.getUserLevel().equals(TowerConstants.USER_LEVEL_NONE)) return null;
-            else if (user.getUserLevel().equals(TowerConstants.USER_LEVEL_CLASS_MANAGER)) {
-                towerWorksheetLambdaQueryWrapper.eq("class_manager", user.getUserId());
-            } else if (user.getUserLevel().equals(TowerConstants.USER_LEVEL_DOCUMENTER)) {
-                towerWorksheetLambdaQueryWrapper.eq("document_uid", user.getUserId());
-            } else if (user.getUserLevel().equals(TowerConstants.USER_LEVEL_OPERATOR)) {
-                towerWorksheetLambdaQueryWrapper.eq("start_uid", user.getUserId());
-            } else if (user.getUserLevel().equals(TowerConstants.USER_LEVEL_PRODUCTION_MANAGER)) {
-                towerWorksheetLambdaQueryWrapper.eq("production_manger_uid", user.getUserId());
-            } else if (user.getUserLevel().equals(TowerConstants.USER_LEVEL_ASSET)) {
-                towerWorksheetLambdaQueryWrapper.eq("asset_uid", user.getUserId());
-            } else if (user.getUserLevel().equals(TowerConstants.USER_LEVEL_CAR_DISPATCH)) {
-                towerWorksheetLambdaQueryWrapper.eq("car_dispatch_uid", user.getUserId());
-            } else if (user.getUserLevel().equals(TowerConstants.USER_LEVEL_FIX)) {
-                towerWorksheetLambdaQueryWrapper.eq("fix_uid", user.getUserId());
-            }
-        }
-        towerWorksheetLambdaQueryWrapper.leftJoin(TowerProject.class, TowerProject::getProjectId, TowerWorksheet::getProjectId);
-        if (!status.equals(-1)) {
-            if (status.equals(-2)) {
-                towerWorksheetLambdaQueryWrapper.eq(TowerWorksheet::getAuditStatus, 1);
-            } else {
-                if (!statusIsNeq) towerWorksheetLambdaQueryWrapper.eq(TowerWorksheet::getStatus, status);
-                else towerWorksheetLambdaQueryWrapper.ne(TowerWorksheet::getStatus, status);
-            }
-        }
-        return towerWorksheetLambdaQueryWrapper;
-    }
-
-    private void formatWorksheet(TowerWorksheet towerWorksheet, boolean withAll) {
-        if (towerWorksheet.getProductionMangerUid() != null) {
-            towerWorksheet.setProductionMangerUser(userService.getById(towerWorksheet.getProductionMangerUid()));
-        }
-        if (towerWorksheet.getDocumentUid() != null) {
-            towerWorksheet.setDocumentUser(userService.getById(towerWorksheet.getDocumentUid()));
-        }
-        if (towerWorksheet.getAssetUid() != null) {
-            towerWorksheet.setAssetUser(userService.getById(towerWorksheet.getAssetUid()));
-        }
-        if (towerWorksheet.getCarDispatchUid() != null) {
-            towerWorksheet.setCarDispatchUser(userService.getById(towerWorksheet.getCarDispatchUid()));
-        }
-        if (towerWorksheet.getClassManager() != null) {
-            towerWorksheet.setClassManagerUser(userService.getById(towerWorksheet.getClassManager()));
-        }
-        if (towerWorksheet.getFixUid() != null) {
-            towerWorksheet.setFixUser(userService.getById(towerWorksheet.getFixUid()));
-        }
-        MPJLambdaWrapper<TowerWorksheetDetail> queryWrapperDetail = new MPJLambdaWrapper<>();
-        queryWrapperDetail.eq(TowerWorksheetDetail::getWorksheetId, towerWorksheet.getWorksheetId())
-                .selectAll(TowerWorksheetDetail.class)
-                .select(TowerEquipment::getEquipmentNo, TowerEquipment::getFactoryNo, TowerEquipment::getModel)
-                .selectAs(TowerEquipment::getName, TowerEquipment::getEquipmentName)
-                .leftJoin(TowerEquipment.class, TowerEquipment::getEquipmentId, TowerWorksheetDetail::getEquipmentId);
-        TowerWorksheetDetail towerWorksheetDetail = towerWorksheetDetailService.getOne(queryWrapperDetail);
-        // 累计加高高度
-        TowerWorksheetDetail towerWorksheetDetailOnlyAdd = towerWorksheetDetailService.getOne(
-                new QueryWrapper<TowerWorksheetDetail>()
-                        .select("SUM(`setup_height`) as `total_add_height`")
-                        .eq("work_type", 1)
-                        .eq("project_id", towerWorksheet.getProjectId())
-                        .eq("equipment_id", towerWorksheetDetail.getEquipmentId())
-                        .isNotNull("`setup_height`")
-        );
-        if (towerWorksheetDetailOnlyAdd != null)
-            towerWorksheetDetail.setTotalAddHeight(towerWorksheetDetailOnlyAdd.getTotalAddHeight());
-        else towerWorksheetDetail.setTotalAddHeight(BigDecimal.ZERO);
-        towerWorksheetDetail.setEquipment(towerEquipmentService.getOne(
-                new LambdaQueryWrapper<TowerEquipment>()
-                        .eq(TowerEquipment::getEquipmentId, towerWorksheetDetail.getEquipmentId())
-        ));
-
-        if (!towerWorksheetDetail.getWorkType().equals(0)) {
-            MPJLambdaWrapper<TowerWorksheetDetail> queryWrapperDetailType0 = new MPJLambdaWrapper<>();
-            queryWrapperDetailType0.eq(TowerWorksheetDetail::getProjectId, towerWorksheet.getProjectId())
-                    .eq(TowerWorksheetDetail::getWorkType, 0)
-                    .eq(TowerWorksheetDetail::getEquipmentId, towerWorksheetDetail.getEquipmentId())
-                    .selectAll(TowerWorksheetDetail.class)
-                    .select(TowerEquipment::getEquipmentNo)
-                    .select(TowerEquipment::getFactoryNo)
-                    .selectAs(TowerEquipment::getName, TowerEquipment::getEquipmentName)
-                    .select(TowerEquipment::getModel)
-                    .leftJoin(TowerEquipment.class, TowerEquipment::getEquipmentId, TowerWorksheetDetail::getEquipmentId);
-            TowerWorksheetDetail towerWorksheetDetailType0 = towerWorksheetDetailService.getOne(queryWrapperDetailType0);
-            towerWorksheet.setDetailType0(towerWorksheetDetailType0);
-            if (towerWorksheetDetail.getWorkType().equals(2)) {
-                List<TowerWorksheetDetail> allDetail = towerWorksheetDetailService.list(
-                        new LambdaQueryWrapper<TowerWorksheetDetail>()
-                                .eq(TowerWorksheetDetail::getProjectId, towerWorksheetDetail.getProjectId())
-                                .ne(TowerWorksheetDetail::getWorkType, 2)
-                );
-                BigDecimal finalSetupHeight = BigDecimal.ZERO;
-                if (!allDetail.isEmpty()) {
-                    for (TowerWorksheetDetail detail : allDetail) {
-                        if (detail.getSetupHeight() != null)
-                            finalSetupHeight = finalSetupHeight.add(detail.getSetupHeight());
-                    }
-                }
-                towerWorksheetDetail.setFinalSetupHeight(finalSetupHeight);
-            }
-        }
-        towerWorksheet.setDetail(towerWorksheetDetail);
-        if (!towerWorksheet.getAuditStatus().equals(0)) {
-            List<TowerWorksheetAudit> towerWorksheetAuditList = towerWorksheetAuditService.list(
-                    new LambdaQueryWrapper<TowerWorksheetAudit>().eq(TowerWorksheetAudit::getWorksheetId, towerWorksheet.getWorksheetId())
-            );
-            List<User> auditUserList = userService.listByIds(towerWorksheetAuditList.stream().map(TowerWorksheetAudit::getUserId).collect(Collectors.toList()));
-            for (User user : auditUserList) {
-                user.setAuditStatus(towerWorksheetAuditList.stream().filter(audit -> audit.getUserId().equals(user.getUserId())).findFirst().get().getStatus());
-            }
-            towerWorksheet.setAuditList(auditUserList);
-        }
-        towerWorksheet.setCarDispatchList(towerWorksheetCarDispatchService.list(
-                new LambdaQueryWrapper<TowerWorksheetCarDispatch>().eq(TowerWorksheetCarDispatch::getWorksheetId, towerWorksheet.getWorksheetId())
-        ));
-        if (withAll) {
-            List<TowerWorksheetParts> towerWorksheetParts = towerWorksheetPartsService.list(
-                    new MPJLambdaWrapper<TowerWorksheetParts>()
-                            .selectAll(TowerWorksheetParts.class)
-                            .select("parent.title as parent_parts_title")
-                            .select("parts.title as parts_title")
-                            .leftJoin("shop_category parent on parent.category_id = t.parent_id")
-                            .leftJoin("shop_category parts on parts.category_id = t.cate_id")
-                            .eq(TowerWorksheetParts::getWorksheetId, towerWorksheet.getWorksheetId()));
-            towerWorksheet.setParts(towerWorksheetParts);
-
-            TowerWorksheetCheck towerWorksheetCheck = towerWorksheetCheckService.getOne(
-                    new MPJLambdaWrapper<TowerWorksheetCheck>()
-                            .selectAll(TowerWorksheetCheck.class)
-                            .select(User::getNickname)
-                            .leftJoin(User.class, User::getUserId, TowerWorksheetCheck::getUserId)
-                            .eq(TowerWorksheetCheck::getWorksheetId, towerWorksheet.getWorksheetId()));
-            towerWorksheet.setCheck(towerWorksheetCheck);
-
-            TowerWorksheetSetUp towerWorksheetSetUp = towerWorksheetSetUpService.getOne(
-                    new LambdaQueryWrapper<TowerWorksheetSetUp>()
-                            .eq(TowerWorksheetSetUp::getWorksheetId, towerWorksheet.getWorksheetId()));
-            towerWorksheet.setSetUp(towerWorksheetSetUp);
-        }
-//        return towerWorksheet;
-    }
-
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/BcAgent.java b/src/main/java/com/gxwebsoft/apps/entity/BcAgent.java
deleted file mode 100644
index c6058e3..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/BcAgent.java
+++ /dev/null
@@ -1,65 +0,0 @@
-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
deleted file mode 100644
index 450230a..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/BcCart.java
+++ /dev/null
@@ -1,64 +0,0 @@
-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
deleted file mode 100644
index a9c02ec..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/BcCookbook.java
+++ /dev/null
@@ -1,61 +0,0 @@
-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
deleted file mode 100644
index d02992d..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/BcEquipment.java
+++ /dev/null
@@ -1,79 +0,0 @@
-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
deleted file mode 100644
index cc861dc..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/BcExport.java
+++ /dev/null
@@ -1,94 +0,0 @@
-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 BigDecimal goodsPrice;
-
-    @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
deleted file mode 100644
index b33f9e2..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/BcFood.java
+++ /dev/null
@@ -1,61 +0,0 @@
-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
deleted file mode 100644
index 7c6d4e8..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/BcPlan.java
+++ /dev/null
@@ -1,79 +0,0 @@
-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<Goods> 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
deleted file mode 100644
index 5baddb5..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/BcTemporary.java
+++ /dev/null
@@ -1,80 +0,0 @@
-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
deleted file mode 100644
index 838bbbc..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/Cashier.java
+++ /dev/null
@@ -1,95 +0,0 @@
-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
deleted file mode 100644
index f91fd16..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/Equipment.java
+++ /dev/null
@@ -1,148 +0,0 @@
-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
deleted file mode 100644
index e23c581..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/EquipmentAlarm.java
+++ /dev/null
@@ -1,72 +0,0 @@
-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
deleted file mode 100644
index 8fdc596..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/EquipmentFault.java
+++ /dev/null
@@ -1,75 +0,0 @@
-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
deleted file mode 100644
index c65c4eb..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/EquipmentGoods.java
+++ /dev/null
@@ -1,120 +0,0 @@
-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
deleted file mode 100644
index 476e4ac..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/EquipmentOrder.java
+++ /dev/null
@@ -1,202 +0,0 @@
-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
deleted file mode 100644
index 51f5889..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/EquipmentOrderGoods.java
+++ /dev/null
@@ -1,119 +0,0 @@
-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
deleted file mode 100644
index 688db34..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/EquipmentRecord.java
+++ /dev/null
@@ -1,79 +0,0 @@
-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
deleted file mode 100644
index 7d96aa7..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/Hualala.java
+++ /dev/null
@@ -1,70 +0,0 @@
-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
deleted file mode 100644
index c48e776..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/HualalaCard.java
+++ /dev/null
@@ -1,131 +0,0 @@
-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
deleted file mode 100644
index e0c0708..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/HualalaCardBenefits.java
+++ /dev/null
@@ -1,69 +0,0 @@
-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
deleted file mode 100644
index 85730e1..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/HualalaCart.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * 购物车
- */
-@Data
-public class HualalaCart {
-  List<HualalaFood> 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
deleted file mode 100644
index 560dbc4..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/HualalaCartFood.java
+++ /dev/null
@@ -1,78 +0,0 @@
-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
deleted file mode 100644
index 9b9676d..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/HualalaFood.java
+++ /dev/null
@@ -1,304 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-import com.gxwebsoft.common.system.entity.Menu;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.apache.tika.config.Field;
-
-/**
- * 菜品分类
- *
- * @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<HualalaFood> 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
deleted file mode 100644
index 3175e6d..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/HualalaFoodCategory.java
+++ /dev/null
@@ -1,111 +0,0 @@
-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
deleted file mode 100644
index f6c01b7..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/HualalaShop.java
+++ /dev/null
@@ -1,117 +0,0 @@
-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
deleted file mode 100644
index 60b37f6..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/ItemVo.java
+++ /dev/null
@@ -1,20 +0,0 @@
-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
deleted file mode 100644
index 006b829..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/Link.java
+++ /dev/null
@@ -1,79 +0,0 @@
-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/mapper/BcAgentMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/BcAgentMapper.java
deleted file mode 100644
index cbb956a..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/BcAgentMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<BcAgent> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<BcAgent>
-     */
-    List<BcAgent> selectPageRel(@Param("page") IPage<BcAgent> page,
-                             @Param("param") BcAgentParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<BcAgent> 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
deleted file mode 100644
index 06c057f..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/BcCookbookMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<BcCookbook> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<BcCookbook>
-     */
-    List<BcCookbook> selectPageRel(@Param("page") IPage<BcCookbook> page,
-                             @Param("param") BcCookbookParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<BcCookbook> 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
deleted file mode 100644
index 4a9b7b1..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/BcEquipmentMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<BcEquipment> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<BcEquipment>
-     */
-    List<BcEquipment> selectPageRel(@Param("page") IPage<BcEquipment> page,
-                             @Param("param") BcEquipmentParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<BcEquipment> 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
deleted file mode 100644
index 75345d9..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/BcExportMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<BcExport> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<BcExport>
-     */
-    List<BcExport> selectPageRel(@Param("page") IPage<BcExport> page,
-                             @Param("param") BcExportParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<BcExport> 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
deleted file mode 100644
index 957d632..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/BcFoodMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<BcFood> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<BcFood>
-     */
-    List<BcFood> selectPageRel(@Param("page") IPage<BcFood> page,
-                             @Param("param") BcFoodParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<BcFood> 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
deleted file mode 100644
index bc93d98..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/BcPlanMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<BcPlan> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<BcPlan>
-     */
-    List<BcPlan> selectPageRel(@Param("page") IPage<BcPlan> page,
-                             @Param("param") BcPlanParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<BcPlan> 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
deleted file mode 100644
index 22cebef..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/BcTemporaryMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<BcTemporary> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<BcTemporary>
-     */
-    List<BcTemporary> selectPageRel(@Param("page") IPage<BcTemporary> page,
-                             @Param("param") BcTemporaryParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<BcTemporary> 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
deleted file mode 100644
index 7e5585e..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/CashierMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<Cashier> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<Cashier>
-     */
-    List<Cashier> selectPageRel(@Param("page") IPage<Cashier> page,
-                             @Param("param") CashierParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<Cashier> 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
deleted file mode 100644
index 9131be8..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentAlarmMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<EquipmentAlarm> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<EquipmentAlarm>
-     */
-    List<EquipmentAlarm> selectPageRel(@Param("page") IPage<EquipmentAlarm> page,
-                             @Param("param") EquipmentAlarmParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<EquipmentAlarm> 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
deleted file mode 100644
index 9b7f9f8..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentFaultMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<EquipmentFault> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<EquipmentFault>
-     */
-    List<EquipmentFault> selectPageRel(@Param("page") IPage<EquipmentFault> page,
-                             @Param("param") EquipmentFaultParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<EquipmentFault> 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
deleted file mode 100644
index bbe47c9..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentGoodsMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<EquipmentGoods> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<EquipmentGoods>
-     */
-    List<EquipmentGoods> selectPageRel(@Param("page") IPage<EquipmentGoods> page,
-                             @Param("param") EquipmentGoodsParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<EquipmentGoods> 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
deleted file mode 100644
index 905ba86..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<Equipment> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<Equipment>
-     */
-    List<Equipment> selectPageRel(@Param("page") IPage<Equipment> page,
-                             @Param("param") EquipmentParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<Equipment> 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
deleted file mode 100644
index 88c3887..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentOrderGoodsMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<EquipmentOrderGoods> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<EquipmentOrderGoods>
-     */
-    List<EquipmentOrderGoods> selectPageRel(@Param("page") IPage<EquipmentOrderGoods> page,
-                             @Param("param") EquipmentOrderGoodsParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<EquipmentOrderGoods> 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
deleted file mode 100644
index f3ba899..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentOrderMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<EquipmentOrder> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<EquipmentOrder>
-     */
-    List<EquipmentOrder> selectPageRel(@Param("page") IPage<EquipmentOrder> page,
-                             @Param("param") EquipmentOrderParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<EquipmentOrder> 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
deleted file mode 100644
index 7f9244f..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentRecordMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<EquipmentRecord> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<EquipmentRecord>
-     */
-    List<EquipmentRecord> selectPageRel(@Param("page") IPage<EquipmentRecord> page,
-                             @Param("param") EquipmentRecordParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<EquipmentRecord> 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
deleted file mode 100644
index 139a468..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/HualalaCardBenefitsMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<HualalaCardBenefits> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<HualalaCardBenefits>
-     */
-    List<HualalaCardBenefits> selectPageRel(@Param("page") IPage<HualalaCardBenefits> page,
-                             @Param("param") HualalaCardBenefitsParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<HualalaCardBenefits> 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
deleted file mode 100644
index 3f64ff3..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/HualalaCardMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<HualalaCard> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<HualalaCard>
-     */
-    List<HualalaCard> selectPageRel(@Param("page") IPage<HualalaCard> page,
-                             @Param("param") HualalaCardParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<HualalaCard> 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
deleted file mode 100644
index 7f1cedd..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/HualalaCartFoodMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<HualalaCartFood> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<HualalaCartFood>
-     */
-    List<HualalaCartFood> selectPageRel(@Param("page") IPage<HualalaCartFood> page,
-                             @Param("param") HualalaCartFoodParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<HualalaCartFood> 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
deleted file mode 100644
index b4f33c3..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/HualalaFoodCategoryMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<HualalaFoodCategory> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<HualalaFoodCategory>
-     */
-    List<HualalaFoodCategory> selectPageRel(@Param("page") IPage<HualalaFoodCategory> page,
-                             @Param("param") HualalaFoodCategoryParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<HualalaFoodCategory> 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
deleted file mode 100644
index 3886d45..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/HualalaFoodMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<HualalaFood> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<HualalaFood>
-     */
-    List<HualalaFood> selectPageRel(@Param("page") IPage<HualalaFood> page,
-                             @Param("param") HualalaFoodParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<HualalaFood> 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
deleted file mode 100644
index 286aeef..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/HualalaMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-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<Hualala> {
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/HualalaShopMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/HualalaShopMapper.java
deleted file mode 100644
index 84eff72..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/HualalaShopMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<HualalaShop> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<HualalaShop>
-     */
-    List<HualalaShop> selectPageRel(@Param("page") IPage<HualalaShop> page,
-                             @Param("param") HualalaShopParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<HualalaShop> 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
deleted file mode 100644
index 5a2c573..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/LinkMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<Link> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<Link>
-     */
-    List<Link> selectPageRel(@Param("page") IPage<Link> page,
-                             @Param("param") LinkParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<Link> 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
deleted file mode 100644
index ddb858e..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/TestDataMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<TestData> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TestData>
-     */
-    List<TestData> selectPageRel(@Param("page") IPage<TestData> page,
-                             @Param("param") TestDataParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TestData> 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
deleted file mode 100644
index b0c71fb..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcAgentMapper.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.apps.mapper.BcAgentMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        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
-        <where>
-            <if test="param.agentId != null">
-                AND a.agent_id = #{param.agentId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.parentId != null">
-                AND a.parent_id = #{param.parentId}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            AND b.deleted = 0 AND c.deleted = 0
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.BcAgent">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.BcAgent">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcEquipmentMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcEquipmentMapper.xml
deleted file mode 100644
index 2461118..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcEquipmentMapper.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.apps.mapper.BcEquipmentMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_bc_equipment a
-        <where>
-            <if test="param.bcEquipmentId != null">
-                AND a.bc_equipment_id = #{param.bcEquipmentId}
-            </if>
-            <if test="param.equipmentName != null">
-                AND a.equipment_name LIKE CONCAT('%', #{param.equipmentName}, '%')
-            </if>
-            <if test="param.equipmentCode != null">
-                AND a.equipment_code LIKE CONCAT('%', #{param.equipmentCode}, '%')
-            </if>
-            <if test="param.qrcode != null">
-                AND a.qrcode LIKE CONCAT('%', #{param.qrcode}, '%')
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.BcEquipment">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.BcEquipment">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcExportMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcExportMapper.xml
deleted file mode 100644
index 75c3fb8..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcExportMapper.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.apps.mapper.BcExportMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_bc_export a
-        <where>
-            <if test="param.exportId != null">
-                AND a.export_id = #{param.exportId}
-            </if>
-            <if test="param.organizationName != null">
-                AND a.organization_name LIKE CONCAT('%', #{param.organizationName}, '%')
-            </if>
-            <if test="param.expendMoney != null">
-                AND a.expend_money = #{param.expendMoney}
-            </if>
-            <if test="param.breakfastPost != null">
-                AND a.breakfast_post = #{param.breakfastPost}
-            </if>
-            <if test="param.breakfastSign != null">
-                AND a.breakfast_sign = #{param.breakfastSign}
-            </if>
-            <if test="param.lunchPost != null">
-                AND a.lunch_post = #{param.lunchPost}
-            </if>
-            <if test="param.lunchSign != null">
-                AND a.lunch_sign = #{param.lunchSign}
-            </if>
-            <if test="param.dinnerPost != null">
-                AND a.dinner_post = #{param.dinnerPost}
-            </if>
-            <if test="param.dinnerSign != null">
-                AND a.dinner_sign = #{param.dinnerSign}
-            </if>
-            <if test="param.goodsPrice != null">
-                AND a.goods_price = #{param.goodsPrice}
-            </if>
-            <if test="param.deliveryTime != null">
-                AND a.delivery_time LIKE CONCAT('%', #{param.deliveryTime}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.orderId != null">
-                AND a.order_id = #{param.orderId}
-            </if>
-            <if test="param.organizationId != null">
-                AND a.organization_id = #{param.organizationId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.BcExport">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.BcExport">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcFoodMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcFoodMapper.xml
deleted file mode 100644
index d0fbaaf..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcFoodMapper.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.apps.mapper.BcFoodMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,b.nickname
-        FROM apps_bc_food a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        <where>
-            <if test="param.bcFoodId != null">
-                AND a.bc_food_id = #{param.bcFoodId}
-            </if>
-            <if test="param.planId != null">
-                AND a.plan_id = #{param.planId}
-            </if>
-            <if test="param.period != null">
-                AND a.period LIKE CONCAT('%', #{param.period}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-          <if test="param.keywords != null">
-            AND ( b.nickname LIKE CONCAT('%', #{param.keywords}, '%') )
-          </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.BcFood">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.BcFood">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcPlanMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcPlanMapper.xml
deleted file mode 100644
index e7732c7..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcPlanMapper.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.apps.mapper.BcPlanMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,b.nickname
-        FROM apps_bc_plan a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        <where>
-            <if test="param.bcPlanId != null">
-                AND a.bc_plan_id = #{param.bcPlanId}
-            </if>
-            <if test="param.dayTime != null">
-                AND a.day_time LIKE CONCAT('%', #{param.dayTime}, '%')
-            </if>
-            <if test="param.week != null">
-                AND a.week = #{param.week}
-            </if>
-            <if test="param.type != null">
-                AND a.type LIKE CONCAT('%', #{param.type}, '%')
-            </if>
-            <if test="param.expirationTime != null">
-                AND a.expiration_time LIKE CONCAT('%', #{param.expirationTime}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.day_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.day_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.oldTime != null">
-              AND a.day_time = #{param.oldTime}
-            </if>
-
-            <if test="param.keywords != null">
-              AND ( b.nickname LIKE CONCAT('%', #{param.keywords}, '%') OR a.day_time LIKE CONCAT('%', #{param.keywords}, '%') )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.BcPlan">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.BcPlan">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcTemporaryMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcTemporaryMapper.xml
deleted file mode 100644
index a82fdc4..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcTemporaryMapper.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.apps.mapper.BcTemporaryMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,b.nickname
-        FROM apps_bc_temporary a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        <where>
-            <if test="param.temporaryId != null">
-                AND a.temporary_id = #{param.temporaryId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.parentId != null">
-                AND a.parent_id = #{param.parentId}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.applyStatus != null">
-              AND a.apply_status = #{param.applyStatus}
-            </if>
-            <if test="param.dayTime != null">
-              AND a.expiration_time >= #{param.dayTime}
-            </if>
-            <if test="param.deleted != null">
-              AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-              AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.BcTemporary">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.BcTemporary">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/CashierMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/CashierMapper.xml
deleted file mode 100644
index 5a9e915..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/CashierMapper.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.apps.mapper.CashierMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_cashier a
-        <where>
-            <if test="param.cashierId != null">
-                AND a.cashier_id = #{param.cashierId}
-            </if>
-            <if test="param.buyerId != null">
-                AND a.buyer_id LIKE CONCAT('%', #{param.buyerId}, '%')
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.code != null">
-                AND a.code LIKE CONCAT('%', #{param.code}, '%')
-            </if>
-            <if test="param.msg != null">
-                AND a.msg LIKE CONCAT('%', #{param.msg}, '%')
-            </if>
-            <if test="param.outTradeNo != null">
-                AND a.out_trade_no LIKE CONCAT('%', #{param.outTradeNo}, '%')
-            </if>
-            <if test="param.amount != null">
-                AND a.amount LIKE CONCAT('%', #{param.amount}, '%')
-            </if>
-            <if test="param.payTime != null">
-                AND a.pay_time LIKE CONCAT('%', #{param.payTime}, '%')
-            </if>
-            <if test="param.payType != null">
-                AND a.pay_type LIKE CONCAT('%', #{param.payType}, '%')
-            </if>
-            <if test="param.totalAmount != null">
-                AND a.total_amount = #{param.totalAmount}
-            </if>
-            <if test="param.receiptAmount != null">
-                AND a.receipt_amount = #{param.receiptAmount}
-            </if>
-            <if test="param.feeAmount != null">
-                AND a.fee_amount = #{param.feeAmount}
-            </if>
-            <if test="param.settleAmount != null">
-                AND a.settle_amount = #{param.settleAmount}
-            </if>
-            <if test="param.merchantName != null">
-                AND a.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%')
-            </if>
-            <if test="param.mobile != null">
-                AND a.mobile LIKE CONCAT('%', #{param.mobile}, '%')
-            </if>
-            <if test="param.orderRemark != null">
-                AND a.order_remark LIKE CONCAT('%', #{param.orderRemark}, '%')
-            </if>
-            <if test="param.orderStatus != null">
-                AND a.order_status LIKE CONCAT('%', #{param.orderStatus}, '%')
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.Cashier">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.Cashier">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentAlarmMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentAlarmMapper.xml
deleted file mode 100644
index e8860d3..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentAlarmMapper.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.apps.mapper.EquipmentAlarmMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        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
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.equipmentCode != null">
-                AND a.equipment_code LIKE CONCAT('%', #{param.equipmentCode}, '%')
-            </if>
-            <if test="param.alarmType != null">
-                AND a.alarm_type LIKE CONCAT('%', #{param.alarmType}, '%')
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.handleTime != null">
-                AND a.handle_time LIKE CONCAT('%', #{param.handleTime}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.merchantName != null">
-              AND b.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%')
-            </if>
-            <if test="param.merchantCode != null">
-              AND b.merchant_code = #{param.merchantCode}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.EquipmentAlarm">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.EquipmentAlarm">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentFaultMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentFaultMapper.xml
deleted file mode 100644
index ce6bf2e..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentFaultMapper.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.apps.mapper.EquipmentFaultMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        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
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.equipmentCode != null">
-                AND a.equipment_code = #{param.equipmentCode}
-            </if>
-            <if test="param.faultType != null">
-                AND a.fault_type LIKE CONCAT('%', #{param.faultType}, '%')
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.handleTime != null">
-                AND a.handle_time LIKE CONCAT('%', #{param.handleTime}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-          <if test="param.merchantName != null">
-            AND b.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%')
-          </if>
-          <if test="param.merchantCode != null">
-            AND b.merchant_code = #{param.merchantCode}
-          </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.EquipmentFault">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.EquipmentFault">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentGoodsMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentGoodsMapper.xml
deleted file mode 100644
index 7136e08..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentGoodsMapper.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.apps.mapper.EquipmentGoodsMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        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
-        <where>
-            <if test="param.goodsId != null">
-                AND a.goods_id = #{param.goodsId}
-            </if>
-            <if test="param.equipmentCategory != null">
-                AND a.equipment_category LIKE CONCAT('%', #{param.equipment_category}, '%')
-            </if>
-            <if test="param.image != null">
-                AND a.image LIKE CONCAT('%', #{param.image}, '%')
-            </if>
-          <if test="param.goodsName != null">
-            AND a.goods_name LIKE CONCAT('%', #{param.goodsName}, '%')
-          </if>
-            <if test="param.qrcode != null">
-                AND a.qrcode LIKE CONCAT('%', #{param.qrcode}, '%')
-            </if>
-            <if test="param.categoryId != null">
-                AND a.category_id = #{param.categoryId}
-            </if>
-            <if test="param.batteryModel != null">
-                AND a.battery_model LIKE CONCAT('%', #{param.batteryModel}, '%')
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.batteryRent != null">
-                AND a.battery_rent = #{param.batteryRent}
-            </if>
-            <if test="param.batteryPrice != null">
-                AND a.battery_price = #{param.batteryPrice}
-            </if>
-            <if test="param.batteryDeposit != null">
-                AND a.battery_deposit = #{param.batteryDeposit}
-            </if>
-            <if test="param.batteryInsurance != null">
-                AND a.battery_insurance = #{param.batteryInsurance}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-          <if test="param.merchantCode != null">
-            AND a.merchant_code &lt;= #{param.merchantCode}
-          </if>
-          <if test="param.merchantName != null">
-            AND b.merchant_name &lt;= #{param.merchantName}
-          </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.EquipmentGoods">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.EquipmentGoods">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentMapper.xml
deleted file mode 100644
index 043de45..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentMapper.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.apps.mapper.EquipmentMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-               b.merchant_name,b.merchant_code
-        FROM apps_equipment a
-        LEFT JOIN shop_merchant b ON a.merchant_code = b.merchant_code
-        <where>
-            <if test="param.equipmentId != null">
-                AND a.equipment_id = #{param.equipmentId}
-            </if>
-            <if test="param.equipmentName != null">
-                AND a.equipment_name LIKE CONCAT('%', #{param.equipmentName}, '%')
-            </if>
-            <if test="param.equipmentCode != null">
-                AND a.equipment_code LIKE CONCAT('%', #{param.equipmentCode}, '%')
-            </if>
-            <if test="param.equipmentCategory != null">
-              AND a.equipment_category LIKE CONCAT('%', #{param.equipmentCategory}, '%')
-            </if>
-            <if test="param.equipmentAvatar != null">
-                AND a.equipment_avatar LIKE CONCAT('%', #{param.equipmentAvatar}, '%')
-            </if>
-            <if test="param.batteryModel != null">
-                AND a.battery_model LIKE CONCAT('%', #{param.batteryModel}, '%')
-            </if>
-            <if test="param.bms != null">
-                AND a.bms LIKE CONCAT('%', #{param.bms}, '%')
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.isCtive != null">
-                AND a.is_ctive LIKE CONCAT('%', #{param.isCtive}, '%')
-            </if>
-            <if test="param.workingStatus != null">
-                AND a.working_status LIKE CONCAT('%', #{param.workingStatus}, '%')
-            </if>
-            <if test="param.leaseStatus != null">
-                AND a.lease_status LIKE CONCAT('%', #{param.leaseStatus}, '%')
-            </if>
-            <if test="param.batteryStatus != null">
-                AND a.battery_status LIKE CONCAT('%', #{param.batteryStatus}, '%')
-            </if>
-            <if test="param.batteryPower != null">
-                AND a.battery_power LIKE CONCAT('%', #{param.batteryPower}, '%')
-            </if>
-            <if test="param.isOnline != null">
-                AND a.is_online LIKE CONCAT('%', #{param.isOnline}, '%')
-            </if>
-            <if test="param.totalVoltage != null">
-                AND a.total_voltage LIKE CONCAT('%', #{param.totalVoltage}, '%')
-            </if>
-            <if test="param.bmsBrand != null">
-                AND a.bms_brand LIKE CONCAT('%', #{param.bmsBrand}, '%')
-            </if>
-            <if test="param.surplusCapacity != null">
-                AND a.surplus_capacity LIKE CONCAT('%', #{param.surplusCapacity}, '%')
-            </if>
-            <if test="param.iccid != null">
-                AND a.iccid LIKE CONCAT('%', #{param.iccid}, '%')
-            </if>
-            <if test="param.ctiveTime != null">
-                AND a.ctive_time LIKE CONCAT('%', #{param.ctiveTime}, '%')
-            </if>
-            <if test="param.batteryDeliveryTime != null">
-                AND a.battery_delivery_time LIKE CONCAT('%', #{param.batteryDeliveryTime}, '%')
-            </if>
-            <if test="param.orderId != null">
-              AND a.order_id = #{param.orderId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-          <if test="param.merchantName != null">
-            AND b.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%')
-          </if>
-          <if test="param.merchantCode != null">
-            AND b.merchant_code = #{param.merchantCode}
-          </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.Equipment">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.Equipment">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentOrderGoodsMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentOrderGoodsMapper.xml
deleted file mode 100644
index 0a75b05..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentOrderGoodsMapper.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.apps.mapper.EquipmentOrderGoodsMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_equipment_order_goods a
-        <where>
-            <if test="param.orderGoodsId != null">
-                AND a.order_goods_id = #{param.orderGoodsId}
-            </if>
-            <if test="param.goodsName != null">
-                AND a.goods_name LIKE CONCAT('%', #{param.goodsName}, '%')
-            </if>
-            <if test="param.equipmentCategory != null">
-                AND a.equipment_category LIKE CONCAT('%', #{param.equipmentCategory}, '%')
-            </if>
-            <if test="param.image != null">
-                AND a.image LIKE CONCAT('%', #{param.image}, '%')
-            </if>
-            <if test="param.qrcode != null">
-                AND a.qrcode LIKE CONCAT('%', #{param.qrcode}, '%')
-            </if>
-            <if test="param.categoryId != null">
-                AND a.category_id = #{param.categoryId}
-            </if>
-            <if test="param.batteryModel != null">
-                AND a.battery_model LIKE CONCAT('%', #{param.batteryModel}, '%')
-            </if>
-            <if test="param.sellingPoint != null">
-                AND a.selling_point LIKE CONCAT('%', #{param.sellingPoint}, '%')
-            </if>
-            <if test="param.stockTotal != null">
-                AND a.stock_total = #{param.stockTotal}
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.batteryRent != null">
-                AND a.battery_rent = #{param.batteryRent}
-            </if>
-            <if test="param.batteryPrice != null">
-                AND a.battery_price = #{param.batteryPrice}
-            </if>
-            <if test="param.batteryDeposit != null">
-                AND a.battery_deposit = #{param.batteryDeposit}
-            </if>
-            <if test="param.batteryInsurance != null">
-                AND a.battery_insurance = #{param.batteryInsurance}
-            </if>
-            <if test="param.downPayment != null">
-                AND a.down_payment = #{param.downPayment}
-            </if>
-            <if test="param.periods != null">
-                AND a.periods = #{param.periods}
-            </if>
-            <if test="param.repayment != null">
-                AND a.repayment = #{param.repayment}
-            </if>
-            <if test="param.serviceCharges != null">
-                AND a.service_charges = #{param.serviceCharges}
-            </if>
-            <if test="param.periodsType != null">
-                AND a.periods_type = #{param.periodsType}
-            </if>
-            <if test="param.orderId != null">
-                AND a.order_id = #{param.orderId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.EquipmentOrderGoods">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.EquipmentOrderGoods">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentOrderMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentOrderMapper.xml
deleted file mode 100644
index bf65d02..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentOrderMapper.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.apps.mapper.EquipmentOrderMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_equipment_order a
-        <where>
-            <if test="param.orderId != null">
-                AND a.order_id = #{param.orderId}
-            </if>
-            <if test="param.subject != null">
-                AND a.subject LIKE CONCAT('%', #{param.subject}, '%')
-            </if>
-            <if test="param.orderNo != null">
-                AND a.order_no LIKE CONCAT('%', #{param.orderNo}, '%')
-            </if>
-            <if test="param.totalPrice != null">
-                AND a.total_price = #{param.totalPrice}
-            </if>
-            <if test="param.orderPrice != null">
-                AND a.order_price = #{param.orderPrice}
-            </if>
-            <if test="param.couponId != null">
-                AND a.coupon_id = #{param.couponId}
-            </if>
-            <if test="param.couponMoney != null">
-                AND a.coupon_money = #{param.couponMoney}
-            </if>
-            <if test="param.pointsMoney != null">
-                AND a.points_money = #{param.pointsMoney}
-            </if>
-            <if test="param.pointsNum != null">
-                AND a.points_num = #{param.pointsNum}
-            </if>
-            <if test="param.payPrice != null">
-                AND a.pay_price = #{param.payPrice}
-            </if>
-            <if test="param.receiptAmount != null">
-                AND a.receipt_amount = #{param.receiptAmount}
-            </if>
-            <if test="param.updatePrice != null">
-                AND a.update_price = #{param.updatePrice}
-            </if>
-            <if test="param.buyerRemark != null">
-                AND a.buyer_remark LIKE CONCAT('%', #{param.buyerRemark}, '%')
-            </if>
-            <if test="param.payType != null">
-                AND a.pay_type = #{param.payType}
-            </if>
-            <if test="param.payMethod != null">
-                AND a.pay_method LIKE CONCAT('%', #{param.payMethod}, '%')
-            </if>
-            <if test="param.payStatus != null">
-                AND a.pay_status = #{param.payStatus}
-            </if>
-            <if test="param.payTime != null">
-                AND a.pay_time LIKE CONCAT('%', #{param.payTime}, '%')
-            </if>
-            <if test="param.tradeId != null">
-                AND a.trade_id LIKE CONCAT('%', #{param.tradeId}, '%')
-            </if>
-            <if test="param.deliveryType != null">
-                AND a.delivery_type = #{param.deliveryType}
-            </if>
-            <if test="param.extractShopId != null">
-                AND a.extract_shop_id = #{param.extractShopId}
-            </if>
-            <if test="param.extractClerkId != null">
-                AND a.extract_clerk_id = #{param.extractClerkId}
-            </if>
-            <if test="param.expressPrice != null">
-                AND a.express_price = #{param.expressPrice}
-            </if>
-            <if test="param.expressId != null">
-                AND a.express_id = #{param.expressId}
-            </if>
-            <if test="param.expressNo != null">
-                AND a.express_no LIKE CONCAT('%', #{param.expressNo}, '%')
-            </if>
-            <if test="param.deliveryStatus != null">
-                AND a.delivery_status = #{param.deliveryStatus}
-            </if>
-            <if test="param.deliveryTime != null">
-                AND a.delivery_time LIKE CONCAT('%', #{param.deliveryTime}, '%')
-            </if>
-            <if test="param.receiptStatus != null">
-                AND a.receipt_status = #{param.receiptStatus}
-            </if>
-            <if test="param.receiptTime != null">
-                AND a.receipt_time LIKE CONCAT('%', #{param.receiptTime}, '%')
-            </if>
-            <if test="param.orderStatus != null">
-                AND a.order_status = #{param.orderStatus}
-            </if>
-            <if test="param.pointsBonus != null">
-                AND a.points_bonus = #{param.pointsBonus}
-            </if>
-            <if test="param.merchantRemark != null">
-                AND a.merchant_remark LIKE CONCAT('%', #{param.merchantRemark}, '%')
-            </if>
-            <if test="param.isSettled != null">
-                AND a.is_settled = #{param.isSettled}
-            </if>
-            <if test="param.rentOrderId != null">
-                AND a.rent_order_id = #{param.rentOrderId}
-            </if>
-            <if test="param.transactionId != null">
-                AND a.transaction_id LIKE CONCAT('%', #{param.transactionId}, '%')
-            </if>
-            <if test="param.isComment != null">
-                AND a.is_comment = #{param.isComment}
-            </if>
-            <if test="param.orderSource != null">
-                AND a.order_source = #{param.orderSource}
-            </if>
-            <if test="param.orderSourceId != null">
-                AND a.order_source_id = #{param.orderSourceId}
-            </if>
-            <if test="param.orderSourceData != null">
-                AND a.order_source_data LIKE CONCAT('%', #{param.orderSourceData}, '%')
-            </if>
-            <if test="param.batteryRent != null">
-                AND a.battery_rent = #{param.batteryRent}
-            </if>
-            <if test="param.batteryDeposit != null">
-                AND a.battery_deposit = #{param.batteryDeposit}
-            </if>
-            <if test="param.batteryInsurance != null">
-                AND a.battery_insurance = #{param.batteryInsurance}
-            </if>
-            <if test="param.month != null">
-                AND a.month = #{param.month}
-            </if>
-            <if test="param.expirationTime != null">
-                AND a.expiration_time LIKE CONCAT('%', #{param.expirationTime}, '%')
-            </if>
-            <if test="param.platform != null">
-                AND a.platform LIKE CONCAT('%', #{param.platform}, '%')
-            </if>
-            <if test="param.isRenew != null">
-                AND a.is_renew = #{param.isRenew}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.shopId != null">
-                AND a.shop_id = #{param.shopId}
-            </if>
-            <if test="param.goodsId != null">
-                AND a.goods_id = #{param.goodsId}
-            </if>
-            <if test="param.equipmentId != null">
-                AND a.equipment_id = #{param.equipmentId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.EquipmentOrder">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.EquipmentOrder">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentRecordMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentRecordMapper.xml
deleted file mode 100644
index 7213717..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentRecordMapper.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.apps.mapper.EquipmentRecordMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        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
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.equipmentCode != null">
-                AND a.equipment_code LIKE CONCAT('%', #{param.equipmentCode}, '%')
-            </if>
-            <if test="param.eventType != null">
-                AND a.event_type LIKE CONCAT('%', #{param.eventType}, '%')
-            </if>
-            <if test="param.params != null">
-                AND a.params LIKE CONCAT('%', #{param.params}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-          <if test="param.createTimeEnd != null">
-            AND a.create_time &lt;= #{param.createTimeEnd}
-          </if>
-          <if test="param.orderId != null">
-            AND a.order_id = #{param.orderId}
-          </if>
-          <if test="param.merchantName != null">
-            AND b.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%')
-          </if>
-          <if test="param.merchantCode != null">
-            AND b.merchant_code = #{param.merchantCode}
-          </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.EquipmentRecord">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.EquipmentRecord">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCardMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCardMapper.xml
deleted file mode 100644
index 1ff3515..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCardMapper.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.apps.mapper.HualalaCardMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_hualala_card a
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.groupId != null">
-                AND a.group_id LIKE CONCAT('%', #{param.groupId}, '%')
-            </if>
-            <if test="param.shopId != null">
-                AND a.shop_id LIKE CONCAT('%', #{param.shopId}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.cardId != null">
-                AND a.card_id LIKE CONCAT('%', #{param.cardId}, '%')
-            </if>
-            <if test="param.cardTypeId != null">
-                AND a.card_type_id LIKE CONCAT('%', #{param.cardTypeId}, '%')
-            </if>
-            <if test="param.cardLevelId != null">
-                AND a.card_level_id LIKE CONCAT('%', #{param.cardLevelId}, '%')
-            </if>
-            <if test="param.cardLevelName != null">
-                AND a.card_level_name LIKE CONCAT('%', #{param.cardLevelName}, '%')
-            </if>
-            <if test="param.cardStatus != null">
-                AND a.card_status LIKE CONCAT('%', #{param.cardStatus}, '%')
-            </if>
-            <if test="param.customerId != null">
-                AND a.customer_id LIKE CONCAT('%', #{param.customerId}, '%')
-            </if>
-            <if test="param.createShopId != null">
-                AND a.create_shop_id LIKE CONCAT('%', #{param.createShopId}, '%')
-            </if>
-            <if test="param.createShopName != null">
-                AND a.create_shop_name LIKE CONCAT('%', #{param.createShopName}, '%')
-            </if>
-            <if test="param.cardNo != null">
-                AND a.card_no LIKE CONCAT('%', #{param.cardNo}, '%')
-            </if>
-            <if test="param.customerName != null">
-                AND a.customer_name LIKE CONCAT('%', #{param.customerName}, '%')
-            </if>
-            <if test="param.customerMobile != null">
-                AND a.customer_mobile LIKE CONCAT('%', #{param.customerMobile}, '%')
-            </if>
-            <if test="param.customerSex != null">
-                AND a.customer_sex = #{param.customerSex}
-            </if>
-            <if test="param.customerBirthday != null">
-                AND a.customer_birthday LIKE CONCAT('%', #{param.customerBirthday}, '%')
-            </if>
-            <if test="param.cardBalance != null">
-                AND a.card_balance = #{param.cardBalance}
-            </if>
-            <if test="param.pointBalance != null">
-                AND a.point_balance = #{param.pointBalance}
-            </if>
-            <if test="param.saveMoneyTotal != null">
-                AND a.save_money_total = #{param.saveMoneyTotal}
-            </if>
-            <if test="param.consumptionTotal != null">
-                AND a.consumption_total = #{param.consumptionTotal}
-            </if>
-            <if test="param.consumptionCount != null">
-                AND a.consumption_count = #{param.consumptionCount}
-            </if>
-            <if test="param.grade != null">
-                AND a.grade = #{param.grade}
-            </if>
-            <if test="param.nextLevelGrade != null">
-                AND a.next_level_grade = #{param.nextLevelGrade}
-            </if>
-            <if test="param.expireTime != null">
-                AND a.expire_time LIKE CONCAT('%', #{param.expireTime}, '%')
-            </if>
-            <if test="param.lastTransTime != null">
-                AND a.last_trans_time LIKE CONCAT('%', #{param.lastTransTime}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.HualalaCard">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.HualalaCard">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCartFoodMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCartFoodMapper.xml
deleted file mode 100644
index e4d0a9d..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCartFoodMapper.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.apps.mapper.HualalaCartFoodMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_hualala_cart_food a
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.foodId != null">
-                AND a.food_id = #{param.foodId}
-            </if>
-            <if test="param.foodName != null">
-                AND a.food_name LIKE CONCAT('%', #{param.foodName}, '%')
-            </if>
-            <if test="param.skuId != null">
-                AND a.sku_id LIKE CONCAT('%', #{param.skuId}, '%')
-            </if>
-            <if test="param.shopId != null">
-                AND a.shop_id = #{param.shopId}
-            </if>
-            <if test="param.shopName != null">
-                AND a.shop_name LIKE CONCAT('%', #{param.shopName}, '%')
-            </if>
-            <if test="param.shopLogo != null">
-                AND a.shop_logo LIKE CONCAT('%', #{param.shopLogo}, '%')
-            </if>
-            <if test="param.coverUrl != null">
-                AND a.cover_url LIKE CONCAT('%', #{param.coverUrl}, '%')
-            </if>
-            <if test="param.sellPrice != null">
-                AND a.sell_price = #{param.sellPrice}
-            </if>
-            <if test="param.stock != null">
-                AND a.stock = #{param.stock}
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.HualalaCartFood">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.HualalaCartFood">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaFoodCategoryMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaFoodCategoryMapper.xml
deleted file mode 100644
index 8d9040e..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaFoodCategoryMapper.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.apps.mapper.HualalaFoodCategoryMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_hualala_food_category a
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.type != null">
-                AND a.type = #{param.type}
-            </if>
-            <if test="param.foodCategoryName != null">
-                AND a.food_category_name LIKE CONCAT('%', #{param.foodCategoryName}, '%')
-            </if>
-            <if test="param.foodSubjectName != null">
-                AND a.food_subject_name LIKE CONCAT('%', #{param.foodSubjectName}, '%')
-            </if>
-            <if test="param.foodKey != null">
-                AND a.food_key LIKE CONCAT('%', #{param.foodKey}, '%')
-            </if>
-            <if test="param.foodCount != null">
-                AND a.food_count LIKE CONCAT('%', #{param.foodCount}, '%')
-            </if>
-            <if test="param.foodCategoryId != null">
-                AND a.food_category_id LIKE CONCAT('%', #{param.foodCategoryId}, '%')
-            </if>
-            <if test="param.foodCategoryGroupName != null">
-                AND a.food_category_group_name LIKE CONCAT('%', #{param.foodCategoryGroupName}, '%')
-            </if>
-            <if test="param.foodCategoryKey != null">
-                AND a.food_category_key LIKE CONCAT('%', #{param.foodCategoryKey}, '%')
-            </if>
-            <if test="param.action != null">
-                AND a.action LIKE CONCAT('%', #{param.action}, '%')
-            </if>
-            <if test="param.settlementProportion != null">
-                AND a.settlement_proportion LIKE CONCAT('%', #{param.settlementProportion}, '%')
-            </if>
-            <if test="param.isActive != null">
-                AND a.is_active = #{param.isActive}
-            </if>
-            <if test="param.isBatching != null">
-                AND a.is_batching = #{param.isBatching}
-            </if>
-            <if test="param.isSingleSale != null">
-                AND a.is_single_sale = #{param.isSingleSale}
-            </if>
-            <if test="param.sortIndex != null">
-                AND a.sort_index = #{param.sortIndex}
-            </if>
-            <if test="param.adsId != null">
-                AND a.ads_id = #{param.adsId}
-            </if>
-            <if test="param.shopId != null">
-                AND a.shop_id LIKE CONCAT('%', #{param.shopId}, '%')
-            </if>
-            <if test="param.image != null">
-                AND a.image LIKE CONCAT('%', #{param.image}, '%')
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.HualalaFoodCategory">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.HualalaFoodCategory">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaFoodMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaFoodMapper.xml
deleted file mode 100644
index 0e56981..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaFoodMapper.xml
+++ /dev/null
@@ -1,335 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.apps.mapper.HualalaFoodMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_hualala_food a
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.foodId != null">
-                AND a.food_id LIKE CONCAT('%', #{param.foodId}, '%')
-            </if>
-            <if test="param.foodKey != null">
-                AND a.food_key LIKE CONCAT('%', #{param.foodKey}, '%')
-            </if>
-            <if test="param.groupId != null">
-                AND a.group_id LIKE CONCAT('%', #{param.groupId}, '%')
-            </if>
-            <if test="param.shopId != null">
-                AND a.shop_id LIKE CONCAT('%', #{param.shopId}, '%')
-            </if>
-            <if test="param.foodCount != null">
-                AND a.food_count LIKE CONCAT('%', #{param.foodCount}, '%')
-            </if>
-            <if test="param.foodCategoryId != null">
-                AND a.food_category_id LIKE CONCAT('%', #{param.foodCategoryId}, '%')
-            </if>
-            <if test="param.foodCategoryKey != null">
-                AND a.food_category_key LIKE CONCAT('%', #{param.foodCategoryKey}, '%')
-            </if>
-            <if test="param.foodCategoryName != null">
-                AND a.food_category_name LIKE CONCAT('%', #{param.foodCategoryName}, '%')
-            </if>
-            <if test="param.foodOnlineCategoryId != null">
-                AND a.food_online_category_id LIKE CONCAT('%', #{param.foodOnlineCategoryId}, '%')
-            </if>
-            <if test="param.foodOnlineCategoryKey != null">
-                AND a.food_online_category_key LIKE CONCAT('%', #{param.foodOnlineCategoryKey}, '%')
-            </if>
-            <if test="param.foodOnlineCategoryName != null">
-                AND a.food_online_category_name LIKE CONCAT('%', #{param.foodOnlineCategoryName}, '%')
-            </if>
-            <if test="param.isBatching != null">
-                AND a.is_batching = #{param.isBatching}
-            </if>
-            <if test="param.isSingleSale != null">
-                AND a.is_single_sale = #{param.isSingleSale}
-            </if>
-            <if test="param.foodSubjectKey != null">
-                AND a.food_subject_key LIKE CONCAT('%', #{param.foodSubjectKey}, '%')
-            </if>
-            <if test="param.departmentKeyLst != null">
-                AND a.department_key_lst LIKE CONCAT('%', #{param.departmentKeyLst}, '%')
-            </if>
-            <if test="param.batchingFoodCategoryKey != null">
-                AND a.batching_food_category_key LIKE CONCAT('%', #{param.batchingFoodCategoryKey}, '%')
-            </if>
-            <if test="param.foodName != null">
-                AND a.food_name LIKE CONCAT('%', #{param.foodName}, '%')
-            </if>
-            <if test="param.foodCode != null">
-                AND a.food_code LIKE CONCAT('%', #{param.foodCode}, '%')
-            </if>
-            <if test="param.foodAliasName != null">
-                AND a.food_alias_name LIKE CONCAT('%', #{param.foodAliasName}, '%')
-            </if>
-            <if test="param.foodMnemonicCode != null">
-                AND a.food_mnemonic_code LIKE CONCAT('%', #{param.foodMnemonicCode}, '%')
-            </if>
-            <if test="param.isDiscount != null">
-                AND a.is_discount = #{param.isDiscount}
-            </if>
-            <if test="param.isComments != null">
-                AND a.is_comments = #{param.isComments}
-            </if>
-            <if test="param.isActive != null">
-                AND a.is_active = #{param.isActive}
-            </if>
-            <if test="param.isOpen != null">
-                AND a.is_open = #{param.isOpen}
-            </if>
-            <if test="param.isSetFood != null">
-                AND a.is_set_food = #{param.isSetFood}
-            </if>
-            <if test="param.setFoodDetailJson != null">
-                AND a.set_food_detail_json LIKE CONCAT('%', #{param.setFoodDetailJson}, '%')
-            </if>
-            <if test="param.isTempFood != null">
-                AND a.is_temp_food = #{param.isTempFood}
-            </if>
-            <if test="param.units != null">
-                AND a.units LIKE CONCAT('%', #{param.units}, '%')
-            </if>
-            <if test="param.py != null">
-                AND a.py LIKE CONCAT('%', #{param.py}, '%')
-            </if>
-            <if test="param.minOrderCount != null">
-                AND a.min_order_count LIKE CONCAT('%', #{param.minOrderCount}, '%')
-            </if>
-            <if test="param.tasteList != null">
-                AND a.taste_list LIKE CONCAT('%', #{param.tasteList}, '%')
-            </if>
-            <if test="param.tasteGroupList != null">
-                AND a.taste_group_list LIKE CONCAT('%', #{param.tasteGroupList}, '%')
-            </if>
-            <if test="param.makingMethodList != null">
-                AND a.making_method_list LIKE CONCAT('%', #{param.makingMethodList}, '%')
-            </if>
-            <if test="param.makingMethodGroupList != null">
-                AND a.making_method_group_list LIKE CONCAT('%', #{param.makingMethodGroupList}, '%')
-            </if>
-            <if test="param.isSpecialty != null">
-                AND a.is_specialty = #{param.isSpecialty}
-            </if>
-            <if test="param.isRecommend != null">
-                AND a.is_recommend = #{param.isRecommend}
-            </if>
-            <if test="param.isNews != null">
-                AND a.is_news = #{param.isNews}
-            </if>
-            <if test="param.hotTag != null">
-                AND a.hot_tag LIKE CONCAT('%', #{param.hotTag}, '%')
-            </if>
-            <if test="param.salesCount != null">
-                AND a.sales_count LIKE CONCAT('%', #{param.salesCount}, '%')
-            </if>
-            <if test="param.isNeedConfirmFoodNumber != null">
-                AND a.is_need_confirm_food_number = #{param.isNeedConfirmFoodNumber}
-            </if>
-            <if test="param.takeoutPackagingFee != null">
-                AND a.takeout_packaging_fee LIKE CONCAT('%', #{param.takeoutPackagingFee}, '%')
-            </if>
-            <if test="param.incrementUnit != null">
-                AND a.increment_unit LIKE CONCAT('%', #{param.incrementUnit}, '%')
-            </if>
-            <if test="param.takeawayTag != null">
-                AND a.takeaway_tag LIKE CONCAT('%', #{param.takeawayTag}, '%')
-            </if>
-            <if test="param.workingLunchTag != null">
-                AND a.working_lunch_tag LIKE CONCAT('%', #{param.workingLunchTag}, '%')
-            </if>
-            <if test="param.adsId != null">
-                AND a.ads_id LIKE CONCAT('%', #{param.adsId}, '%')
-            </if>
-            <if test="param.imgePath != null">
-                AND a.imge_path LIKE CONCAT('%', #{param.imgePath}, '%')
-            </if>
-            <if test="param.isHasImage != null">
-                AND a.is_has_image = #{param.isHasImage}
-            </if>
-            <if test="param.imageHwp != null">
-                AND a.image_hwp LIKE CONCAT('%', #{param.imageHwp}, '%')
-            </if>
-            <if test="param.starLevel != null">
-                AND a.star_level LIKE CONCAT('%', #{param.starLevel}, '%')
-            </if>
-            <if test="param.foodTagIds != null">
-                AND a.food_tag_ids LIKE CONCAT('%', #{param.foodTagIds}, '%')
-            </if>
-            <if test="param.parentFoodId != null">
-                AND a.parent_food_id LIKE CONCAT('%', #{param.parentFoodId}, '%')
-            </if>
-            <if test="param.foodEnName != null">
-                AND a.food_en_name LIKE CONCAT('%', #{param.foodEnName}, '%')
-            </if>
-            <if test="param.isAutoAdd != null">
-                AND a.is_auto_add = #{param.isAutoAdd}
-            </if>
-            <if test="param.isCanRefund != null">
-                AND a.is_can_refund = #{param.isCanRefund}
-            </if>
-            <if test="param.setPerson != null">
-                AND a.set_person = #{param.setPerson}
-            </if>
-            <if test="param.tasteIsRequired != null">
-                AND a.taste_is_required = #{param.tasteIsRequired}
-            </if>
-            <if test="param.tasteIsMultiple != null">
-                AND a.taste_is_multiple = #{param.tasteIsMultiple}
-            </if>
-            <if test="param.makingMethodIsRequired != null">
-                AND a.making_method_is_required = #{param.makingMethodIsRequired}
-            </if>
-            <if test="param.makingMethodIsMultiple != null">
-                AND a.making_method_is_multiple = #{param.makingMethodIsMultiple}
-            </if>
-            <if test="param.initClickAmount != null">
-                AND a.init_click_amount LIKE CONCAT('%', #{param.initClickAmount}, '%')
-            </if>
-            <if test="param.actualClickAmount != null">
-                AND a.actual_click_amount LIKE CONCAT('%', #{param.actualClickAmount}, '%')
-            </if>
-            <if test="param.recentClickAmount != null">
-                AND a.recent_click_amount LIKE CONCAT('%', #{param.recentClickAmount}, '%')
-            </if>
-            <if test="param.clickAlertMess != null">
-                AND a.click_alert_mess LIKE CONCAT('%', #{param.clickAlertMess}, '%')
-            </if>
-            <if test="param.sourceFoodId != null">
-                AND a.source_food_id LIKE CONCAT('%', #{param.sourceFoodId}, '%')
-            </if>
-            <if test="param.salesCommission != null">
-                AND a.sales_commission LIKE CONCAT('%', #{param.salesCommission}, '%')
-            </if>
-            <if test="param.foodKeyElementLst != null">
-                AND a.food_key_element_lst LIKE CONCAT('%', #{param.foodKeyElementLst}, '%')
-            </if>
-            <if test="param.foodSortIndex != null">
-                AND a.food_sort_index LIKE CONCAT('%', #{param.foodSortIndex}, '%')
-            </if>
-            <if test="param.actionTime != null">
-                AND a.action_time LIKE CONCAT('%', #{param.actionTime}, '%')
-            </if>
-            <if test="param.foodSubjectName != null">
-                AND a.food_subject_name LIKE CONCAT('%', #{param.foodSubjectName}, '%')
-            </if>
-            <if test="param.foodSubjectCode != null">
-                AND a.food_subject_code LIKE CONCAT('%', #{param.foodSubjectCode}, '%')
-            </if>
-            <if test="param.departmentId != null">
-                AND a.department_id LIKE CONCAT('%', #{param.departmentId}, '%')
-            </if>
-            <if test="param.departmentKey != null">
-                AND a.department_key LIKE CONCAT('%', #{param.departmentKey}, '%')
-            </if>
-            <if test="param.popularity != null">
-                AND a.popularity LIKE CONCAT('%', #{param.popularity}, '%')
-            </if>
-            <if test="param.detailSplit != null">
-                AND a.detail_split LIKE CONCAT('%', #{param.detailSplit}, '%')
-            </if>
-            <if test="param.batchingIsFoodNumberRate != null">
-                AND a.batching_is_food_number_rate LIKE CONCAT('%', #{param.batchingIsFoodNumberRate}, '%')
-            </if>
-            <if test="param.foodCategoryCode != null">
-                AND a.food_category_code LIKE CONCAT('%', #{param.foodCategoryCode}, '%')
-            </if>
-            <if test="param.foodCategoryEnName != null">
-                AND a.food_category_en_name LIKE CONCAT('%', #{param.foodCategoryEnName}, '%')
-            </if>
-            <if test="param.foodCategoryGroupName != null">
-                AND a.food_category_group_name LIKE CONCAT('%', #{param.foodCategoryGroupName}, '%')
-            </if>
-            <if test="param.specialPrice != null">
-                AND a.special_price LIKE CONCAT('%', #{param.specialPrice}, '%')
-            </if>
-            <if test="param.specialPrice2 != null">
-                AND a.special_price2 LIKE CONCAT('%', #{param.specialPrice2}, '%')
-            </if>
-            <if test="param.specialPrice3 != null">
-                AND a.special_price3 LIKE CONCAT('%', #{param.specialPrice3}, '%')
-            </if>
-            <if test="param.specialPrice4 != null">
-                AND a.special_price4 LIKE CONCAT('%', #{param.specialPrice4}, '%')
-            </if>
-            <if test="param.specialPrice5 != null">
-                AND a.special_price5 LIKE CONCAT('%', #{param.specialPrice5}, '%')
-            </if>
-            <if test="param.specialPrice6 != null">
-                AND a.special_price6 LIKE CONCAT('%', #{param.specialPrice6}, '%')
-            </if>
-            <if test="param.onlineWmPrice != null">
-                AND a.online_wm_price LIKE CONCAT('%', #{param.onlineWmPrice}, '%')
-            </if>
-            <if test="param.tagIds != null">
-                AND a.tag_ids LIKE CONCAT('%', #{param.tagIds}, '%')
-            </if>
-            <if test="param.tagNames != null">
-                AND a.tag_names LIKE CONCAT('%', #{param.tagNames}, '%')
-            </if>
-            <if test="param.giftItemId != null">
-                AND a.gift_item_id LIKE CONCAT('%', #{param.giftItemId}, '%')
-            </if>
-            <if test="param.giftValidPeriod != null">
-                AND a.gift_valid_period LIKE CONCAT('%', #{param.giftValidPeriod}, '%')
-            </if>
-            <if test="param.description != null">
-                AND a.description LIKE CONCAT('%', #{param.description}, '%')
-            </if>
-            <if test="param.action != null">
-                AND a.action LIKE CONCAT('%', #{param.action}, '%')
-            </if>
-            <if test="param.settlementProportion != null">
-                AND a.settlement_proportion LIKE CONCAT('%', #{param.settlementProportion}, '%')
-            </if>
-            <if test="param.sortIndex != null">
-                AND a.sort_index = #{param.sortIndex}
-            </if>
-            <if test="param.image != null">
-                AND a.image LIKE CONCAT('%', #{param.image}, '%')
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.HualalaFood">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.HualalaFood">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaMapper.xml
deleted file mode 100644
index 83ff23d..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.apps.mapper.HualalaMapper">
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaShopMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaShopMapper.xml
deleted file mode 100644
index ba77d82..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaShopMapper.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.apps.mapper.HualalaShopMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_hualala_shop a
-        <where>
-            <if test="param.shopId != null">
-                AND a.shop_id = #{param.shopId}
-            </if>
-            <if test="param.shopName != null">
-                AND a.shop_name LIKE CONCAT('%', #{param.shopName}, '%')
-            </if>
-            <if test="param.logoUrl != null">
-                AND a.logo_url LIKE CONCAT('%', #{param.logoUrl}, '%')
-            </if>
-            <if test="param.shopCity != null">
-                AND a.shop_city LIKE CONCAT('%', #{param.shopCity}, '%')
-            </if>
-            <if test="param.shopCityName != null">
-                AND a.shop_city_name LIKE CONCAT('%', #{param.shopCityName}, '%')
-            </if>
-            <if test="param.shopOpenTime != null">
-                AND a.shop_open_time LIKE CONCAT('%', #{param.shopOpenTime}, '%')
-            </if>
-            <if test="param.shopPhone != null">
-                AND a.shop_phone LIKE CONCAT('%', #{param.shopPhone}, '%')
-            </if>
-            <if test="param.acspType != null">
-                AND a.acsp_type LIKE CONCAT('%', #{param.acspType}, '%')
-            </if>
-            <if test="param.action != null">
-                AND a.action LIKE CONCAT('%', #{param.action}, '%')
-            </if>
-            <if test="param.actionTime != null">
-                AND a.action_time LIKE CONCAT('%', #{param.actionTime}, '%')
-            </if>
-            <if test="param.brandId != null">
-                AND a.brand_id LIKE CONCAT('%', #{param.brandId}, '%')
-            </if>
-            <if test="param.brandName != null">
-                AND a.brand_name LIKE CONCAT('%', #{param.brandName}, '%')
-            </if>
-            <if test="param.businessModel != null">
-                AND a.business_model LIKE CONCAT('%', #{param.businessModel}, '%')
-            </if>
-            <if test="param.imagePath != null">
-                AND a.image_path LIKE CONCAT('%', #{param.imagePath}, '%')
-            </if>
-            <if test="param.mapLatitudeValueBaiDu != null">
-                AND a.map_latitude_value_bai_du LIKE CONCAT('%', #{param.mapLatitudeValueBaiDu}, '%')
-            </if>
-            <if test="param.mapLongitudeValueBaiDu != null">
-                AND a.map_longitude_value_bai_du LIKE CONCAT('%', #{param.mapLongitudeValueBaiDu}, '%')
-            </if>
-            <if test="param.operationMode != null">
-                AND a.operation_mode = #{param.operationMode}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.customerId != null">
-                AND a.customer_id = #{param.customerId}
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.HualalaShop">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.HualalaShop">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/LinkMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/LinkMapper.xml
deleted file mode 100644
index e16e103..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/LinkMapper.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.apps.mapper.LinkMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_link a
-        <where>
-            <if test="param.linkId != null">
-                AND a.link_id = #{param.linkId}
-            </if>
-            <if test="param.linkName != null">
-                AND a.link_name LIKE CONCAT('%', #{param.linkName}, '%')
-            </if>
-            <if test="param.linkIcon != null">
-                AND a.link_icon LIKE CONCAT('%', #{param.linkIcon}, '%')
-            </if>
-            <if test="param.linkPath != null">
-                AND a.link_path LIKE CONCAT('%', #{param.linkPath}, '%')
-            </if>
-            <if test="param.linkComponent != null">
-                AND a.link_component LIKE CONCAT('%', #{param.linkComponent}, '%')
-            </if>
-            <if test="param.type != null">
-                AND a.type LIKE CONCAT('%', #{param.type}, '%')
-            </if>
-            <if test="param.clicks != null">
-                AND a.clicks = #{param.clicks}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.merchantCode != null">
-              AND a.merchant_code = #{param.merchantCode}
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.Link">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.Link">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/TestDataMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/TestDataMapper.xml
deleted file mode 100644
index 88d5d46..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/TestDataMapper.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.apps.mapper.TestDataMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_test_data a
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.title != null">
-                AND a.title LIKE CONCAT('%', #{param.title}, '%')
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.TestData">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.TestData">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/param/BcAgentParam.java b/src/main/java/com/gxwebsoft/apps/param/BcAgentParam.java
deleted file mode 100644
index 2a660c3..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/BcAgentParam.java
+++ /dev/null
@@ -1,41 +0,0 @@
-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
deleted file mode 100644
index 0079279..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/BcCookbookParam.java
+++ /dev/null
@@ -1,51 +0,0 @@
-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
deleted file mode 100644
index d787b36..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/BcEquipmentParam.java
+++ /dev/null
@@ -1,66 +0,0 @@
-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
deleted file mode 100644
index 4c9b1bb..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/BcExportParam.java
+++ /dev/null
@@ -1,98 +0,0 @@
-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
deleted file mode 100644
index 73f43e7..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/BcFoodParam.java
+++ /dev/null
@@ -1,51 +0,0 @@
-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
deleted file mode 100644
index 001ba13..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/BcPlanParam.java
+++ /dev/null
@@ -1,69 +0,0 @@
-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
deleted file mode 100644
index 9c32893..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/BcTemporaryParam.java
+++ /dev/null
@@ -1,63 +0,0 @@
-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
deleted file mode 100644
index 7413dc5..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/CashierParam.java
+++ /dev/null
@@ -1,87 +0,0 @@
-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
deleted file mode 100644
index 2705b6d..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/EquipmentAlarmParam.java
+++ /dev/null
@@ -1,65 +0,0 @@
-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
deleted file mode 100644
index 46f6368..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/EquipmentFaultParam.java
+++ /dev/null
@@ -1,68 +0,0 @@
-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
deleted file mode 100644
index 1aaf3a1..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/EquipmentGoodsParam.java
+++ /dev/null
@@ -1,114 +0,0 @@
-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
deleted file mode 100644
index 218ba59..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/EquipmentOrderGoodsParam.java
+++ /dev/null
@@ -1,125 +0,0 @@
-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
deleted file mode 100644
index 865e3eb..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/EquipmentOrderParam.java
+++ /dev/null
@@ -1,227 +0,0 @@
-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
deleted file mode 100644
index 4500138..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/EquipmentParam.java
+++ /dev/null
@@ -1,127 +0,0 @@
-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
deleted file mode 100644
index c0cf3bb..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/EquipmentRecordParam.java
+++ /dev/null
@@ -1,69 +0,0 @@
-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
deleted file mode 100644
index a7b47a5..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/HualalaCardBenefitsParam.java
+++ /dev/null
@@ -1,58 +0,0 @@
-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
deleted file mode 100644
index 399f08a..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/HualalaCardParam.java
+++ /dev/null
@@ -1,130 +0,0 @@
-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
deleted file mode 100644
index ded0f37..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/HualalaCartFoodParam.java
+++ /dev/null
@@ -1,66 +0,0 @@
-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
deleted file mode 100644
index acd1cde..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/HualalaFoodCategoryParam.java
+++ /dev/null
@@ -1,106 +0,0 @@
-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
deleted file mode 100644
index a0b33d2..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/HualalaFoodParam.java
+++ /dev/null
@@ -1,299 +0,0 @@
-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
deleted file mode 100644
index 256288d..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/HualalaParam.java
+++ /dev/null
@@ -1,34 +0,0 @@
-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<String,Object> params;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/param/HualalaShopParam.java b/src/main/java/com/gxwebsoft/apps/param/HualalaShopParam.java
deleted file mode 100644
index 295711d..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/HualalaShopParam.java
+++ /dev/null
@@ -1,97 +0,0 @@
-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
deleted file mode 100644
index 7f8b7a0..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/HxzParam.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<Object> 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
deleted file mode 100644
index 30cf914..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/LinkParam.java
+++ /dev/null
@@ -1,71 +0,0 @@
-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/result/AllShopResult.java b/src/main/java/com/gxwebsoft/apps/result/AllShopResult.java
deleted file mode 100644
index 0416489..0000000
--- a/src/main/java/com/gxwebsoft/apps/result/AllShopResult.java
+++ /dev/null
@@ -1,33 +0,0 @@
-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<HualalaShop> shopInfoList;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/result/CartResult.java b/src/main/java/com/gxwebsoft/apps/result/CartResult.java
deleted file mode 100644
index 524d75d..0000000
--- a/src/main/java/com/gxwebsoft/apps/result/CartResult.java
+++ /dev/null
@@ -1,18 +0,0 @@
-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<BcCart> items;// 商品列表
-}
diff --git a/src/main/java/com/gxwebsoft/apps/result/FoodCategoryResult.java b/src/main/java/com/gxwebsoft/apps/result/FoodCategoryResult.java
deleted file mode 100644
index 0b10470..0000000
--- a/src/main/java/com/gxwebsoft/apps/result/FoodCategoryResult.java
+++ /dev/null
@@ -1,33 +0,0 @@
-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<Object> foodCategory;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/result/OpenFoodResult.java b/src/main/java/com/gxwebsoft/apps/result/OpenFoodResult.java
deleted file mode 100644
index bbefe3e..0000000
--- a/src/main/java/com/gxwebsoft/apps/result/OpenFoodResult.java
+++ /dev/null
@@ -1,36 +0,0 @@
-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<HualalaFood> 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
deleted file mode 100644
index 6c36a3f..0000000
--- a/src/main/java/com/gxwebsoft/apps/result/OperateVo.java
+++ /dev/null
@@ -1,17 +0,0 @@
-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<ItemVo> items; // 菜品列表列表（选择购物车时使用）
-}
diff --git a/src/main/java/com/gxwebsoft/apps/result/ShopBaseInfoResult.java b/src/main/java/com/gxwebsoft/apps/result/ShopBaseInfoResult.java
deleted file mode 100644
index 5567476..0000000
--- a/src/main/java/com/gxwebsoft/apps/result/ShopBaseInfoResult.java
+++ /dev/null
@@ -1,32 +0,0 @@
-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
deleted file mode 100644
index 53cf4e5..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/BcAgentService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<BcAgent> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<BcAgent>
-     */
-    PageResult<BcAgent> pageRel(BcAgentParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<BcAgent>
-     */
-    List<BcAgent> 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
deleted file mode 100644
index 3f69500..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/BcCookbookService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<BcCookbook> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<BcCookbook>
-     */
-    PageResult<BcCookbook> pageRel(BcCookbookParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<BcCookbook>
-     */
-    List<BcCookbook> 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
deleted file mode 100644
index 242e855..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/BcEquipmentService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<BcEquipment> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<BcEquipment>
-     */
-    PageResult<BcEquipment> pageRel(BcEquipmentParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<BcEquipment>
-     */
-    List<BcEquipment> 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
deleted file mode 100644
index 48b1cb5..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/BcExportService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<BcExport> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<BcExport>
-     */
-    PageResult<BcExport> pageRel(BcExportParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<BcExport>
-     */
-    List<BcExport> 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
deleted file mode 100644
index 6add5ff..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/BcFoodService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<BcFood> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<BcFood>
-     */
-    PageResult<BcFood> pageRel(BcFoodParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<BcFood>
-     */
-    List<BcFood> 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
deleted file mode 100644
index f47d9c0..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/BcPlanService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<BcPlan> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<BcPlan>
-     */
-    PageResult<BcPlan> pageRel(BcPlanParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<BcPlan>
-     */
-    List<BcPlan> 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
deleted file mode 100644
index d56f39b..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/BcTemporaryService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<BcTemporary> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<BcTemporary>
-     */
-    PageResult<BcTemporary> pageRel(BcTemporaryParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<BcTemporary>
-     */
-    List<BcTemporary> 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
deleted file mode 100644
index 918f481..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/CashierService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<Cashier> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<Cashier>
-     */
-    PageResult<Cashier> pageRel(CashierParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<Cashier>
-     */
-    List<Cashier> 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
deleted file mode 100644
index 5c46a13..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/EquipmentAlarmService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<EquipmentAlarm> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<EquipmentAlarm>
-     */
-    PageResult<EquipmentAlarm> pageRel(EquipmentAlarmParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<EquipmentAlarm>
-     */
-    List<EquipmentAlarm> 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
deleted file mode 100644
index 513bed5..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/EquipmentFaultService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<EquipmentFault> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<EquipmentFault>
-     */
-    PageResult<EquipmentFault> pageRel(EquipmentFaultParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<EquipmentFault>
-     */
-    List<EquipmentFault> 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
deleted file mode 100644
index 26b88d7..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/EquipmentGoodsService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<EquipmentGoods> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<EquipmentGoods>
-     */
-    PageResult<EquipmentGoods> pageRel(EquipmentGoodsParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<EquipmentGoods>
-     */
-    List<EquipmentGoods> 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
deleted file mode 100644
index 3b96ce5..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/EquipmentOrderGoodsService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<EquipmentOrderGoods> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<EquipmentOrderGoods>
-     */
-    PageResult<EquipmentOrderGoods> pageRel(EquipmentOrderGoodsParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<EquipmentOrderGoods>
-     */
-    List<EquipmentOrderGoods> 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
deleted file mode 100644
index c754615..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/EquipmentOrderService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<EquipmentOrder> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<EquipmentOrder>
-     */
-    PageResult<EquipmentOrder> pageRel(EquipmentOrderParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<EquipmentOrder>
-     */
-    List<EquipmentOrder> 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
deleted file mode 100644
index d4655a2..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/EquipmentRecordService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<EquipmentRecord> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<EquipmentRecord>
-     */
-    PageResult<EquipmentRecord> pageRel(EquipmentRecordParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<EquipmentRecord>
-     */
-    List<EquipmentRecord> 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
deleted file mode 100644
index 246e367..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/EquipmentService.java
+++ /dev/null
@@ -1,44 +0,0 @@
-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<Equipment> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<Equipment>
-     */
-    PageResult<Equipment> pageRel(EquipmentParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<Equipment>
-     */
-    List<Equipment> 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
deleted file mode 100644
index d23c787..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/HualalaCardBenefitsService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<HualalaCardBenefits> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<HualalaCardBenefits>
-     */
-    PageResult<HualalaCardBenefits> pageRel(HualalaCardBenefitsParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<HualalaCardBenefits>
-     */
-    List<HualalaCardBenefits> 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
deleted file mode 100644
index 2d2da4b..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/HualalaCardService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<HualalaCard> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<HualalaCard>
-     */
-    PageResult<HualalaCard> pageRel(HualalaCardParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<HualalaCard>
-     */
-    List<HualalaCard> 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
deleted file mode 100644
index 4c6a591..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/HualalaCartFoodService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<HualalaCartFood> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<HualalaCartFood>
-     */
-    PageResult<HualalaCartFood> pageRel(HualalaCartFoodParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<HualalaCartFood>
-     */
-    List<HualalaCartFood> 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
deleted file mode 100644
index 33b298f..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/HualalaFoodCategoryService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<HualalaFoodCategory> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<HualalaFoodCategory>
-     */
-    PageResult<HualalaFoodCategory> pageRel(HualalaFoodCategoryParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<HualalaFoodCategory>
-     */
-    List<HualalaFoodCategory> 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
deleted file mode 100644
index 6da9cb5..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/HualalaFoodService.java
+++ /dev/null
@@ -1,44 +0,0 @@
-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<HualalaFood> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<HualalaFood>
-     */
-    PageResult<HualalaFood> pageRel(HualalaFoodParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<HualalaFood>
-     */
-    List<HualalaFood> 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
deleted file mode 100644
index a64d839..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/HualalaService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-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<Hualala> {
-
-  /**
-   * 请求哗啦啦接口并返回结果
-   * @param requestBody
-   * @return
-   */
-  JSONObject doPost(String url, Map<String, Object> 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
deleted file mode 100644
index f4b73a5..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/HualalaShopService.java
+++ /dev/null
@@ -1,44 +0,0 @@
-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<HualalaShop> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<HualalaShop>
-     */
-    PageResult<HualalaShop> pageRel(HualalaShopParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<HualalaShop>
-     */
-    List<HualalaShop> listRel(HualalaShopParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param shopId 店铺ID
-     * @return HualalaShop
-     */
-    HualalaShop getByIdRel(Integer shopId);
-
-  List<HualalaShop> 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
deleted file mode 100644
index 29291d3..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/LinkService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<Link> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<Link>
-     */
-    PageResult<Link> pageRel(LinkParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<Link>
-     */
-    List<Link> 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
deleted file mode 100644
index e5878f2..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/TestDataService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<TestData> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TestData>
-     */
-    PageResult<TestData> pageRel(TestDataParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TestData>
-     */
-    List<TestData> 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
deleted file mode 100644
index 87416aa..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/BcAgentServiceImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-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<BcAgentMapper, BcAgent> implements BcAgentService {
-
-    @Resource
-    private UserService userService;
-
-    @Override
-    public PageResult<BcAgent> pageRel(BcAgentParam param) {
-        PageParam<BcAgent, BcAgentParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<BcAgent> 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<BcAgent> listRel(BcAgentParam param) {
-        List<BcAgent> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<BcAgent, BcAgentParam> 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
deleted file mode 100644
index 826e319..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/BcCookbookServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<BcCookbookMapper, BcCookbook> implements BcCookbookService {
-
-    @Override
-    public PageResult<BcCookbook> pageRel(BcCookbookParam param) {
-        PageParam<BcCookbook, BcCookbookParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<BcCookbook> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<BcCookbook> listRel(BcCookbookParam param) {
-        List<BcCookbook> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<BcCookbook, BcCookbookParam> 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
deleted file mode 100644
index e6a59d9..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/BcEquipmentServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<BcEquipmentMapper, BcEquipment> implements BcEquipmentService {
-
-    @Override
-    public PageResult<BcEquipment> pageRel(BcEquipmentParam param) {
-        PageParam<BcEquipment, BcEquipmentParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<BcEquipment> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<BcEquipment> listRel(BcEquipmentParam param) {
-        List<BcEquipment> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<BcEquipment, BcEquipmentParam> 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
deleted file mode 100644
index 3bb6921..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/BcExportServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<BcExportMapper, BcExport> implements BcExportService {
-
-    @Override
-    public PageResult<BcExport> pageRel(BcExportParam param) {
-        PageParam<BcExport, BcExportParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<BcExport> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<BcExport> listRel(BcExportParam param) {
-        List<BcExport> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<BcExport, BcExportParam> 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
deleted file mode 100644
index 8ba309f..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/BcFoodServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<BcFoodMapper, BcFood> implements BcFoodService {
-
-    @Override
-    public PageResult<BcFood> pageRel(BcFoodParam param) {
-        PageParam<BcFood, BcFoodParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<BcFood> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<BcFood> listRel(BcFoodParam param) {
-        List<BcFood> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<BcFood, BcFoodParam> 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
deleted file mode 100644
index 1e01cb2..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/BcPlanServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<BcPlanMapper, BcPlan> implements BcPlanService {
-
-    @Override
-    public PageResult<BcPlan> pageRel(BcPlanParam param) {
-        PageParam<BcPlan, BcPlanParam> page = new PageParam<>(param);
-        page.setDefaultOrder("day_time desc, create_time desc");
-        List<BcPlan> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<BcPlan> listRel(BcPlanParam param) {
-        List<BcPlan> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<BcPlan, BcPlanParam> 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
deleted file mode 100644
index e261632..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/BcTemporaryServiceImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-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<BcTemporaryMapper, BcTemporary> implements BcTemporaryService {
-
-    @Resource
-    private UserService userService;
-
-    @Override
-    public PageResult<BcTemporary> pageRel(BcTemporaryParam param) {
-        PageParam<BcTemporary, BcTemporaryParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<BcTemporary> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<BcTemporary> listRel(BcTemporaryParam param) {
-        List<BcTemporary> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<BcTemporary, BcTemporaryParam> 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
deleted file mode 100644
index 5e10978..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/CashierServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<CashierMapper, Cashier> implements CashierService {
-
-    @Override
-    public PageResult<Cashier> pageRel(CashierParam param) {
-        PageParam<Cashier, CashierParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<Cashier> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<Cashier> listRel(CashierParam param) {
-        List<Cashier> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<Cashier, CashierParam> 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
deleted file mode 100644
index a724c4a..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentAlarmServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<EquipmentAlarmMapper, EquipmentAlarm> implements EquipmentAlarmService {
-
-    @Override
-    public PageResult<EquipmentAlarm> pageRel(EquipmentAlarmParam param) {
-        PageParam<EquipmentAlarm, EquipmentAlarmParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<EquipmentAlarm> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<EquipmentAlarm> listRel(EquipmentAlarmParam param) {
-        List<EquipmentAlarm> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<EquipmentAlarm, EquipmentAlarmParam> 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
deleted file mode 100644
index 8cc4a12..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentFaultServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<EquipmentFaultMapper, EquipmentFault> implements EquipmentFaultService {
-
-    @Override
-    public PageResult<EquipmentFault> pageRel(EquipmentFaultParam param) {
-        PageParam<EquipmentFault, EquipmentFaultParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<EquipmentFault> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<EquipmentFault> listRel(EquipmentFaultParam param) {
-        List<EquipmentFault> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<EquipmentFault, EquipmentFaultParam> 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
deleted file mode 100644
index 97449e8..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentGoodsServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<EquipmentGoodsMapper, EquipmentGoods> implements EquipmentGoodsService {
-
-    @Override
-    public PageResult<EquipmentGoods> pageRel(EquipmentGoodsParam param) {
-        PageParam<EquipmentGoods, EquipmentGoodsParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<EquipmentGoods> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<EquipmentGoods> listRel(EquipmentGoodsParam param) {
-        List<EquipmentGoods> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<EquipmentGoods, EquipmentGoodsParam> 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
deleted file mode 100644
index 346bfcd..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentOrderGoodsServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<EquipmentOrderGoodsMapper, EquipmentOrderGoods> implements EquipmentOrderGoodsService {
-
-    @Override
-    public PageResult<EquipmentOrderGoods> pageRel(EquipmentOrderGoodsParam param) {
-        PageParam<EquipmentOrderGoods, EquipmentOrderGoodsParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<EquipmentOrderGoods> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<EquipmentOrderGoods> listRel(EquipmentOrderGoodsParam param) {
-        List<EquipmentOrderGoods> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<EquipmentOrderGoods, EquipmentOrderGoodsParam> 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
deleted file mode 100644
index 17dc8b8..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentOrderServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<EquipmentOrderMapper, EquipmentOrder> implements EquipmentOrderService {
-
-    @Override
-    public PageResult<EquipmentOrder> pageRel(EquipmentOrderParam param) {
-        PageParam<EquipmentOrder, EquipmentOrderParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<EquipmentOrder> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<EquipmentOrder> listRel(EquipmentOrderParam param) {
-        List<EquipmentOrder> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<EquipmentOrder, EquipmentOrderParam> 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
deleted file mode 100644
index 153194a..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentRecordServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<EquipmentRecordMapper, EquipmentRecord> implements EquipmentRecordService {
-
-    @Override
-    public PageResult<EquipmentRecord> pageRel(EquipmentRecordParam param) {
-        PageParam<EquipmentRecord, EquipmentRecordParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<EquipmentRecord> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<EquipmentRecord> listRel(EquipmentRecordParam param) {
-        List<EquipmentRecord> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<EquipmentRecord, EquipmentRecordParam> 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
deleted file mode 100644
index ad81d60..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentServiceImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-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<EquipmentMapper, Equipment> implements EquipmentService {
-    @Resource
-    private UserService userService;
-
-    @Override
-    public PageResult<Equipment> pageRel(EquipmentParam param) {
-        PageParam<Equipment, EquipmentParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<Equipment> 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<Equipment> listRel(EquipmentParam param) {
-        List<Equipment> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<Equipment, EquipmentParam> 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
deleted file mode 100644
index 7b0cf3b..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaCardBenefitsServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<HualalaCardBenefitsMapper, HualalaCardBenefits> implements HualalaCardBenefitsService {
-
-    @Override
-    public PageResult<HualalaCardBenefits> pageRel(HualalaCardBenefitsParam param) {
-        PageParam<HualalaCardBenefits, HualalaCardBenefitsParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<HualalaCardBenefits> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<HualalaCardBenefits> listRel(HualalaCardBenefitsParam param) {
-        List<HualalaCardBenefits> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<HualalaCardBenefits, HualalaCardBenefitsParam> 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
deleted file mode 100644
index 30dff53..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaCardServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<HualalaCardMapper, HualalaCard> implements HualalaCardService {
-
-    @Override
-    public PageResult<HualalaCard> pageRel(HualalaCardParam param) {
-        PageParam<HualalaCard, HualalaCardParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<HualalaCard> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<HualalaCard> listRel(HualalaCardParam param) {
-        List<HualalaCard> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<HualalaCard, HualalaCardParam> 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
deleted file mode 100644
index 64249f2..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaCartFoodServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<HualalaCartFoodMapper, HualalaCartFood> implements HualalaCartFoodService {
-
-    @Override
-    public PageResult<HualalaCartFood> pageRel(HualalaCartFoodParam param) {
-        PageParam<HualalaCartFood, HualalaCartFoodParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<HualalaCartFood> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<HualalaCartFood> listRel(HualalaCartFoodParam param) {
-        List<HualalaCartFood> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<HualalaCartFood, HualalaCartFoodParam> 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
deleted file mode 100644
index 81543fd..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaFoodCategoryServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<HualalaFoodCategoryMapper, HualalaFoodCategory> implements HualalaFoodCategoryService {
-
-    @Override
-    public PageResult<HualalaFoodCategory> pageRel(HualalaFoodCategoryParam param) {
-        PageParam<HualalaFoodCategory, HualalaFoodCategoryParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<HualalaFoodCategory> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<HualalaFoodCategory> listRel(HualalaFoodCategoryParam param) {
-        List<HualalaFoodCategory> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<HualalaFoodCategory, HualalaFoodCategoryParam> 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
deleted file mode 100644
index 6b85ae5..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaFoodServiceImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-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<HualalaFoodMapper, HualalaFood> implements HualalaFoodService {
-
-    @Override
-    public PageResult<HualalaFood> pageRel(HualalaFoodParam param) {
-        PageParam<HualalaFood, HualalaFoodParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<HualalaFood> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<HualalaFood> listRel(HualalaFoodParam param) {
-        List<HualalaFood> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<HualalaFood, HualalaFoodParam> 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
deleted file mode 100644
index 6150635..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaServiceImpl.java
+++ /dev/null
@@ -1,178 +0,0 @@
-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<HualalaMapper, Hualala> implements HualalaService {
-  @Resource
-  private OrderGoodsMapper orderGoodsMapper;
-
-  @Override
-  public JSONObject doPost(String url, Map<String, Object> requestBody) {
-    // 当前时间戳
-    Long timestamp = System.currentTimeMillis();
-    // 店铺ID
-    String shopId = null;
-    if(requestBody.get("shopId") != null){
-      shopId = requestBody.get("shopId").toString();
-    }
-    HashMap<String,Object> 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> 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<Object> 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<String, Object> 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
deleted file mode 100644
index 8295245..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaShopServiceImpl.java
+++ /dev/null
@@ -1,134 +0,0 @@
-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<HualalaShopMapper, HualalaShop> implements HualalaShopService {
-
-  @Resource
-  private StringRedisTemplate stringRedisTemplate;
-
-    @Override
-    public PageResult<HualalaShop> pageRel(HualalaShopParam param) {
-        PageParam<HualalaShop, HualalaShopParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<HualalaShop> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<HualalaShop> listRel(HualalaShopParam param) {
-        List<HualalaShop> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<HualalaShop, HualalaShopParam> 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<HualalaShop> 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<RedisGeoCommands.GeoLocation<String>> results = stringRedisTemplate.opsForGeo().radius(haulalaGeoKey, new Circle(point, 200000), geoRadiusCommandArgs.includeDistance().limit(30));
-//    System.out.println("results = " + results);
-    assert results != null;
-    final List<GeoResult<RedisGeoCommands.GeoLocation<String>>> list = results.getContent();
-    System.out.println("list.size() = " + list.size());
-    // 如查找不到店铺点位则批量写入
-    if (list.size() == 0) {
-      this.saveGeoPointToRedis();
-      return null;
-    }
-    List<String> ids = new ArrayList<>(list.size());
-    Map<String, Distance> 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<HualalaShop> 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<HualalaShop> list = list();
-    // 2.然后按品牌分组，把品牌id一致的放到一个集合
-    final Map<Long, List<HualalaShop>> map = list.stream().collect(Collectors.groupingBy(HualalaShop::getShopId));
-    // 3.分批完成写入Redis
-    for (Map.Entry<Long, List<HualalaShop>> entry : map.entrySet()) {
-      // 3.1 获取商户的集合
-      List<HualalaShop> value = entry.getValue();
-      List<RedisGeoCommands.GeoLocation<String>> 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
deleted file mode 100644
index 7631ca6..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/LinkServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<LinkMapper, Link> implements LinkService {
-
-    @Override
-    public PageResult<Link> pageRel(LinkParam param) {
-        PageParam<Link, LinkParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<Link> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<Link> listRel(LinkParam param) {
-        List<Link> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<Link, LinkParam> 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
deleted file mode 100644
index 69f79a4..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/TestDataServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<TestDataMapper, TestData> implements TestDataService {
-
-    @Override
-    public PageResult<TestData> pageRel(TestDataParam param) {
-        PageParam<TestData, TestDataParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TestData> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TestData> listRel(TestDataParam param) {
-        List<TestData> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TestData, TestDataParam> 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
deleted file mode 100644
index 1eb1d3b..0000000
--- a/src/main/java/com/gxwebsoft/apps/utils/BcUtil.java
+++ /dev/null
@@ -1,118 +0,0 @@
-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<String> toUsers = new ArrayList<>();
-    toUsers.add("ZhaiLing");
-    toUsers.add("LiangYun");
-    toUsers.add("zhaozhonglin");
-    final HashMap<String, Object> map = new HashMap<>();
-    map.put("msgtype","text");
-    map.put("agentid","wxa040285bc1c223ae");
-//    map.put("toall",1);
-    map.put("touser",toUsers);
-    final HashMap<Object, Object> 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/ArticleController.java b/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java
index 339f27e..4ec0648 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java
@@ -31,6 +31,14 @@ public class ArticleController extends BaseController {
     @Resource
     private ArticleService articleService;
 
+    @ApiOperation("根据id查询文章记录表")
+    @PostMapping("/info")
+    public ApiResult<Article> getInfo(@RequestBody ArticleParam articleParam) {
+        Article article = articleService.getByIdRel(articleParam.getArticleId());
+        return success(article);
+    }
+
+
     @PreAuthorize("hasAuthority('cms:article:list')")
     @OperationLog
     @ApiOperation("分页查询文章记录表")
diff --git a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java
index 81ec445..d02e6f3 100644
--- a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java
+++ b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java
@@ -23,10 +23,10 @@ import java.util.Arrays;
  * @author WebSoft
  * @since 2018-02-22 11:29:28
  */
-@Configuration
+//@Configuration
 public class MybatisPlusConfig {
 
-    @Bean
+//    @Bean
     public MybatisPlusInterceptor mybatisPlusInterceptor(HttpServletRequest request) {
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
 
@@ -34,11 +34,7 @@ public class MybatisPlusConfig {
         TenantLineHandler tenantLineHandler = new TenantLineHandler() {
             @Override
             public Expression getTenantId() {
-              // 从设备请求头拿ID
-              String DeviceID = request.getHeader("Device-ID");
-              if (StrUtil.isNotBlank(DeviceID)) {
-                return new LongValue(10048);
-              }
+                System.out.println(getLoginUserTenantId());
               return getLoginUserTenantId();
             }
 
@@ -46,11 +42,8 @@ public class MybatisPlusConfig {
             public boolean ignoreTable(String tableName) {
                 return Arrays.asList(
                         "sys_tenant",
-                        "apps_test_data",
                         "sys_dictionary",
-                        "sys_dictionary_data",
-                        "tower_project",
-                        "tower_security"
+                        "sys_dictionary_data"
                 ).contains(tableName);
             }
         };
@@ -60,7 +53,7 @@ public class MybatisPlusConfig {
         // 分页插件配置
         PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
         interceptor.addInnerInterceptor(paginationInnerInterceptor);
-
+//
         return interceptor;
     }
 
diff --git a/src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java b/src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java
index 04469bf..3a44438 100644
--- a/src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java
+++ b/src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java
@@ -60,8 +60,12 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                         "/api/apps/hualala-cart/**",
                         "/api/apps/test-data/**",
                         "/api/wxWorkQrConnect",
+                        "/api/system/user/login-by-phone",
+                        "/api/shop/wx-pay/notify",
+                        "/api/shop/wx-pay/refund-notify",
                         "/WW_verify_QMv7HoblYU6z63bb.txt",
-                        "/WW_verify_10DxpA6fAgnSRayT.txt"
+                        "/WW_verify_10DxpA6fAgnSRayT.txt",
+                        "/api/system/dict-data/by-code-name"
                   )
                 .permitAll()
                 .anyRequest()
diff --git a/src/main/java/com/gxwebsoft/common/core/utils/AlipayConfigUtil.java b/src/main/java/com/gxwebsoft/common/core/utils/AlipayConfigUtil.java
deleted file mode 100644
index 42975ef..0000000
--- a/src/main/java/com/gxwebsoft/common/core/utils/AlipayConfigUtil.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.gxwebsoft.common.core.utils;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.alipay.api.AlipayApiException;
-import com.alipay.api.AlipayConstants;
-import com.alipay.api.CertAlipayRequest;
-import com.alipay.api.DefaultAlipayClient;
-import com.gxwebsoft.common.core.config.ConfigProperties;
-import com.gxwebsoft.common.core.exception.BusinessException;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-
-/**
- * 支付宝工具类
- * @author leng
- *
- */
-@Component
-public class AlipayConfigUtil {
-  private final StringRedisTemplate stringRedisTemplate;
-  public Integer tenantId;
-  public String gateway;
-  public JSONObject config;
-  public String appId;
-  public String privateKey;
-  public String appCertPublicKey;
-  public String alipayCertPublicKey;
-  public String alipayRootCert;
-
-  @Resource
-  private ConfigProperties pathConfig;
-
-  public AlipayConfigUtil(StringRedisTemplate stringRedisTemplate){
-    this.stringRedisTemplate = stringRedisTemplate;
-  }
-
-  // 实例化客户端
-  public DefaultAlipayClient alipayClient(Integer tenantId) throws AlipayApiException {
-    this.gateway = "https://openapi.alipay.com/gateway.do";
-    this.tenantId = tenantId;
-    this.payment(tenantId);
-    CertAlipayRequest certAlipayRequest = new CertAlipayRequest();
-    certAlipayRequest.setServerUrl(this.gateway);
-    certAlipayRequest.setAppId(this.appId);
-    certAlipayRequest.setPrivateKey(this.privateKey);
-    certAlipayRequest.setFormat(AlipayConstants.FORMAT_JSON);
-    certAlipayRequest.setCharset(AlipayConstants.CHARSET_UTF8);
-    certAlipayRequest.setSignType(AlipayConstants.SIGN_TYPE_RSA2);
-    certAlipayRequest.setCertPath(this.appCertPublicKey);
-    certAlipayRequest.setAlipayPublicCertPath(this.alipayCertPublicKey);
-    certAlipayRequest.setRootCertPath(this.alipayRootCert);
-//    System.out.println("this.appId = " + this.appId);
-//    System.out.println("this.appId = " + this.gateway);
-//    System.out.println("this.appId = " + this.privateKey);
-//    System.out.println("this.appId = " + this.appCertPublicKey);
-//    System.out.println("this.appId = " + this.alipayCertPublicKey);
-//    System.out.println("this.appId = " + this.alipayRootCert);
-//    System.out.println("this.config = " + this.config);
-    return new DefaultAlipayClient(certAlipayRequest);
-  }
-
-  /**
-   * 获取支付宝秘钥
-   */
-  public JSONObject payment(Integer tenantId) {
-    System.out.println("tenantId = " + tenantId);
-    String key = "cache".concat(tenantId.toString()).concat(":setting:payment");
-    System.out.println("key = " + key);
-    String cache = stringRedisTemplate.opsForValue().get(key);
-    if (cache == null) {
-      throw new BusinessException("支付方式未配置");
-    }
-    // 解析json数据
-    JSONObject payment = JSON.parseObject(cache.getBytes());
-    this.config = payment;
-    this.appId = payment.getString("alipayAppId");
-    this.privateKey = payment.getString("privateKey");
-    this.appCertPublicKey = pathConfig.getUploadPath() + "file" + payment.getString("appCertPublicKey");
-    this.alipayCertPublicKey = pathConfig.getUploadPath() + "file" + payment.getString("alipayCertPublicKey");
-    this.alipayRootCert = pathConfig.getUploadPath() + "file" + payment.getString("alipayRootCert");
-    return payment;
-  }
-
-  public String appId(){
-    return this.appId;
-  }
-
-  public String privateKey(){
-    return this.privateKey;
-  }
-
-  public String appCertPublicKey(){
-    return this.appCertPublicKey;
-  }
-
-  public String alipayCertPublicKey(){
-    return this.alipayCertPublicKey;
-  }
-
-  public String alipayRootCert(){
-    return this.alipayRootCert;
-  }
-
-
-
-
-}
diff --git a/src/main/java/com/gxwebsoft/common/core/web/BaseController.java b/src/main/java/com/gxwebsoft/common/core/web/BaseController.java
index ff5791c..30faf2f 100644
--- a/src/main/java/com/gxwebsoft/common/core/web/BaseController.java
+++ b/src/main/java/com/gxwebsoft/common/core/web/BaseController.java
@@ -21,10 +21,8 @@ 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;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * Controller基类
@@ -88,10 +86,10 @@ public class BaseController {
         return loginUser.getTenantId();
       }
       // 从请求头拿tenantId
-      if(StrUtil.isNotBlank(request.getHeader("tenantId"))){
-        return Integer.valueOf(request.getHeader("tenantId"));
-      }
-      return null;
+//      if(StrUtil.isNotBlank(request.getHeader("tenantId"))){
+//        return Integer.valueOf(request.getHeader("tenantId"));
+//      }
+      return 10049;
     }
 
     /**
@@ -322,4 +320,8 @@ public class BaseController {
       throw new BusinessException("找不到该用户");
     }
 
+    public String makeOrderNumber(String prefix) {
+        return prefix + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + String.valueOf((int) (Math.random() * 10000));
+    }
+
 }
diff --git a/src/main/java/com/gxwebsoft/common/system/controller/AreaController.java b/src/main/java/com/gxwebsoft/common/system/controller/AreaController.java
new file mode 100644
index 0000000..700ab87
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/common/system/controller/AreaController.java
@@ -0,0 +1,167 @@
+package com.gxwebsoft.common.system.controller;
+
+import com.alibaba.fastjson.JSON;
+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.AreaService;
+import com.gxwebsoft.common.system.entity.Area;
+import com.gxwebsoft.common.system.param.AreaParam;
+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.beans.factory.annotation.Autowired;
+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;
+
+/**
+ * 控制器
+ *
+ * @author 科技小王子
+ * @since 2024-03-15 23:18:34
+ */
+@Api(tags = "管理")
+@RestController
+@RequestMapping("/api/common/area")
+public class AreaController extends BaseController {
+    @Resource
+    private AreaService areaService;
+    @Autowired
+    private StringRedisTemplate redisTemplate;
+
+    @ApiOperation("查询全部")
+    @PostMapping("list-by-level")
+    public ApiResult<?> listByLevel(@RequestBody Map<String, Object> param) {
+        List<Area> topList;
+        String keyName = "area-list-by-level";
+        if (param != null) keyName += "-" + param.get("level");
+        String topListString = redisTemplate.opsForValue().get(keyName);
+        if (topListString == null) {
+            topList = areaService.list(new LambdaQueryWrapper<Area>().eq(Area::getLevelId, 1));
+            for (Area top : topList) {
+                List<Area> secondList = areaService.list(new LambdaQueryWrapper<Area>().eq(Area::getLevelId, 2).eq(Area::getFid, top.getId()));
+                if (param == null) {
+                    for (Area second : secondList) {
+                        List<Area> thirdList = areaService.list(new LambdaQueryWrapper<Area>().eq(Area::getLevelId, 3).eq(Area::getFid, second.getId()));
+                        second.setChildren(thirdList);
+                    }
+                }
+                top.setChildren(secondList);
+            }
+            redisTemplate.opsForValue().set(keyName, JSON.toJSONString(topList));
+        } else topList = JSON.parseArray(topListString, Area.class);
+        return success(topList);
+        // 使用关联查询
+        //return success(areaService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('common.system:area:list')")
+    @OperationLog
+    @ApiOperation("分页查询")
+    @GetMapping("/page")
+    public ApiResult<PageResult<Area>> page(AreaParam param) {
+        PageParam<Area, AreaParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(areaService.page(page, page.getWrapper()));
+        // 使用关联查询
+        //return success(areaService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('common.system:area:list')")
+    @OperationLog
+    @ApiOperation("查询全部")
+    @GetMapping()
+    public ApiResult<List<Area>> list(AreaParam param) {
+        PageParam<Area, AreaParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(areaService.list(page.getOrderWrapper()));
+        // 使用关联查询
+        //return success(areaService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('common.system:area:list')")
+    @OperationLog
+    @ApiOperation("根据id查询")
+    @GetMapping("/{id}")
+    public ApiResult<Area> get(@PathVariable("id") Integer id) {
+        return success(areaService.getById(id));
+        // 使用关联查询
+        //return success(areaService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('common.system:area:save')")
+    @OperationLog
+    @ApiOperation("添加")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody Area area) {
+        if (areaService.save(area)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('common.system:area:update')")
+    @OperationLog
+    @ApiOperation("修改")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody Area area) {
+        if (areaService.updateById(area)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('common.system:area:remove')")
+    @OperationLog
+    @ApiOperation("删除")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (areaService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('common.system:area:save')")
+    @OperationLog
+    @ApiOperation("批量添加")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<Area> list) {
+        if (areaService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('common.system:area:update')")
+    @OperationLog
+    @ApiOperation("批量修改")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<Area> batchParam) {
+        if (batchParam.update(areaService, "id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('common.system:area:remove')")
+    @OperationLog
+    @ApiOperation("批量删除")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (areaService.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
index c36eaa2..1323f23 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/DictDataController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/DictDataController.java
@@ -33,6 +33,18 @@ public class DictDataController extends BaseController {
     @Resource
     private DictService dictService;
 
+    @ApiOperation("获取字典数据")
+    @PostMapping("/list-by-dict")
+    public ApiResult<List<DictData>> listByDict(@RequestBody DictDataParam param) {
+        return success(dictDataService.getByDictId(param.getDictId()));
+    }
+
+    @ApiOperation("获取字典数据")
+    @PostMapping("/by-code-name")
+    public ApiResult<DictData> getByDictCodeAndName(@RequestBody DictDataParam param) {
+        return success(dictDataService.getByDictCodeAndName(param.getDictCode(), param.getDictDataName()));
+    }
+
     @PreAuthorize("hasAuthority('sys:dict:list')")
     @OperationLog
     @ApiOperation("分页查询字典数据")
diff --git a/src/main/java/com/gxwebsoft/common/system/controller/FileController.java b/src/main/java/com/gxwebsoft/common/system/controller/FileController.java
index c0debfa..ceab101 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/FileController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/FileController.java
@@ -69,7 +69,7 @@ public class FileController extends BaseController {
                 result.setThumbnail(requestURL + "/thumbnail" + path);
             }
             result.setDownloadUrl(config.getFileServer() + "/download" + path);
-            result.setMerchantCode(getMerchantCode());
+//            result.setMerchantCode(getMerchantCode());
             fileRecordService.save(result);
             return success(result);
         } catch (Exception e) {
@@ -100,7 +100,7 @@ public class FileController extends BaseController {
             result.setPath(path);
             result.setUrl(requestURL + path);
             result.setThumbnail(FileServerUtil.isImage(upload) ? (requestURL + "/thumbnail" + path) : null);
-            result.setMerchantCode(getMerchantCode());
+//            result.setMerchantCode(getMerchantCode());
             fileRecordService.save(result);
             return success(result);
         } catch (Exception e) {
@@ -136,7 +136,7 @@ public class FileController extends BaseController {
           result.setThumbnail(requestURL + "/thumbnail" + path);
         }
         result.setDownloadUrl(requestURL + "/download" + path);
-        result.setMerchantCode(getMerchantCode());
+//        result.setMerchantCode(getMerchantCode());
         final HashMap<String, Object> map = new HashMap<>();
         map.put("name",result.getName());
         map.put("status","done");
@@ -234,9 +234,9 @@ public class FileController extends BaseController {
     @GetMapping("/page")
     public ApiResult<PageResult<FileRecord>> page(FileRecordParam param, HttpServletRequest request) {
         // 搜索条件
-        if (getMerchantCode() != null) {
-          param.setMerchantCode(getMerchantCode());
-        }
+//        if (getMerchantCode() != null) {
+//          param.setMerchantCode(getMerchantCode());
+//        }
         PageResult<FileRecord> result = fileRecordService.pageRel(param);
 //        String requestURL = StrUtil.removeSuffix(request.getRequestURL(), "/page");
         String requestURL = config.getFileServer();
diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
index dc936ed..ee8a70f 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
@@ -1,17 +1,7 @@
 package com.gxwebsoft.common.system.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
 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.google.gson.Gson;
 import com.gxwebsoft.common.core.annotation.OperationLog;
 import com.gxwebsoft.common.core.config.ConfigProperties;
 import com.gxwebsoft.common.core.security.JwtSubject;
@@ -202,42 +192,6 @@ public class MainController extends BaseController {
         return success("获取成功", url);
     }
 
-    @ApiOperation("短信验证码")
-    @PostMapping("/sendSmsCaptcha")
-    public ApiResult<?> sendSmsCaptcha(@RequestBody SmsCaptchaParam param) {
-        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("重置密码")
diff --git a/src/main/java/com/gxwebsoft/common/system/controller/OrganizationController.java b/src/main/java/com/gxwebsoft/common/system/controller/OrganizationController.java
index dac0a74..7819052 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/OrganizationController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/OrganizationController.java
@@ -4,6 +4,7 @@ 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.entity.User;
 import com.gxwebsoft.common.system.param.OrganizationParam;
 import com.gxwebsoft.common.system.service.OrganizationService;
 import io.swagger.annotations.Api;
@@ -27,6 +28,16 @@ public class OrganizationController extends BaseController {
     @Resource
     private OrganizationService organizationService;
 
+    @PostMapping("/list")
+    public ApiResult<List<Organization>> listForFront() {
+        User loginUser = getLoginUser();
+        OrganizationParam param = new OrganizationParam();
+        if (!loginUser.getUserLevel().equals(2)) {
+            param.setCity(loginUser.getSecondAreaName());
+        }
+        return success(organizationService.listRel(param));
+    }
+
     @PreAuthorize("hasAuthority('sys:org:list')")
     @OperationLog
     @ApiOperation("分页查询组织机构")
diff --git a/src/main/java/com/gxwebsoft/common/system/controller/UserController.java b/src/main/java/com/gxwebsoft/common/system/controller/UserController.java
index d9a7350..1d8cf4a 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/UserController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/UserController.java
@@ -7,23 +7,24 @@ 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.core.metadata.IPage;
-import com.gxwebsoft.apps.service.BcExportService;
 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.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.entity.*;
 import com.gxwebsoft.common.system.param.UserImportParam;
 import com.gxwebsoft.common.system.param.UserParam;
-import com.gxwebsoft.common.system.service.DictionaryDataService;
-import com.gxwebsoft.common.system.service.OrganizationService;
-import com.gxwebsoft.common.system.service.RoleService;
-import com.gxwebsoft.common.system.service.UserService;
+import com.gxwebsoft.common.system.result.LoginResult;
+import com.gxwebsoft.common.system.service.*;
 import com.gxwebsoft.shop.entity.UserOauth;
 import com.gxwebsoft.shop.service.RechargeOrderService;
 import com.gxwebsoft.shop.service.UserOauthService;
+import com.gxwebsoft.vivo.entity.VivoFixStore;
+import com.gxwebsoft.vivo.entity.VivoStore;
+import com.gxwebsoft.vivo.service.VivoFixStoreService;
+import com.gxwebsoft.vivo.service.VivoStoreService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -62,25 +63,58 @@ public class UserController extends BaseController {
     @Resource
     private UserOauthService userOauthService;
     @Resource
-    private BcExportService bcExportService;
+    private AreaService areaService;
     @Resource
-    private RechargeOrderService rechargeOrderService;
-
+    private VivoStoreService vivoStoreService;
+    @Resource
+    private VivoFixStoreService vivoFixStoreService;
+    @Resource
+    private ConfigProperties configProperties;
 
     @PreAuthorize("hasAuthority('sys:user:list')")
     @OperationLog
     @ApiOperation("统计用户余额")
     @GetMapping("/countUserBalance")
     public ApiResult<?> countUserBalance(User param) {
-      final LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
-      wrapper.gt(User::getBalance, 0);
-      if (!param.getOrganizationId().equals(0)) {
-        wrapper.eq(User::getOrganizationId,param.getOrganizationId());
-      }
-      final List<User> list = userService.list(wrapper);
-      final BigDecimal totalBalance = list.stream().map(User::getBalance).reduce(BigDecimal.ZERO, BigDecimal::add);
+        final LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
+        wrapper.gt(User::getBalance, 0);
+        if (!param.getOrganizationId().equals(0)) {
+            wrapper.eq(User::getOrganizationId, param.getOrganizationId());
+        }
+        final List<User> list = userService.list(wrapper);
+        final BigDecimal totalBalance = list.stream().map(User::getBalance).reduce(BigDecimal.ZERO, BigDecimal::add);
 //      System.out.println("统计用户余额 = " + totalBalance);
-      return success("统计成功",totalBalance);
+        return success("统计成功", totalBalance);
+    }
+
+    @PostMapping("/login-by-phone")
+    public ApiResult<?> loginByPhone(@RequestBody User userParam) {
+        User user = userService.getByPhone(userParam.getPhone());
+        String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()),
+                configProperties.getTokenExpireTime(), configProperties.getTokenKey());
+        return success("登录成功", new LoginResult(access_token, user));
+    }
+
+    @PostMapping("/data")
+    public ApiResult<User> userData() {
+        User loginUser = getLoginUser();
+        loginUser.setStore(vivoStoreService.getById(loginUser.getStoreId()));
+        loginUser.setFixStore(vivoFixStoreService.getById(loginUser.getFixStoreId()));
+        Area city = areaService.getById(loginUser.getCityId());
+        loginUser.setCityItem(city);
+        User cityAgent = userService.getCityAgent(loginUser.getCityId());
+        if (cityAgent != null) {
+            loginUser.setCityAgent(cityAgent);
+        }
+        return success(loginUser);
+    }
+
+    @PostMapping("/update-avatar")
+    public ApiResult<?> updateAvatar(@RequestBody User user) {
+        User loginUser = getLoginUser();
+        loginUser.setAvatar(user.getAvatar());
+        userService.updateById(loginUser);
+        return success();
     }
 
     @PreAuthorize("hasAuthority('sys:user:list')")
@@ -98,7 +132,7 @@ public class UserController extends BaseController {
     @ApiOperation("查询全部用户")
     @GetMapping()
     public ApiResult<List<User>> list(UserParam param) {
-      return success(userService.listRel(param));
+        return success(userService.listRel(param));
     }
 
     @PreAuthorize("hasAuthority('sys:user:list')")
@@ -143,7 +177,7 @@ public class UserController extends BaseController {
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
         if (userService.removeById(id)) {
             QueryWrapper<UserOauth> userOauthQueryWrapper = new QueryWrapper<>();
-            userOauthService.remove(userOauthQueryWrapper.eq("user_id",id));
+            userOauthService.remove(userOauthQueryWrapper.eq("user_id", id));
             return success("删除成功");
         }
         return fail("删除失败");
@@ -170,11 +204,11 @@ public class UserController extends BaseController {
     @DeleteMapping("/batch")
     public ApiResult<?> deleteBatch(@RequestBody List<Integer> ids) {
         ids.forEach(userId -> {
-          QueryWrapper<UserOauth> userOauthQueryWrapper = new QueryWrapper<>();
-          userOauthService.remove(userOauthQueryWrapper.eq("user_id",userId));
+            QueryWrapper<UserOauth> userOauthQueryWrapper = new QueryWrapper<>();
+            userOauthService.remove(userOauthQueryWrapper.eq("user_id", userId));
         });
         if (userService.removeByIds(ids)) {
-          return success("删除成功");
+            return success("删除成功");
         }
         return fail("删除失败");
     }
@@ -268,8 +302,8 @@ public class UserController extends BaseController {
     @OperationLog
     @ApiOperation("导入用户")
     @Transactional(rollbackFor = {Exception.class})
-    @PostMapping("/import")
-    public ApiResult<List<String>> importBatch(MultipartFile file) {
+    @PostMapping("/import/{userLevel}")
+    public ApiResult<List<String>> importBatch(MultipartFile file, @PathVariable Integer userLevel) {
         ImportParams importParams = new ImportParams();
         try {
             List<UserImportParam> list = ExcelImportUtil.importExcel(file.getInputStream(),
@@ -284,51 +318,119 @@ public class UserController extends BaseController {
             // 校验是否存在
             List<User> usernameExists = userService.list(new LambdaQueryWrapper<User>().in(User::getUsername,
                     list.stream().map(UserImportParam::getUsername).collect(Collectors.toList())));
-            if (usernameExists.size() > 0) {
+            if (!usernameExists.isEmpty()) {
                 return fail("账号已经存在",
                         usernameExists.stream().map(User::getUsername).collect(Collectors.toList()));
             }
             List<User> phoneExists = userService.list(new LambdaQueryWrapper<User>().in(User::getPhone,
                     list.stream().map(UserImportParam::getPhone).collect(Collectors.toList())));
-            if (phoneExists.size() > 0) {
+            if (!phoneExists.isEmpty()) {
                 return fail("手机号已经存在",
                         phoneExists.stream().map(User::getPhone).collect(Collectors.toList()));
             }
-            // 添加
+//             添加
             List<User> users = new ArrayList<>();
             for (UserImportParam one : list) {
+                // 一个城市只有一个区代
+                if (one.getPhone() != null && !one.getPhone().isEmpty() && userLevel.equals(1)) {
+                    if (one.getSecondAreaName() != null) {
+                        Area city = areaService.getCityByName(one.getSecondAreaName());
+                        if (city != null) {
+                            User cityAgent = userService.getCityAgent(city.getId());
+                            if (cityAgent != null) continue;
+                        }
+                    }
+                }
                 User u = new User();
-                u.setStatus(0);
+                String pwd = one.getPassword() == null ? "147258" : one.getPassword();
+                u.setPassword(userService.encodePassword(pwd));
+                u.setRealName(one.getRealName());
                 u.setUsername(one.getUsername());
-                u.setPassword(userService.encodePassword(one.getPassword()));
-                u.setNickname(one.getNickname());
                 u.setPhone(one.getPhone());
-                Role role = roleService.getOne(new QueryWrapper<Role>()
-                        .eq("role_name", one.getRoleName()), false);
-                if (role == null) {
-                    return fail("角色不存在", Collections.singletonList(one.getRoleName()));
-                } else {
-                    u.setRoles(Collections.singletonList(role));
+                u.setImei(one.getImei());
+                u.setPhone(one.getPhone());
+//                u.setSkuCode(one.getSkuCode());
+//                u.setSkuName(one.getSkuName());
+                u.setVkAccount(one.getVkAccount());
+//                u.setPhoneColor(one.getPhoneColor());
+//                u.setSellerName(one.getSellerName());
+//                u.setSellerCode(one.getSellerCode());
+                u.setStoreName(one.getStoreName());
+//                u.setActiveState(one.getActiveState());
+//                u.setActiveDate(one.getActiveDate());
+                u.setSecondAreaName(one.getSecondAreaName());
+                u.setRetailerName(one.getRetailerName());
+                u.setUserLevel(userLevel);
+                u.setTenantId(10049);
+                Area city = null;
+                if (one.getSecondAreaName() != null) {
+                    city = areaService.getCityByName(one.getSecondAreaName());
+                    if (city != null) {
+                        u.setCityId(city.getId());
+                        u.setSecondAreaName(city.getName());
+                    } else {
+                        u.setSecondAreaName(one.getSecondAreaName());
+                    }
                 }
-                Organization organization = organizationService.getOne(new QueryWrapper<Organization>()
-                        .eq("organization_full_name", one.getOrganizationName()), false);
-                if (organization == null) {
-                    return fail("机构不存在", Collections.singletonList(one.getOrganizationName()));
-                } else {
-                    u.setOrganizationId(organization.getOrganizationId());
+                if (one.getStoreName() != null) {
+                    VivoStore store = vivoStoreService.getByName(one.getStoreName());
+                    if (store != null) u.setStoreId(store.getId());
+                    else {
+                        VivoStore newStore = new VivoStore() {{
+                            setName(one.getStoreName());
+                        }};
+                        vivoStoreService.save(newStore);
+                        u.setStoreId(newStore.getId());
+                    }
                 }
-                DictionaryData sex = dictionaryDataService.getByDictCodeAndName("sex", one.getSexName());
-                if (sex == null) {
-                    return fail("性别不存在", Collections.singletonList(one.getSexName()));
-                } else {
-                    u.setSex(sex.getDictDataCode());
+                if (one.getFixStoreName() != null) {
+                    u.setFixStoreName(one.getFixStoreName());
+                    VivoFixStore fixStore = vivoFixStoreService.getByName(one.getFixStoreName());
+                    if (fixStore != null) u.setFixStoreId(fixStore.getId());
+                    else {
+                        VivoFixStore newFixStore = new VivoFixStore() {{
+                            setName(one.getFixStoreName());
+                        }};
+                        vivoFixStoreService.save(newFixStore);
+                        u.setFixStoreId(newFixStore.getId());
+                    }
                 }
+                if (one.getRetailerName() != null) {
+                    Organization retailer = organizationService.getByName(one.getRetailerName());
+                    if (retailer != null) u.setOrganizationId(retailer.getOrganizationId());
+                    else {
+                        Organization newRetailer = new Organization() {{
+                            setOrganizationName(one.getRetailerName());
+                            setSortNumber(1);
+                            setTenantId(10049);
+                        }};
+                        organizationService.save(newRetailer);
+                        u.setOrganizationId(newRetailer.getOrganizationId());
+                    }
+                }
+                users.add(u);
             }
             if (userService.saveBatch(users)) {
+                if (userLevel.equals(8)) {
+                    // 售后店长
+                    users.forEach(user -> {
+                        if (user.getFixStoreId() != null) {
+                            VivoFixStore fixStore = vivoFixStoreService.getById(user.getFixStoreId());
+                            if (fixStore.getUserId() == null) {
+                                fixStore.setUserId(user.getUserId());
+                                vivoFixStoreService.updateById(fixStore);
+                            }
+                        }
+                    });
+
+                }
                 return success("导入成功", null);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            for (StackTraceElement element : e.getStackTrace()) {
+                System.out.println(element);
+            }
+            return fail(e.getMessage(), null);
         }
         return fail("导入失败", null);
     }
@@ -336,12 +438,12 @@ public class UserController extends BaseController {
     @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("更新失败");
+    public ApiResult<?> getAvatarByMpWx(@RequestBody User user) {
+        user.setAvatar("https://oa.gxwebsoft.com/assets/logo.7ccfefb9.svg");
+        if (userService.updateUser(user)) {
+            return success("更新成功");
+        }
+        return fail("更新失败");
     }
 
 }
diff --git a/src/main/java/com/gxwebsoft/apps/entity/TestData.java b/src/main/java/com/gxwebsoft/common/system/entity/Area.java
similarity index 50%
rename from src/main/java/com/gxwebsoft/apps/entity/TestData.java
rename to src/main/java/com/gxwebsoft/common/system/entity/Area.java
index 232e598..b66a68d 100644
--- a/src/main/java/com/gxwebsoft/apps/entity/TestData.java
+++ b/src/main/java/com/gxwebsoft/common/system/entity/Area.java
@@ -1,11 +1,11 @@
-package com.gxwebsoft.apps.entity;
+package com.gxwebsoft.common.system.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import java.io.Serializable;
-import java.util.Date;
+import java.util.List;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,35 +13,31 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 测试数据表
+ * 
  *
  * @author 科技小王子
- * @since 2023-02-01 12:13:46
+ * @since 2024-03-15 23:18:34
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TestData对象", description = "测试数据表")
-@TableName("apps_test_data")
-public class TestData implements Serializable {
+@ApiModel(value = "Area对象", description = "")
+@TableName("sys_area")
+public class Area 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;
+    private String name;
 
-    @ApiModelProperty(value = "内容")
-    private String content;
+    private Integer fid;
+
+    private Integer levelId;
 
     @ApiModelProperty(value = "租户id")
     private Integer tenantId;
 
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
+    @TableField(exist = false)
+    private List<Area> children;
 
 }
diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Organization.java b/src/main/java/com/gxwebsoft/common/system/entity/Organization.java
index 7881795..7c5db5c 100644
--- a/src/main/java/com/gxwebsoft/common/system/entity/Organization.java
+++ b/src/main/java/com/gxwebsoft/common/system/entity/Organization.java
@@ -49,6 +49,12 @@ public class Organization implements Serializable {
     @ApiModelProperty(value = "备注")
     private String comments;
 
+    private String province;
+
+    private String city;
+
+    private String region;
+
     @ApiModelProperty(value = "是否删除, 0否, 1是")
     @TableLogic
     private Integer deleted;
diff --git a/src/main/java/com/gxwebsoft/common/system/entity/User.java b/src/main/java/com/gxwebsoft/common/system/entity/User.java
index 711065d..1455f36 100644
--- a/src/main/java/com/gxwebsoft/common/system/entity/User.java
+++ b/src/main/java/com/gxwebsoft/common/system/entity/User.java
@@ -3,6 +3,8 @@ 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.vivo.entity.VivoFixStore;
+import com.gxwebsoft.vivo.entity.VivoStore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -92,6 +94,9 @@ public class User implements UserDetails {
     @ApiModelProperty("用户可用余额")
     private BigDecimal balance;
 
+    @ApiModelProperty("总收入")
+    private BigDecimal totalIncome;
+
     @ApiModelProperty("用户可用积分")
     private Integer points;
 
@@ -151,9 +156,66 @@ public class User implements UserDetails {
     @ApiModelProperty("是否已实名认证")
     private Integer certification;
 
-    @ApiModelProperty("用户等级(0无权限1班组组长2资料员3经营人员4生产主管)")
+    @ApiModelProperty("用户等级(0管理员1区代2总售后3零售商店长4导购5售后6散户7编外8售后店长)")
     private Integer userLevel;
 
+    private String imei;
+
+    private String skuCode;
+
+    private String skuName;
+
+    private String vkAccount;
+
+    private String phoneModel;
+
+    private String phoneColor;
+
+    @ApiModelProperty("上报人姓名")
+    private String sellerName;
+
+    @ApiModelProperty("上报人工号")
+    private String sellerCode;
+
+    @ApiModelProperty("门店")
+    private String storeName;
+
+    @ApiModelProperty("门店")
+    private Integer storeId;
+
+    @ApiModelProperty("门店")
+    @TableField(exist = false)
+    private VivoStore store;
+
+    @ApiModelProperty("门店")
+    private String fixStoreName;
+
+    @ApiModelProperty("门店")
+    private Integer fixStoreId;
+
+    @ApiModelProperty("门店")
+    @TableField(exist = false)
+    private VivoFixStore fixStore;
+
+    @ApiModelProperty("后台状态：已激活/未激活")
+    private String activeState;
+
+    @ApiModelProperty("后台激活日期")
+    private String activeDate;
+
+    @ApiModelProperty("二级区域名称")
+    private String secondAreaName;
+
+    @ApiModelProperty("二级区域Id")
+    private Integer cityId;
+
+    @ApiModelProperty("市")
+    @TableField(exist = false)
+    private Area cityItem;
+
+    @ApiModelProperty("零售商名称")
+    private String retailerName;
+
     @ApiModelProperty("机构名称")
     @TableField(exist = false)
     private String organizationName;
@@ -209,6 +271,9 @@ public class User implements UserDetails {
     @TableField(exist = false)
     private Integer auditStatus;
 
+    @TableField(exist = false)
+    private User cityAgent;
+
 
     @Override
     public boolean isAccountNonExpired() {
@@ -229,7 +294,8 @@ public class User implements UserDetails {
     public boolean isEnabled() {
         return true;
     }
-//
+
+    //
 //    public String getRealName(){
 //      return DesensitizedUtil.chineseName(this.realName);
 //    }
@@ -237,8 +303,8 @@ public class User implements UserDetails {
 //    public String getIdCard(){
 //      return DesensitizedUtil.idCardNum(this.idCard,1,2);
 //    }
-    public String getMobile(){
-      return DesensitizedUtil.mobilePhone(this.phone);
+    public String getMobile() {
+        return DesensitizedUtil.mobilePhone(this.phone);
     }
 
 }
diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/AreaMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/AreaMapper.java
new file mode 100644
index 0000000..b9a6ce7
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/common/system/mapper/AreaMapper.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.Area;
+import com.gxwebsoft.common.system.param.AreaParam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * Mapper
+ *
+ * @author 科技小王子
+ * @since 2024-03-15 23:18:34
+ */
+public interface AreaMapper extends BaseMapper<Area> {
+
+    /**
+     * 分页查询
+     *
+     * @param page  分页对象
+     * @param param 查询参数
+     * @return List<Area>
+     */
+    List<Area> selectPageRel(@Param("page") IPage<Area> page,
+                             @Param("param") AreaParam param);
+
+    /**
+     * 查询全部
+     *
+     * @param param 查询参数
+     * @return List<User>
+     */
+    List<Area> selectListRel(@Param("param") AreaParam param);
+
+}
diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/AreaMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/AreaMapper.xml
new file mode 100644
index 0000000..66fd738
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/AreaMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gxwebsoft.common.system.mapper.AreaMapper">
+
+    <!-- 关联查询sql -->
+    <sql id="selectSql">
+        SELECT a.*
+        FROM sys_area a
+        <where>
+            <if test="param.id != null">
+                AND a.id = #{param.id}
+            </if>
+            <if test="param.name != null">
+                AND a.name LIKE CONCAT('%', #{param.name}, '%')
+            </if>
+            <if test="param.fid != null">
+                AND a.fid = #{param.fid}
+            </if>
+            <if test="param.levelId != null">
+                AND a.level_id = #{param.levelId}
+            </if>
+        </where>
+    </sql>
+
+    <!-- 分页查询 -->
+    <select id="selectPageRel" resultType="com.gxwebsoft.common.system.entity.Area">
+        <include refid="selectSql"></include>
+    </select>
+
+    <!-- 查询全部 -->
+    <select id="selectListRel" resultType="com.gxwebsoft.common.system.entity.Area">
+        <include refid="selectSql"></include>
+    </select>
+
+</mapper>
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
index 52c9467..dff61a0 100644
--- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml
+++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml
@@ -65,6 +65,15 @@
             <if test="param.leaderUsername != null">
                 AND c.username LIKE CONCAT('%', #{param.leaderUsername}, '%')
             </if>
+            <if test="param.province != null">
+                AND a.province LIKE CONCAT('%', #{param.province}, '%')
+            </if>
+            <if test="param.city != null">
+                AND a.city LIKE CONCAT('%', #{param.city}, '%')
+            </if>
+            <if test="param.region != null">
+                AND a.region LIKE CONCAT('%', #{param.region}, '%')
+            </if>
             <if test="param.keywords != null">
               AND (
               a.organization_name LIKE CONCAT('%', #{param.keywords}, '%')
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
index e387db9..241bf6b 100644
--- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
+++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
@@ -143,6 +143,45 @@
             <if test="param.parentId != null">
               AND a.organization_id IN (SELECT organization_id FROM sys_organization WHERE parent_id=#{param.parentId})
             </if>
+        <if test="param.imei != null">
+            AND a.imei LIKE CONCAT('%', #{param.imei}, '%')
+        </if>
+        <if test="param.skuCode != null">
+            AND a.sku_code LIKE CONCAT('%', #{param.skuCode}, '%')
+        </if>
+        <if test="param.skuName != null">
+            AND a.sku_name LIKE CONCAT('%', #{param.skuName}, '%')
+        </if>
+        <if test="param.vkAccount != null">
+            AND a.vk_account LIKE CONCAT('%', #{param.vkAccount}, '%')
+        </if>
+        <if test="param.phoneModel != null">
+            AND a.phone_model LIKE CONCAT('%', #{param.phoneModel}, '%')
+        </if>
+        <if test="param.phoneColor != null">
+            AND a.phone_color LIKE CONCAT('%', #{param.phoneColor}, '%')
+        </if>
+        <if test="param.sellerName != null">
+            AND a.seller_name LIKE CONCAT('%', #{param.sellerName}, '%')
+        </if>
+        <if test="param.sellerCode != null">
+            AND a.seller_code LIKE CONCAT('%', #{param.sellerCode}, '%')
+        </if>
+        <if test="param.storeName != null">
+            AND a.store_name LIKE CONCAT('%', #{param.storeName}, '%')
+        </if>
+        <if test="param.activeState != null">
+            AND a.active_state LIKE CONCAT('%', #{param.activeState}, '%')
+        </if>
+        <if test="param.activeDate != null">
+            AND a.active_date LIKE CONCAT('%', #{param.activeDate}, '%')
+        </if>
+        <if test="param.secondAreaName != null">
+            AND a.second_area_name LIKE CONCAT('%', #{param.secondAreaName}, '%')
+        </if>
+        <if test="param.retailerName != null">
+            AND a.retailer_name LIKE CONCAT('%', #{param.retailerName}, '%')
+        </if>
     </sql>
 
     <!-- 分页查询 -->
diff --git a/src/main/java/com/gxwebsoft/apps/param/TestDataParam.java b/src/main/java/com/gxwebsoft/common/system/param/AreaParam.java
similarity index 59%
rename from src/main/java/com/gxwebsoft/apps/param/TestDataParam.java
rename to src/main/java/com/gxwebsoft/common/system/param/AreaParam.java
index 44d6d61..13645e2 100644
--- a/src/main/java/com/gxwebsoft/apps/param/TestDataParam.java
+++ b/src/main/java/com/gxwebsoft/common/system/param/AreaParam.java
@@ -1,4 +1,4 @@
-package com.gxwebsoft.apps.param;
+package com.gxwebsoft.common.system.param;
 
 import com.gxwebsoft.common.core.annotation.QueryField;
 import com.gxwebsoft.common.core.annotation.QueryType;
@@ -10,26 +10,27 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 测试数据表查询参数
+ * 查询参数
  *
  * @author 科技小王子
- * @since 2023-02-01 12:13:46
+ * @since 2024-03-15 23:18:34
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TestDataParam对象", description = "测试数据表查询参数")
-public class TestDataParam extends BaseParam {
+@ApiModel(value = "AreaParam对象", description = "查询参数")
+public class AreaParam extends BaseParam {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "主键ID")
     @QueryField(type = QueryType.EQ)
     private Integer id;
 
-    @ApiModelProperty(value = "标题")
-    private String title;
+    private String name;
 
-    @ApiModelProperty(value = "内容")
-    private String content;
+    @QueryField(type = QueryType.EQ)
+    private Integer fid;
+
+    @QueryField(type = QueryType.EQ)
+    private Integer levelId;
 
 }
diff --git a/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java b/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java
index d0b9942..a9f4d47 100644
--- a/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java
+++ b/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java
@@ -43,6 +43,12 @@ public class OrganizationParam extends BaseParam {
     @ApiModelProperty(value = "机构类型(字典代码)")
     private String organizationType;
 
+    private String province;
+
+    private String city;
+
+    private String region;
+
     @ApiModelProperty(value = "负责人id")
     @QueryField(type = QueryType.EQ)
     private Integer leaderId;
diff --git a/src/main/java/com/gxwebsoft/common/system/param/UserImportParam.java b/src/main/java/com/gxwebsoft/common/system/param/UserImportParam.java
index 153a783..623eaf3 100644
--- a/src/main/java/com/gxwebsoft/common/system/param/UserImportParam.java
+++ b/src/main/java/com/gxwebsoft/common/system/param/UserImportParam.java
@@ -1,6 +1,7 @@
 package com.gxwebsoft.common.system.param;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -18,25 +19,52 @@ public class UserImportParam implements Serializable {
     @Excel(name = "账号")
     private String username;
 
-    @Excel(name = "密码")
-    private String password;
-
-    @Excel(name = "昵称")
-    private String nickname;
+    @Excel(name = "姓名")
+    private String realName;
 
     @Excel(name = "手机号")
     private String phone;
 
-    @Excel(name = "邮箱")
-    private String email;
+    @Excel(name = "密码")
+    private String password;
 
-    @Excel(name = "组织机构")
-    private String organizationName;
+    @Excel(name = "imei")
+    private String imei;
+//
+//    @Excel(name = "商品(SKU)编码")
+//    private String skuCode;
+//
+//    @Excel(name = "商品(SKU)名称")
+//    private String skuName;
 
-    @Excel(name = "性别")
-    private String sexName;
+    @Excel(name = "VCRM账号")
+    private String vkAccount;
 
-    @Excel(name = "角色")
-    private String roleName;
+//    @Excel(name = "颜色")
+//    private String phoneColor;
+//
+//    @Excel(name = "上报人姓名")
+//    private String sellerName;
+//
+//    @Excel(name = "上报人工号")
+//    private String sellerCode;
+
+    @Excel(name = "门店")
+    private String storeName;
+
+    @Excel(name = "维修门店")
+    private String fixStoreName;
+
+//    @Excel(name = "后台状态：已激活/未激活")
+//    private String activeState;
+//
+//    @Excel(name = "后台激活日期")
+//    private String activeDate;
+
+    @Excel(name = "二级区域名称")
+    private String secondAreaName;
+
+    @Excel(name = "零售商名称")
+    private String retailerName;
 
 }
diff --git a/src/main/java/com/gxwebsoft/common/system/param/UserParam.java b/src/main/java/com/gxwebsoft/common/system/param/UserParam.java
index 0b8ae75..8c6af4e 100644
--- a/src/main/java/com/gxwebsoft/common/system/param/UserParam.java
+++ b/src/main/java/com/gxwebsoft/common/system/param/UserParam.java
@@ -106,6 +106,39 @@ public class UserParam extends BaseParam {
     @ApiModelProperty(value = "所在辖区")
     private String region;
 
+    private String imei;
+
+    private String skuCode;
+
+    private String skuName;
+
+    private String vkAccount;
+
+    private String phoneModel;
+
+    private String phoneColor;
+
+    @ApiModelProperty("上报人姓名")
+    private String sellerName;
+
+    @ApiModelProperty("上报人工号")
+    private String sellerCode;
+
+    @ApiModelProperty("门店")
+    private String storeName;
+
+    @ApiModelProperty("后台状态：已激活/未激活")
+    private String activeState;
+
+    @ApiModelProperty("后台激活日期")
+    private String activeDate;
+
+    @ApiModelProperty("二级区域名称")
+    private String secondAreaName;
+
+    @ApiModelProperty("零售商名称")
+    private String retailerName;
+
     @ApiModelProperty("机构名称")
     @TableField(exist = false)
     private String organizationName;
@@ -117,7 +150,7 @@ public class UserParam extends BaseParam {
     @ApiModelProperty("公司名称")
     private String customerName;
 
-    @ApiModelProperty("用户等级(0无权限1班组组长2资料员3经营人员4生产主管)")
+    @ApiModelProperty("用户等级(0管理员1区代2总售后3零售商店长4导购5售后6散户)")
     private Integer userLevel;
 
     @ApiModelProperty("性别名称")
@@ -144,6 +177,10 @@ public class UserParam extends BaseParam {
     @TableField(exist = false)
     private String code;
 
+    @ApiModelProperty("微信手机号code")
+    @TableField(exist = false)
+    private String phoneCode;
+
     @ApiModelProperty("租户ID")
     private Integer tenantId;
 
diff --git a/src/main/java/com/gxwebsoft/common/system/service/AreaService.java b/src/main/java/com/gxwebsoft/common/system/service/AreaService.java
new file mode 100644
index 0000000..b6399f1
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/common/system/service/AreaService.java
@@ -0,0 +1,46 @@
+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.Area;
+import com.gxwebsoft.common.system.param.AreaParam;
+
+import java.util.List;
+
+/**
+ * Service
+ *
+ * @author 科技小王子
+ * @since 2024-03-15 23:18:34
+ */
+public interface AreaService extends IService<Area> {
+
+    /**
+     * 分页关联查询
+     *
+     * @param param 查询参数
+     * @return PageResult<Area>
+     */
+    PageResult<Area> pageRel(AreaParam param);
+
+    /**
+     * 关联查询全部
+     *
+     * @param param 查询参数
+     * @return List<Area>
+     */
+    List<Area> listRel(AreaParam param);
+
+    /**
+     * 根据id查询
+     *
+     * @param id 
+     * @return Area
+     */
+    Area getByIdRel(Integer id);
+
+    Area getParent(Integer id);
+
+    Area getCityByName(String name);
+
+}
diff --git a/src/main/java/com/gxwebsoft/common/system/service/DictDataService.java b/src/main/java/com/gxwebsoft/common/system/service/DictDataService.java
index 86b94bf..f793be6 100644
--- a/src/main/java/com/gxwebsoft/common/system/service/DictDataService.java
+++ b/src/main/java/com/gxwebsoft/common/system/service/DictDataService.java
@@ -49,4 +49,6 @@ public interface DictDataService extends IService<DictData> {
      */
     DictData getByDictCodeAndName(String dictCode, String dictDataName);
 
+    List<DictData> getByDictId(Integer dictId);
+
 }
diff --git a/src/main/java/com/gxwebsoft/common/system/service/OrganizationService.java b/src/main/java/com/gxwebsoft/common/system/service/OrganizationService.java
index 94d3407..285586a 100644
--- a/src/main/java/com/gxwebsoft/common/system/service/OrganizationService.java
+++ b/src/main/java/com/gxwebsoft/common/system/service/OrganizationService.java
@@ -39,4 +39,6 @@ public interface OrganizationService extends IService<Organization> {
      */
     Organization getByIdRel(Integer organizationId);
 
+    Organization getByName(String name);
+
 }
diff --git a/src/main/java/com/gxwebsoft/common/system/service/UserService.java b/src/main/java/com/gxwebsoft/common/system/service/UserService.java
index 542d200..91669c7 100644
--- a/src/main/java/com/gxwebsoft/common/system/service/UserService.java
+++ b/src/main/java/com/gxwebsoft/common/system/service/UserService.java
@@ -104,4 +104,13 @@ public interface UserService extends IService<User>, UserDetailsService {
 
     List<User> listStatisticsRel(UserParam param);
 
+    /***
+     * 区代
+     * @param cityId
+     * @return
+     */
+    User getCityAgent(Integer cityId);
+
+    User getCityLevel2(Integer cityId);
+
 }
diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/AreaServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/AreaServiceImpl.java
new file mode 100644
index 0000000..55d1d53
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/common/system/service/impl/AreaServiceImpl.java
@@ -0,0 +1,63 @@
+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.mapper.AreaMapper;
+import com.gxwebsoft.common.system.service.AreaService;
+import com.gxwebsoft.common.system.entity.Area;
+import com.gxwebsoft.common.system.param.AreaParam;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Service实现
+ *
+ * @author 科技小王子
+ * @since 2024-03-15 23:18:34
+ */
+@Service
+public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements AreaService {
+
+    @Override
+    public PageResult<Area> pageRel(AreaParam param) {
+        PageParam<Area, AreaParam> page = new PageParam<>(param);
+        //page.setDefaultOrder("create_time desc");
+        List<Area> list = baseMapper.selectPageRel(page, param);
+        return new PageResult<>(list, page.getTotal());
+    }
+
+    @Override
+    public List<Area> listRel(AreaParam param) {
+        List<Area> list = baseMapper.selectListRel(param);
+        // 排序
+        PageParam<Area, AreaParam> page = new PageParam<>();
+        //page.setDefaultOrder("create_time desc");
+        return page.sortRecords(list);
+    }
+
+    @Override
+    public Area getByIdRel(Integer id) {
+        AreaParam param = new AreaParam();
+        param.setId(id);
+        return param.getOne(baseMapper.selectListRel(param));
+    }
+
+    @Override
+    public Area getParent(Integer id) {
+        Area area = getById(id);
+        return getById(area.getFid());
+    }
+
+    @Override
+    public Area getCityByName(String name) {
+        return getOne(
+                new LambdaQueryWrapper<Area>()
+                        .eq(Area::getLevelId, 2)
+                        .like(Area::getName, name)
+        );
+    }
+
+}
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
index e30a0fe..d67f270 100644
--- a/src/main/java/com/gxwebsoft/common/system/service/impl/DictDataServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/common/system/service/impl/DictDataServiceImpl.java
@@ -1,5 +1,6 @@
 package com.gxwebsoft.common.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gxwebsoft.common.core.utils.CommonUtil;
 import com.gxwebsoft.common.core.web.PageParam;
@@ -49,4 +50,9 @@ public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData>
         return CommonUtil.listGetOne(list);
     }
 
+    @Override
+    public List<DictData> getByDictId(Integer dictId) {
+        return list(new LambdaQueryWrapper<DictData>().eq(DictData::getDictId, dictId));
+    }
+
 }
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
index b2bb53f..b6d25a6 100644
--- a/src/main/java/com/gxwebsoft/common/system/service/impl/OrganizationServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/common/system/service/impl/OrganizationServiceImpl.java
@@ -1,5 +1,6 @@
 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;
@@ -42,4 +43,12 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
         return param.getOne(baseMapper.selectListRel(param));
     }
 
+    @Override
+    public Organization getByName(String name) {
+        return getOne(
+                new LambdaQueryWrapper<Organization>()
+                        .eq(Organization::getOrganizationName, name)
+        );
+    }
+
 }
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
index d671370..0364cc4 100644
--- a/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java
@@ -105,21 +105,21 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         if (user != null) {
             user.setRoles(userRoleService.listByUserId(user.getUserId()));
             user.setAuthorities(roleMenuService.listMenuByUserId(user.getUserId(), null));
-            user.setCompanyInfo(companyService.getByTenantIdRel(user.getTenantId()));
+//            user.setCompanyInfo(companyService.getByTenantIdRel(user.getTenantId()));
             final String cache = cacheClient.get(TEN_ANT_SETTING_KEY.concat(":setting"));
             user.setSetting(cache);
             // 商户编号
-            Merchant merchant = merchantService.getOne(new QueryWrapper<Merchant>()
-              .eq("merchant_owner", user.getUserId()),false);
-            if(merchant != null){
-              user.setMerchantCode(merchant.getMerchantCode());
-              user.setMerchantName(merchant.getMerchantName());
-            }else{
-              MerchantClerk clerk = merchantClerkService.getOne(new QueryWrapper<MerchantClerk>().eq("user_id",user.getUserId()),false);
-              if(clerk != null) {
-                user.setMerchantCode(clerk.getMerchantCode());
-              }
-            }
+//            Merchant merchant = merchantService.getOne(new QueryWrapper<Merchant>()
+//              .eq("merchant_owner", user.getUserId()),false);
+//            if(merchant != null){
+//              user.setMerchantCode(merchant.getMerchantCode());
+//              user.setMerchantName(merchant.getMerchantName());
+//            }else{
+//              MerchantClerk clerk = merchantClerkService.getOne(new QueryWrapper<MerchantClerk>().eq("user_id",user.getUserId()),false);
+//              if(clerk != null) {
+//                user.setMerchantCode(clerk.getMerchantCode());
+//              }
+//            }
         }
         return user;
     }
@@ -232,6 +232,24 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         return list;
     }
 
+    @Override
+    public User getCityAgent(Integer cityId) {
+        return getOne(
+                new LambdaQueryWrapper<User>()
+                        .eq(User::getCityId, cityId)
+                        .eq(User::getUserLevel, 1)
+        );
+    }
+
+    @Override
+    public User getCityLevel2(Integer cityId) {
+        return getOne(
+                new LambdaQueryWrapper<User>()
+                        .eq(User::getCityId, cityId)
+                        .eq(User::getUserLevel, 2)
+        );
+    }
+
     /**
      * 批量查询用户的角色
      *
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenAlipayController.java b/src/main/java/com/gxwebsoft/open/controller/OpenAlipayController.java
deleted file mode 100644
index 5399dd1..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenAlipayController.java
+++ /dev/null
@@ -1,182 +0,0 @@
-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<User> 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/OpenBcAgentController.java b/src/main/java/com/gxwebsoft/open/controller/OpenBcAgentController.java
deleted file mode 100644
index ff4922a..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenBcAgentController.java
+++ /dev/null
@@ -1,123 +0,0 @@
-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<PageResult<BcAgent>> page(BcAgentParam param) {
-      // 验证签名
-      isCheckSign();
-        // 使用关联查询
-      param.setParentId(getLoginUserId());
-      return success(bcAgentService.pageRel(param));
-    }
-
-    @ApiOperation("查询全部代报餐管理")
-    @GetMapping()
-    public ApiResult<List<BcAgent>> list(BcAgentParam param) {
-      // 验证签名
-      isCheckSign();
-        // 使用关联查询
-        param.setParentId(getLoginUserId());
-        return success(bcAgentService.listRel(param));
-    }
-
-    @ApiOperation("根据id查询代报餐管理")
-    @GetMapping("/{id}")
-    public ApiResult<BcAgent> 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<BcAgent> list) {
-        if (bcAgentService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcAgent:update')")
-    @OperationLog
-    @ApiOperation("批量修改代报餐管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcAgent> 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<Integer> 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
deleted file mode 100644
index b617ca8..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenBcController.java
+++ /dev/null
@@ -1,481 +0,0 @@
-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<String, Object> 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<String, Object> map = new HashMap<>();
-      map.put("Status",1);
-      map.put("Msg","服务器时间");
-      map.put("Time", now);
-      return map;
-    }
-
-    @ApiOperation("付款码（二维码）支付接口")
-    @PostMapping("/QRCodeTransaction")
-    public HashMap<String, Object> 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<String, Object> 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<String, Object> 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<BcEquipment> 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<Order> list = orderService.listRel(orderParam);
-          Order order = list.get(0);
-//          System.out.println("order-one = " + order);
-          OrderGoodsParam orderGoodsParam = new OrderGoodsParam();
-          // 2.1查询订单商品
-          List<OrderGoods> orderGoods = orderGoodsService.list(new LambdaQueryWrapper<OrderGoods>()
-            .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<OrderGoods> saveOrderGoods = new ArrayList<>();
-      ArrayList<Order> 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<UserReferee> userRefereeList = userRefereeService.listRel(userRefereeParam);
-        // 查询帮代餐的成员ID集
-        List<Integer> userIds = userRefereeList.stream().map(UserReferee::getUserId).collect(Collectors.toList());
-        userIds.add(Integer.valueOf(dealerId));
-        System.out.println("userIds = " + userIds);
-        // 查询成员的订单
-        List<Order> list = orderService.list(new LambdaQueryWrapper<Order>()
-          .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)
-        );
-        System.out.println("list = " + list.size());
-        if(list.size() > 0){
-          // 收集订单ID集
-          List<Integer> orderIds = list.stream().map(Order::getOrderId).collect(Collectors.toList());
-          System.out.println("orderIds = " + orderIds);
-          // 查询商品
-          if(orderIds.size() > 0){
-            List<OrderGoods> orderGoodsList = orderGoodsService.list(new LambdaQueryWrapper<OrderGoods>()
-              .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<String, Object> 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<String, Object> 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<String, Object> 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<String, Object> 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<BcEquipment> 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<Order> list = orderService.listRel(orderParam);
-//        Order order = list.get(0);
-//        System.out.println("order-one = " + order);
-//        OrderGoodsParam orderGoodsParam = new OrderGoodsParam();
-//        // 2.1查询订单商品
-//        List<OrderGoods> orderGoods = orderGoodsService.list(new LambdaQueryWrapper<OrderGoods>()
-//          .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<OrderGoods> saveOrderGoods = new ArrayList<>();
-//    ArrayList<Order> 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<UserReferee> userRefereeList = userRefereeService.listRel(userRefereeParam);
-//      // 查询帮代餐的成员ID集
-//      List<Integer> userIds = userRefereeList.stream().map(UserReferee::getUserId).collect(Collectors.toList());
-//      userIds.add(getLoginUserId());
-//      System.out.println("userIds = " + userIds);
-//      // 查询成员的订单
-//      List<Order> list = orderService.list(new LambdaQueryWrapper<Order>()
-//        .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<Integer> orderIds = list.stream().map(Order::getOrderId).collect(Collectors.toList());
-//        System.out.println("orderIds = " + orderIds);
-//        // 查询商品
-//        if(orderIds.size() > 0){
-//          List<OrderGoods> orderGoodsList = orderGoodsService.list(new LambdaQueryWrapper<OrderGoods>()
-//            .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<String, Object> 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
deleted file mode 100644
index 134db5e..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenBcTemporaryController.java
+++ /dev/null
@@ -1,129 +0,0 @@
-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<PageResult<BcTemporary>> page(BcTemporaryParam param) {
-        // 验证签名
-        isCheckSign();
-        // 使用关联查询
-        param.setUserId(getLoginUserId());
-        param.setDayTime(DateUtil.date());
-      return success(bcTemporaryService.pageRel(param));
-    }
-
-    @ApiOperation("查询全部临时报餐管理")
-    @GetMapping()
-    public ApiResult<List<BcTemporary>> list(BcTemporaryParam param) {
-        // 验证签名
-        isCheckSign();
-        // 使用关联查询
-        return success(bcTemporaryService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcTemporary:list')")
-    @OperationLog
-    @ApiOperation("根据id查询临时报餐管理")
-    @GetMapping("/{id}")
-    public ApiResult<BcTemporary> 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<BcTemporary> list) {
-        if (bcTemporaryService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcTemporary:update')")
-    @OperationLog
-    @ApiOperation("批量修改临时报餐管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcTemporary> 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<Integer> 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
index 6a5aba6..3034ffb 100644
--- a/src/main/java/com/gxwebsoft/open/controller/OpenCartController.java
+++ b/src/main/java/com/gxwebsoft/open/controller/OpenCartController.java
@@ -87,7 +87,7 @@ public class OpenCartController extends BaseController {
       }
       // 2.创建订单
       Order order = new Order();
-      order.setOrderNo(IdUtil.getSnowflakeNextId());
+      order.setOrderNo(makeOrderNumber(""));
       order.setTotalPrice(param.getTotalPrice());
       order.setOrderPrice(param.getTotalPrice());
       order.setPayPrice(param.getTotalPrice());
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java b/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java
deleted file mode 100644
index 22629b5..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java
+++ /dev/null
@@ -1,353 +0,0 @@
-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<PageResult<Equipment>> page(EquipmentParam param) {
-        // 使用关联查询
-        PageParam<Equipment, EquipmentParam> 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<Equipment>> list(EquipmentParam param) {
-        PageParam<Equipment, EquipmentParam> 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<Equipment> 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<Equipment>()
-          .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<Equipment> list) {
-        if (equipmentService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipment:update')")
-    @OperationLog
-    @ApiOperation("批量修改设备管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Equipment> 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<Integer> 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<OrderRefund>().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
index b0bf787..a0699f6 100644
--- a/src/main/java/com/gxwebsoft/open/controller/OpenFileController.java
+++ b/src/main/java/com/gxwebsoft/open/controller/OpenFileController.java
@@ -65,7 +65,7 @@ public class OpenFileController extends BaseController {
                 result.setThumbnail(requestURL + "/thumbnail/" + path);
             }
             result.setDownloadUrl(requestURL + "/download/" + path);
-            result.setMerchantCode(getMerchantCode());
+//            result.setMerchantCode(getMerchantCode());
             fileRecordService.save(result);
             return success(result);
         } catch (Exception e) {
@@ -97,7 +97,7 @@ public class OpenFileController extends BaseController {
             result.setPath(path);
             result.setUrl(requestURL + path);
             result.setThumbnail(FileServerUtil.isImage(upload) ? (requestURL + "/thumbnail" + path) : null);
-            result.setMerchantCode(getMerchantCode());
+//            result.setMerchantCode(getMerchantCode());
             fileRecordService.save(result);
             return success(result);
         } catch (Exception e) {
@@ -199,9 +199,9 @@ public class OpenFileController extends BaseController {
         // 验证签名
         isCheckSign();
         // 搜索条件
-        if (getMerchantCode() != null) {
-          param.setMerchantCode(getMerchantCode());
-        }
+//        if (getMerchantCode() != null) {
+//          param.setMerchantCode(getMerchantCode());
+//        }
         PageResult<FileRecord> result = fileRecordService.pageRel(param);
 //        String requestURL = StrUtil.removeSuffix(request.getRequestURL(), "/page");
         String requestURL = config.getFileServer();
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenOrderController.java b/src/main/java/com/gxwebsoft/open/controller/OpenOrderController.java
deleted file mode 100644
index f71d856..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenOrderController.java
+++ /dev/null
@@ -1,303 +0,0 @@
-package com.gxwebsoft.open.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.utils.BcUtil;
-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.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.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.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<Order>> list(OrderParam param) {
-        // 验证签名
-        isCheckSign();
-        // 使用关联查询
-        return success(orderService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:order:list')")
-    @ApiOperation("根据id查询订单记录表")
-    @GetMapping("/{id}")
-    public ApiResult<Order> 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<Order> 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<Order> 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<OrderGoods, OrderGoodsParam> page = new PageParam<>(param);
-        page.setDefaultOrder("gear asc, sort_number asc, create_time desc");
-        order.setGoodsList(orderGoodsService.list(page.getOrderWrapper()));
-      }
-      return success(order);
-    }
-
-    @ApiOperation("查询今日当前餐段菜品")
-    @PostMapping("/currentOrderGoods")
-    public ApiResult<List<OrderGoods>> 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<Order> 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<Order> list) {
-        // 验证签名
-        isCheckSign();
-        if (orderService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:order:update')")
-    @ApiOperation("批量修改订单记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Order> 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<Integer> 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/shop/constants/OrderConstants.java b/src/main/java/com/gxwebsoft/shop/constants/OrderConstants.java
index 9d89989..7f22626 100644
--- a/src/main/java/com/gxwebsoft/shop/constants/OrderConstants.java
+++ b/src/main/java/com/gxwebsoft/shop/constants/OrderConstants.java
@@ -1,14 +1,31 @@
 package com.gxwebsoft.shop.constants;
 
+import java.util.HashMap;
+import java.util.Map;
+
 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_STATUS_CANCEL = 0;
+  public static final Integer ORDER_STATUS_UNPAID = 1;
+  public static final Integer ORDER_STATUS_PAID= 2;
+  public static final Integer ORDER_STATUS_DONE = 3;
+  public static final Integer ORDER_STATUS_REFUNDING = 4;
+  public static final Integer ORDER_STATUS_REFUND_SUCCESS = 5;
+  public static final Integer ORDER_STATUS_REFUND_FAIL = 6;
+  public static final Integer ORDER_STATUS_USED = 7;
 
-  // 订单商品
-  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; // 部分发货
+  public static final Map<Integer, String> ORDER_STATUS_MAP = new HashMap<Integer, String>(){{
+    put(ORDER_STATUS_CANCEL, "已取消");
+    put(ORDER_STATUS_UNPAID, "待支付");
+    put(ORDER_STATUS_PAID, "已支付");
+    put(ORDER_STATUS_DONE, "已结束");
+    put(ORDER_STATUS_REFUNDING, "退款审核中");
+    put(ORDER_STATUS_REFUND_SUCCESS, "退款成功");
+    put(ORDER_STATUS_REFUND_FAIL, "退款失败");
+    put(ORDER_STATUS_USED, "已出险");
+  }};
+
+  public static final Integer ORDER_PAY_METHOD_CODE = 0;
+  public static final Integer ORDER_PAY_METHOD_WECHAT = 1;
 
 }
diff --git a/src/main/java/com/gxwebsoft/shop/controller/CategoryController.java b/src/main/java/com/gxwebsoft/shop/controller/CategoryController.java
index 5209056..cca93cc 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/CategoryController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/CategoryController.java
@@ -33,6 +33,11 @@ public class CategoryController extends BaseController {
     @Resource
     private CategoryService categoryService;
 
+    @PostMapping("/list")
+    public ApiResult<List<Category>> listForFront() {
+        return success(categoryService.list());
+    }
+
     @PreAuthorize("hasAuthority('shop:category:list')")
     @OperationLog
     @ApiOperation("分页查询商品分类表")
diff --git a/src/main/java/com/gxwebsoft/shop/controller/GoodsController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsController.java
index ffc1e16..d1d90bf 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/GoodsController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/GoodsController.java
@@ -7,8 +7,14 @@ 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.GoodsPrice;
 import com.gxwebsoft.shop.param.GoodsParam;
+import com.gxwebsoft.shop.param.GoodsPhoneModelParam;
+import com.gxwebsoft.shop.service.GoodsPhoneModelService;
+import com.gxwebsoft.shop.service.GoodsPriceService;
 import com.gxwebsoft.shop.service.GoodsService;
+import com.gxwebsoft.vivo.entity.VivoPhoneModel;
+import com.gxwebsoft.vivo.param.VivoPhoneModelParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -29,17 +35,62 @@ import java.util.List;
 public class GoodsController extends BaseController {
     @Resource
     private GoodsService goodsService;
+    @Resource
+    private GoodsPhoneModelService goodsPhoneModelService;
+    @Resource
+    private GoodsPriceService goodsPriceService;
+
+
+    @PostMapping("/list")
+    public ApiResult<List<Goods>> listForFront(@RequestBody GoodsParam param) {
+        List<Goods> goodsList = goodsService.listRel(param);
+        goodsService.setData(goodsList, getLoginUser());
+        return success(goodsList);
+    }
+
+    @PostMapping("/info")
+    public ApiResult<Goods> info(@RequestBody GoodsParam param) {
+        Goods goods = goodsService.getById(param.getGoodsId());
+        User loginUser = getLoginUser();
+        GoodsPrice goodsPrice = goodsPriceService.getByGoodsIdNCity(goods.getGoodsId(), loginUser.getCityId());
+        goods.setGoodsPrice(goodsPrice);
+        return success(goods);
+    }
+
+    @PostMapping("/info-by-phone-code")
+    public ApiResult<?> infoByPhoneCode(@RequestBody VivoPhoneModelParam phoneModelParam) {
+        List<Goods> goodsList = goodsService.getByPhoneModelCode(phoneModelParam.getCode());
+        User loginUser = getLoginUser();
+        if (goodsList.isEmpty()) return fail("该机型暂无碎屏宝");
+        goodsList.forEach(goods -> {
+            GoodsPrice goodsPrice = goodsPriceService.getByGoodsIdNCity(goods.getGoodsId(), loginUser.getCityId());
+            goods.setGoodsPrice(goodsPrice);
+        });
+        return success(goodsList);
+    }
+
+    @PostMapping("/info-by-phone-model")
+    public ApiResult<?> infoByPhoneModel(@RequestBody VivoPhoneModelParam phoneModelParam) {
+        List<Goods> goodsList = goodsService.getByPhoneModel(phoneModelParam.getName());
+        User loginUser = getLoginUser();
+        if (goodsList == null) return fail("该机型暂无碎屏宝");
+        goodsList.forEach(goods -> {
+            GoodsPrice goodsPrice = goodsPriceService.getByGoodsIdNCity(goods.getGoodsId(), loginUser.getCityId());
+            goods.setGoodsPrice(goodsPrice);
+        });
+        return success(goodsList);
+    }
+
 
     @PreAuthorize("hasAuthority('shop:goods:list')")
     @OperationLog
     @ApiOperation("分页查询商品记录表")
     @GetMapping("/page")
     public ApiResult<PageResult<Goods>> page(GoodsParam param) {
-//        PageParam<Goods, GoodsParam> page = new PageParam<>(param);
-//        page.setDefaultOrder("create_time desc");
-//        return success(goodsService.page(page, page.getWrapper()));
         // 使用关联查询
-        return success(goodsService.pageRel(param));
+        PageResult<Goods> page = goodsService.pageRel(param);
+        goodsService.setData(page.getList(), getLoginUser());
+        return success(page);
     }
 
     @PreAuthorize("hasAuthority('shop:goods:list')")
@@ -51,7 +102,9 @@ public class GoodsController extends BaseController {
 //        page.setDefaultOrder("create_time desc");
 //        return success(goodsService.list(page.getOrderWrapper()));
         // 使用关联查询
-        return success(goodsService.listRel(param));
+        List<Goods> goodsList = goodsService.listRel(param);
+        goodsService.setData(goodsList, getLoginUser());
+        return success(goodsList);
     }
 
     @PreAuthorize("hasAuthority('shop:goods:list')")
@@ -72,9 +125,12 @@ public class GoodsController extends BaseController {
         // 记录当前登录用户id、租户id
         User loginUser = getLoginUser();
         if (loginUser != null) {
-          goods.setUserId(loginUser.getUserId());
+            goods.setUserId(loginUser.getUserId());
         }
         if (goodsService.save(goods)) {
+            if (goods.getGoodsPhoneModelList() != null) {
+                addPhoneModel(goods);
+            }
             return success("添加成功");
         }
         return fail("添加失败");
@@ -86,11 +142,22 @@ public class GoodsController extends BaseController {
     @PutMapping()
     public ApiResult<?> update(@RequestBody Goods goods) {
         if (goodsService.updateById(goods)) {
+            addPhoneModel(goods);
             return success("修改成功");
         }
         return fail("修改失败");
     }
 
+    private void addPhoneModel(Goods goods) {
+        if (goods.getGoodsPhoneModelList() != null) {
+            goodsPhoneModelService.delByGoodsId(goods.getGoodsId());
+            goods.getGoodsPhoneModelList().forEach(goodsPhoneModel -> {
+                goodsPhoneModel.setGoodsId(goods.getGoodsId());
+            });
+            goodsPhoneModelService.saveBatch(goods.getGoodsPhoneModelList());
+        }
+    }
+
     @PreAuthorize("hasAuthority('shop:goods:remove')")
     @OperationLog
     @ApiOperation("删除商品记录表")
diff --git a/src/main/java/com/gxwebsoft/shop/controller/GoodsPhoneModelController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsPhoneModelController.java
new file mode 100644
index 0000000..263be47
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/shop/controller/GoodsPhoneModelController.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.GoodsPhoneModelService;
+import com.gxwebsoft.shop.entity.GoodsPhoneModel;
+import com.gxwebsoft.shop.param.GoodsPhoneModelParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 商品匹配机型控制器
+ *
+ * @author 科技小王子
+ * @since 2024-03-12 01:30:55
+ */
+@Api(tags = "商品匹配机型管理")
+@RestController
+@RequestMapping("/api/shop/goods-phone-model")
+public class GoodsPhoneModelController extends BaseController {
+    @Resource
+    private GoodsPhoneModelService goodsPhoneModelService;
+
+    @PreAuthorize("hasAuthority('shop:goodsPhoneModel:list')")
+    @OperationLog
+    @ApiOperation("分页查询商品匹配机型")
+    @GetMapping("/page")
+    public ApiResult<PageResult<GoodsPhoneModel>> page(GoodsPhoneModelParam param) {
+        PageParam<GoodsPhoneModel, GoodsPhoneModelParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(goodsPhoneModelService.page(page, page.getWrapper()));
+        // 使用关联查询
+        //return success(goodsPhoneModelService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('shop:goodsPhoneModel:list')")
+    @OperationLog
+    @ApiOperation("查询全部商品匹配机型")
+    @GetMapping()
+    public ApiResult<List<GoodsPhoneModel>> list(GoodsPhoneModelParam param) {
+        PageParam<GoodsPhoneModel, GoodsPhoneModelParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(goodsPhoneModelService.list(page.getOrderWrapper()));
+        // 使用关联查询
+        //return success(goodsPhoneModelService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('shop:goodsPhoneModel:list')")
+    @OperationLog
+    @ApiOperation("根据id查询商品匹配机型")
+    @GetMapping("/{id}")
+    public ApiResult<GoodsPhoneModel> get(@PathVariable("id") Integer id) {
+        return success(goodsPhoneModelService.getById(id));
+        // 使用关联查询
+        //return success(goodsPhoneModelService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('shop:goodsPhoneModel:save')")
+    @OperationLog
+    @ApiOperation("添加商品匹配机型")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody GoodsPhoneModel goodsPhoneModel) {
+        if (goodsPhoneModelService.save(goodsPhoneModel)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('shop:goodsPhoneModel:update')")
+    @OperationLog
+    @ApiOperation("修改商品匹配机型")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody GoodsPhoneModel goodsPhoneModel) {
+        if (goodsPhoneModelService.updateById(goodsPhoneModel)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('shop:goodsPhoneModel:remove')")
+    @OperationLog
+    @ApiOperation("删除商品匹配机型")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (goodsPhoneModelService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('shop:goodsPhoneModel:save')")
+    @OperationLog
+    @ApiOperation("批量添加商品匹配机型")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<GoodsPhoneModel> list) {
+        if (goodsPhoneModelService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('shop:goodsPhoneModel:update')")
+    @OperationLog
+    @ApiOperation("批量修改商品匹配机型")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<GoodsPhoneModel> batchParam) {
+        if (batchParam.update(goodsPhoneModelService, "id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('shop:goodsPhoneModel:remove')")
+    @OperationLog
+    @ApiOperation("批量删除商品匹配机型")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (goodsPhoneModelService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/GoodsPriceController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsPriceController.java
new file mode 100644
index 0000000..9d52436
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/shop/controller/GoodsPriceController.java
@@ -0,0 +1,163 @@
+package com.gxwebsoft.shop.controller;
+
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.entity.Area;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.service.AreaService;
+import com.gxwebsoft.shop.service.GoodsPriceService;
+import com.gxwebsoft.shop.entity.GoodsPrice;
+import com.gxwebsoft.shop.param.GoodsPriceParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 商品价格()控制器
+ *
+ * @author 科技小王子
+ * @since 2024-03-12 01:35:40
+ */
+@Api(tags = "商品价格()管理")
+@RestController
+@RequestMapping("/api/shop/goods-price")
+public class GoodsPriceController extends BaseController {
+    @Resource
+    private GoodsPriceService goodsPriceService;
+    @Resource
+    private AreaService areaService;
+
+    @PreAuthorize("hasAuthority('shop:goodsPrice:list')")
+    @OperationLog
+    @ApiOperation("分页查询商品价格()")
+    @GetMapping("/page")
+    public ApiResult<PageResult<GoodsPrice>> page(GoodsPriceParam param) {
+        PageParam<GoodsPrice, GoodsPriceParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(goodsPriceService.page(page, page.getWrapper()));
+        // 使用关联查询
+        //return success(goodsPriceService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('shop:goodsPrice:list')")
+    @OperationLog
+    @ApiOperation("查询全部商品价格()")
+    @GetMapping()
+    public ApiResult<List<GoodsPrice>> list(GoodsPriceParam param) {
+        PageParam<GoodsPrice, GoodsPriceParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(goodsPriceService.list(page.getOrderWrapper()));
+        // 使用关联查询
+        //return success(goodsPriceService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('shop:goodsPrice:list')")
+    @OperationLog
+    @ApiOperation("根据id查询商品价格()")
+    @GetMapping("/info-by-city/{goodsId}/{cityId}")
+    public ApiResult<GoodsPrice> infoByCity(@PathVariable("goodsId") Integer goodsId, @PathVariable("cityId") Integer cityId) {
+        return success(goodsPriceService.getByGoodsIdNCity(goodsId, cityId));
+    }
+
+    @PreAuthorize("hasAuthority('shop:goodsPrice:list')")
+    @OperationLog
+    @ApiOperation("根据id查询商品价格()")
+    @GetMapping("/{id}")
+    public ApiResult<GoodsPrice> get(@PathVariable("id") Integer id) {
+        return success(goodsPriceService.getById(id));
+        // 使用关联查询
+        //return success(goodsPriceService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('shop:goodsPrice:list')")
+    @OperationLog
+    @ApiOperation("根据id查询商品价格()")
+    @GetMapping("/by-goodsId-n-city/{id}")
+    public ApiResult<GoodsPrice> getByGoodsIdNCity(@PathVariable("id") Integer id) {
+        User loginUser = getLoginUser();
+        return success(goodsPriceService.getByGoodsIdNCity(id, loginUser.getCityId()));
+    }
+
+    @PreAuthorize("hasAuthority('shop:goodsPrice:save')")
+    @OperationLog
+    @ApiOperation("添加商品价格()")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody GoodsPrice goodsPrice) {
+        // 记录当前登录用户id
+        User loginUser = getLoginUser();
+        if (loginUser != null) {
+            goodsPrice.setUserId(loginUser.getUserId());
+            Area province = areaService.getParent(goodsPrice.getCity());
+            goodsPrice.setProvince(province.getId());
+            goodsPrice.setProvince(loginUser.getCityId());
+        }
+        if (goodsPriceService.save(goodsPrice)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('shop:goodsPrice:update')")
+    @OperationLog
+    @ApiOperation("修改商品价格()")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody GoodsPrice goodsPrice) {
+        if (goodsPriceService.updateById(goodsPrice)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('shop:goodsPrice:remove')")
+    @OperationLog
+    @ApiOperation("删除商品价格()")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (goodsPriceService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('shop:goodsPrice:save')")
+    @OperationLog
+    @ApiOperation("批量添加商品价格()")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<GoodsPrice> list) {
+        if (goodsPriceService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('shop:goodsPrice:update')")
+    @OperationLog
+    @ApiOperation("批量修改商品价格()")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<GoodsPrice> batchParam) {
+        if (batchParam.update(goodsPriceService, "id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('shop:goodsPrice:remove')")
+    @OperationLog
+    @ApiOperation("批量删除商品价格()")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (goodsPriceService.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
index 6ed18fc..5e700a8 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/OrderController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/OrderController.java
@@ -1,40 +1,57 @@
 package com.gxwebsoft.shop.controller;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.StrUtil;
 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.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gxwebsoft.common.core.annotation.OperationLog;
 import com.gxwebsoft.common.core.web.*;
+import com.gxwebsoft.common.system.entity.Area;
+import com.gxwebsoft.common.system.entity.FileRecord;
 import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.param.UserParam;
+import com.gxwebsoft.common.system.service.FileRecordService;
 import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.entity.UserReferee;
+import com.gxwebsoft.shop.constants.OrderConstants;
+import com.gxwebsoft.shop.entity.*;
 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 com.gxwebsoft.shop.service.*;
+import com.gxwebsoft.shop.service.GoodsService;
+import com.gxwebsoft.vivo.entity.VivoFixStore;
+import com.gxwebsoft.vivo.entity.VivoStore;
+import com.gxwebsoft.vivo.service.VivoFixStoreService;
+import com.gxwebsoft.vivo.service.VivoStoreService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletRequest;
 import java.awt.image.BufferedImage;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.net.URL;
+import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -53,59 +70,231 @@ 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;
+    private GoodsService goodsService;
     @Resource
-    private UserRefereeService userRefereeService;
+    private GoodsPriceService goodsPriceService;
     @Resource
     private UserService userService;
     @Resource
-    private BcAgentService bcAgentService;
+    private VivoStoreService storeService;
+    @Resource
+    private VivoFixStoreService fixStoreService;
+    @Resource
+    private UserBalanceLogService userBalanceLogService;
+    @Resource
+    private OrderRefundService orderRefundService;
+    @Resource
+    private FileRecordService fileRecordService;
+
+    @Autowired
+    private WxPayController wxPayController;
+
+    @Value("${config.upload-path}")
+    private String uploadPath;
+
+    @Value("${config.server-url}")
+    private String requestURL;
+
+    @PostMapping("/new")
+    public ApiResult<?> addOrder(@RequestBody Order order) {
+        User loginUser = getLoginUser();
+        order.setUserId(loginUser.getUserId());
+        order.setOrgId(loginUser.getOrganizationId());
+        order.setOrderNo(makeOrderNumber(""));
+        Goods goods = goodsService.getById(order.getGoodsId());
+        GoodsPrice goodsPrice = goodsPriceService.getByGoodsIdNCity(goods.getGoodsId(), loginUser.getCityId());
+        order.setStoreId(loginUser.getStoreId());
+        order.setCityId(loginUser.getCityId());
+        BigDecimal goodsAmount = goods.getLinePriceMin();
+        BigDecimal commission = BigDecimal.ZERO;
+        if (goodsPrice != null) {
+            if (loginUser.getUserLevel().equals(5) || loginUser.getUserLevel().equals(8)) {
+                goodsAmount = goods.getGoodsPriceMin();
+            }
+            if (loginUser.getUserLevel().equals(3)) {
+                if (goodsPrice.getLevel3commissionMode().equals(1)) {
+                    commission = goodsAmount.multiply(goodsPrice.getLevel3commissionRate()).divide(BigDecimal.valueOf(100), RoundingMode.HALF_UP);
+                } else {
+                    commission = goodsPrice.getLevel3commissionRate();
+                }
+                order.setCommission(commission);
+            } else if (loginUser.getUserLevel().equals(4)) {
+                if (goodsPrice.getLevel4commissionMode().equals(1)) {
+                    commission = goodsAmount.multiply(goodsPrice.getLevel4commissionRate()).divide(BigDecimal.valueOf(100), RoundingMode.HALF_UP);
+                } else {
+                    commission = goodsPrice.getLevel4commissionRate();
+                }
+                order.setCommission(commission);
+            } else if (loginUser.getUserLevel().equals(5) || loginUser.getUserLevel().equals(8)) {
+                commission = goodsAmount.multiply(goodsPrice.getLevel5commissionRate()).divide(BigDecimal.valueOf(100), RoundingMode.HALF_UP);
+                order.setCommission(commission);
+            } else if (loginUser.getUserLevel().equals(6)) {
+                if (goodsPrice.getLevel6commissionMode().equals(1)) {
+                    commission = goodsAmount.multiply(goodsPrice.getLevel6commissionRate()).divide(BigDecimal.valueOf(100), RoundingMode.HALF_UP);
+                } else {
+                    commission = goodsPrice.getLevel6commissionRate();
+                }
+                order.setCommission(commission);
+            } else if (loginUser.getUserLevel().equals(7)) {
+                if (goodsPrice.getLevel7commissionMode().equals(1)) {
+                    commission = goodsAmount.multiply(goodsPrice.getLevel7commissionRate()).divide(BigDecimal.valueOf(100), RoundingMode.HALF_UP);
+                } else {
+                    commission = goodsPrice.getLevel7commissionRate();
+                }
+                order.setCommission(commission);
+            }
+//            else if (loginUser.getUserLevel().equals(8)) {
+//                commission = goodsAmount.multiply(goodsPrice.getLevel8commissionRate()).divide(BigDecimal.valueOf(100), RoundingMode.HALF_UP);
+//                order.setCommission(commission);
+//            }
+//            if (loginUser.getUserLevel().equals(5) || loginUser.getUserLevel().equals(8)) {
+//                if (loginUser.getFixStoreId() != null) {
+//                    BigDecimal fixStoreLeaderCommission = order.getCommission()
+//                            .multiply(goodsPrice.getFixStoreLeaderCommissionRate())
+//                            .divide(BigDecimal.valueOf(100), RoundingMode.HALF_UP);
+//                    order.setFixStoreLeaderCommission(fixStoreLeaderCommission);
+//                }
+//            }
+            if (loginUser.getUserLevel().equals(5) || loginUser.getUserLevel().equals(8)) {
+                order.setAgentCommission(BigDecimal.ZERO);
+            } else {
+                order.setAgentCommission(goodsAmount.subtract(goods.getCost()).subtract(commission));
+            }
+        }
+        order.setTotalPrice(goodsAmount);
+        if (loginUser.getUserLevel().equals(5) || loginUser.getUserLevel().equals(8)) {
+            if (loginUser.getFixStoreId() != null) {
+                order.setFixStoreId(loginUser.getFixStoreId());
+            }
+        }
+        if (orderService.save(order)) {
+            OrderGoods orderGoods = order.getOrderGoods();
+            orderGoods.setOrderId(order.getOrderId());
+            orderGoods.setUserId(getLoginUserId());
+            orderGoodsService.save(orderGoods);
+            return success("下单成功", order.getOrderId());
+        }
+        return fail("下单失败");
+    }
+
+    @PostMapping("/update-info")
+    public ApiResult<?> updateInfo(@RequestBody Order order) {
+        return success(orderService.updateById(order));
+    }
+
+    @PostMapping("/make-pay-qr")
+    public ApiResult<?> makePayQr(@RequestBody Order order) {
+        Order order1 = orderService.getById(order.getOrderId());
+        Goods goods = goodsService.getById(order1.getGoodsId());
+        return success(wxPayController.nativePay(order1.getOrderNo(),
+                order1.getTotalPrice().multiply(BigDecimal.valueOf(100)).intValue(), goods.getGoodsName()));
+    }
+
+    @PostMapping("/set-pay-voucher")
+    public ApiResult<?> setPayVoucher(@RequestBody Order order) {
+        order.setOrderStatus(OrderConstants.ORDER_STATUS_PAID);
+        Order order1 = orderService.getById(order.getOrderId());
+        order.setReceiptAmount(order1.getTotalAmount());
+        if (orderService.updateById(order)) {
+            orderService.updateIncome(order1);
+            return success("更新成功");
+        }
+        return fail("更新失败");
+    }
+
+    @PostMapping("/set-refund")
+    public ApiResult<?> setRefund(@RequestBody Order order) {
+        order.setOrderStatus(OrderConstants.ORDER_STATUS_REFUNDING);
+        if (orderService.updateById(order)) {
+            Order order1 = orderService.getById(order.getOrderId());
+            OrderRefund orderRefund = new OrderRefund();
+            orderRefund.setOrderId(order1.getOrderId());
+            orderRefund.setOrderGoodsId(order1.getGoodsId());
+            orderRefund.setRefundMoney(order1.getReceiptAmount());
+            orderRefund.setTenantId(10049);
+            orderRefundService.save(orderRefund);
+            return success("申请成功,请等待审核");
+        }
+        return fail("更新失败");
+    }
+
+
+    @PostMapping("/do-refund")
+    public ApiResult<?> doRefund(@RequestBody Order order) {
+        if (orderService.updateById(order)) {
+            refund(order);
+            return success("退款成功");
+        }
+        return fail("退款失败");
+    }
+
+    @PostMapping("/list")
+    public ApiResult<?> listForFront(@RequestBody OrderParam param) {
+        User loginUser = getLoginUser();
+        if (loginUser.getUserLevel() < 3) {
+            if (loginUser.getUserLevel().equals(1)) {
+                param.setCityId(loginUser.getCityId());
+                param.setFixStoreId(0);
+            }
+        } else {
+            if (loginUser.getUserLevel().equals(8)) {
+                VivoFixStore fixStore = fixStoreService.getByUserId(loginUser.getUserId());
+                if (fixStore != null) {
+                    param.setFixStoreId(fixStore.getId());
+                }
+            } else {
+                param.setUserId(getLoginUserId());
+            }
+        }
+        List<Order> list = orderService.listRel(param);
+        list.forEach(order -> {
+            if (order.getStoreId() != null) order.setStore(storeService.getById(order.getStoreId()));
+            if (order.getFixStoreId() != null) order.setFixStore(fixStoreService.getById(order.getFixStoreId()));
+            Goods goods = goodsService.getById(order.getGoodsId());
+            goods.setGoodsPrice(goodsPriceService.getByGoodsIdNCity(goods.getGoodsId(), loginUser.getCityId()));
+            order.setGoods(goods);
+            order.setUser(userService.getById(order.getUserId()));
+        });
+        return success(list);
+    }
+
+    @PostMapping("/info")
+    public ApiResult<Order> info(@RequestBody OrderParam param) {
+        Order order = orderService.getByIdRel(param.getOrderId());
+        if (order != null) {
+            if (order.getStoreId() != null) order.setStore(storeService.getById(order.getStoreId()));
+            if (order.getFixStoreId() != null) order.setFixStore(fixStoreService.getById(order.getFixStore()));
+        }
+        return success(order);
+    }
+
+    @PostMapping("/set-done")
+    public ApiResult<Order> setDone(@RequestBody Order order) {
+        order.setUseTime(DateUtil.date());
+        orderService.updateById(order);
+        return success(order);
+    }
 
     @PreAuthorize("hasAuthority('shop:order:list')")
     @OperationLog
     @ApiOperation("分页查询订单记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Order>> page(OrderParam param) {
-        // 搜索条件
-        if (getMerchantCode() != null) {
-          param.setMerchantCode(getMerchantCode());
+    @PostMapping("/page")
+    public ApiResult<PageResult<Order>> page(@RequestBody OrderParam param) {
+        User loginUser = getLoginUser();
+        if (loginUser.getUserLevel().equals(1)) {
+            param.setCityId(loginUser.getCityId());
         }
-        // 云芯威项目查询关联设备
-        if(getTenantId().equals(6)){
-          // 查询订单的关联商品
-          List<Order> 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<EquipmentOrderGoods>().eq(EquipmentOrderGoods::getOrderId,order.getOrderId())));
-            order.setEquipment(equipmentService.getById(order.getEquipmentId()));
-          }
-          PageParam<Order, OrderParam> page = new PageParam<>(param);
-          return success(new PageResult<>(list, page.getTotal()));
-        }
-        // 贵港自然资源报餐
-        if(getTenantId().equals(10048) && getAppId() != null){
-          final BcAgentParam bcAgentParam = new BcAgentParam();
-          bcAgentParam.setParentId(getLoginUserId());
-          bcAgentParam.setLimit(100L);
-          final PageResult<BcAgent> result = bcAgentService.pageRel(bcAgentParam);
-          final Set<Integer> collect = result.getList().stream().map(BcAgent::getUserId).collect(Collectors.toSet());
-          collect.add(getLoginUserId());
-          param.setUserId(null);
-          param.setUserIds(collect);
-          return success(orderService.pageRel(param));
-        }
-
-        // 使用关联查询
-        return success(orderService.pageRel(param));
+        Page<Order> list = orderService.getByPage(param);
+        list.getRecords().forEach(order -> {
+            if (order.getStoreId() != null) order.setStore(storeService.getById(order.getStoreId()));
+            if (order.getFixStoreId() != null) order.setFixStore(fixStoreService.getById(order.getFixStore()));
+            Goods goods = goodsService.getById(order.getGoodsId());
+            order.setGoods(goods);
+            order.setUser(userService.getById(order.getUserId()));
+        });
+        return success(list);
     }
 
     @PreAuthorize("hasAuthority('shop:order:list')")
@@ -113,8 +302,12 @@ public class OrderController extends BaseController {
     @ApiOperation("查询全部订单记录表")
     @GetMapping()
     public ApiResult<List<Order>> list(OrderParam param) {
+        User loginUser = getLoginUser();
+        if (loginUser.getUserLevel().equals(1)) {
+            param.setCityId(loginUser.getCityId());
+        }
         // 使用关联查询
-      return success(orderService.listRel(param));
+        return success(orderService.listRel(param));
     }
 
     @PreAuthorize("hasAuthority('shop:order:list')")
@@ -122,21 +315,21 @@ public class OrderController extends BaseController {
     @ApiOperation("按订单集查询")
     @PostMapping("/listByIds")
     public ApiResult<List<Order>> listByIds(@RequestBody List<Integer> orderIds) {
-      System.out.println("按订单集查询 = " + orderIds);
-      Integer userId = getLoginUserId();
-      // 代报餐情况(未完成)
-      final Order order = orderService.getById(orderIds.get(0));
-      if (!order.getUserId().equals(getLoginUserId())) {
-        userId = order.getUserId();
-        final List<Order> list1 = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getOrderId,orderIds).eq(Order::getUserId, userId).eq(Order::getPayStatus,PAY_STATUS_NO_PAY));
-        final Set<Integer> collect = list1.stream().map(Order::getOrderId).collect(Collectors.toSet());
-        return success(orderService.listByIds(collect));
-      }
+        System.out.println("按订单集查询 = " + orderIds);
+        Integer userId = getLoginUserId();
+        // 代报餐情况(未完成)
+        final Order order = orderService.getById(orderIds.get(0));
+        if (!order.getUserId().equals(getLoginUserId())) {
+            userId = order.getUserId();
+            final List<Order> list1 = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getOrderId, orderIds).eq(Order::getUserId, userId).eq(Order::getPayStatus, PAY_STATUS_NO_PAY));
+            final Set<Integer> collect = list1.stream().map(Order::getOrderId).collect(Collectors.toSet());
+            return success(orderService.listByIds(collect));
+        }
 
-      final List<Order> list1 = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getUserId, getLoginUserId()).eq(Order::getPayStatus,PAY_STATUS_NO_PAY));
-      final List<Integer> collect = list1.stream().map(Order::getOrderId).collect(Collectors.toList());
-      // 使用关联查询
-      return success(orderService.listByIds(collect));
+        final List<Order> list1 = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getUserId, getLoginUserId()).eq(Order::getPayStatus, PAY_STATUS_NO_PAY));
+        final List<Integer> collect = list1.stream().map(Order::getOrderId).collect(Collectors.toList());
+        // 使用关联查询
+        return success(orderService.listByIds(collect));
     }
 
     @PreAuthorize("hasAuthority('shop:order:list')")
@@ -144,14 +337,10 @@ public class OrderController extends BaseController {
     @ApiOperation("根据id查询订单记录表")
     @GetMapping("/{id}")
     public ApiResult<Order> 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<EquipmentOrderGoods>().eq(EquipmentOrderGoods::getOrderId,order.getOrderId())));
-        order.setEquipment(equipmentService.getById(order.getEquipmentId()));
-      }
-      return success(order);
+        // 使用关联查询
+        Order order = orderService.getByIdRel(id);
+
+        return success(order);
     }
 
     @PreAuthorize("hasAuthority('shop:order:save')")
@@ -162,58 +351,14 @@ public class OrderController extends BaseController {
         // 记录当前登录用户id、租户id
         User loginUser = getLoginUser();
         if (loginUser != null) {
-          order.setUserId(loginUser.getUserId());
+            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);
+            // 是否存入星期值
+            if (order.getDeliveryTime() != null) {
+                order.setWeek(DateUtil.dayOfWeek(order.getDeliveryTime()) - 1);
             }
-          }
-          // 是否存入星期值
-          if(order.getDeliveryTime() != null){
-            order.setWeek(DateUtil.dayOfWeek(order.getDeliveryTime()) - 1);
-          }
-          return success("添加成功",order);
+            return success("添加成功", order);
         }
         return fail("添加失败");
     }
@@ -224,11 +369,91 @@ public class OrderController extends BaseController {
     @PutMapping()
     public ApiResult<?> update(@RequestBody Order order) {
         if (orderService.updateById(order)) {
+            refund(order);
             return success("修改成功");
         }
         return fail("修改失败");
     }
 
+    private void refund(Order order) {
+        if (order.getOrderStatus().equals(OrderConstants.ORDER_STATUS_REFUND_SUCCESS)) {
+            OrderRefund orderRefund = orderRefundService.getByOrderId(order.getOrderId());
+            orderRefund.setAuditStatus(10);
+
+            Order order1 = orderService.getById(order.getOrderId());
+            User user = userService.getById(order1.getUserId());
+            user.setBalance(user.getBalance().subtract(order1.getCommission()));
+            user.setTotalIncome(user.getTotalIncome().subtract(order1.getCommission()));
+            userService.updateById(user);
+            userBalanceLogService.save(
+                    new UserBalanceLog() {{
+                        setOrderId(order1.getOrderId());
+                        setUserId(user.getUserId());
+                        setScene(1);
+                        setMoney(order1.getCommission());
+                        setBalance(user.getBalance());
+                        setTenantId(10049);
+                        setCreateTime(DateUtil.date());
+                        setRemark("订单:" + order1.getOrderNo() + "退款,收回返利");
+                    }}
+            );
+
+            // 售后门店
+//            if (order1.getFixStoreId() != null
+//                    && order1.getFixStoreLeaderCommission() != null
+//                    && order1.getFixStoreLeaderCommission().compareTo(BigDecimal.ZERO) > 0) {
+//                VivoFixStore vivoFixStore = fixStoreService.getById(order1.getFixStoreId());
+//                User fixStoreLeader = userService.getById(vivoFixStore.getUserId());
+//                fixStoreLeader.setBalance(fixStoreLeader.getBalance().subtract(order1.getFixStoreLeaderCommission()));
+//                fixStoreLeader.setTotalIncome(fixStoreLeader.getTotalIncome().subtract(order1.getFixStoreLeaderCommission()));
+//                userService.updateById(fixStoreLeader);
+//                userBalanceLogService.save(
+//                        new UserBalanceLog() {{
+//                            setOrderId(order1.getOrderId());
+//                            setUserId(fixStoreLeader.getUserId());
+//                            setScene(1);
+//                            setMoney(order1.getFixStoreLeaderCommission());
+//                            setBalance(fixStoreLeader.getBalance());
+//                            setTenantId(10049);
+//                            setCreateTime(DateUtil.date());
+//                            setRemark("订单:" + order1.getOrderNo() + "退款,收回店长门店返利");
+//                        }}
+//                );
+//            }
+
+            User cityAgent = userService.getCityAgent(order1.getCityId());
+            if (cityAgent != null && order1.getAgentCommission() != null && order1.getAgentCommission().compareTo(BigDecimal.ZERO) > 0) {
+                cityAgent.setBalance(cityAgent.getBalance().subtract(order1.getAgentCommission()));
+                cityAgent.setTotalIncome(cityAgent.getTotalIncome().subtract(order1.getAgentCommission()));
+                userService.updateById(cityAgent);
+                userBalanceLogService.save(
+                        new UserBalanceLog() {{
+                            setOrderId(order1.getOrderId());
+                            setUserId(cityAgent.getUserId());
+                            setScene(1);
+                            setMoney(order1.getAgentCommission());
+                            setBalance(cityAgent.getBalance());
+                            setTenantId(10049);
+                            setCreateTime(DateUtil.date());
+                            setRemark("订单:" + order1.getOrderNo() + "退款,收回区域返利");
+                        }}
+                );
+            }
+
+            if (order1.getPayMethod().equals(OrderConstants.ORDER_PAY_METHOD_WECHAT.toString())) {
+                orderRefund.setOrder(orderService.getById(order1.getOrderId()));
+                wxPayController.refund(orderRefund);
+            } else {
+                orderRefund.setRefundStatus(1);
+            }
+            orderRefundService.updateById(orderRefund);
+        } else if (order.getOrderStatus().equals(OrderConstants.ORDER_STATUS_REFUND_FAIL)) {
+            OrderRefund orderRefund = orderRefundService.getByOrderId(order.getOrderId());
+            orderRefund.setAuditStatus(20);
+            orderRefundService.updateById(orderRefund);
+        }
+    }
+
     @PreAuthorize("hasAuthority('shop:order:remove')")
     @OperationLog
     @ApiOperation("删除订单记录表")
@@ -275,46 +500,116 @@ public class OrderController extends BaseController {
 
     @ApiOperation("支付成功")
     @PostMapping("/setPayStatus")
-    public ApiResult<?> setPayStatus(@RequestBody Order order){
-      if (orderService.updateById(order)) {
-        return success("设置成功");
-      }
-      return fail("设置失败");
+    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<Order> 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);
+    @ApiOperation("导出")
+    @PostMapping("/export")
+    public ApiResult<?> export(@RequestBody OrderParam param, HttpServletRequest request) throws IOException {
+        User loginUser = getLoginUser();
+        if (loginUser.getUserLevel().equals(1)) {
+            param.setCityId(loginUser.getCityId());
+        }
+        String filename = "file/excel/订单表" + new Date().getTime() + ".xls";
+        String path = uploadPath + filename;
+        HSSFWorkbook workbook = new HSSFWorkbook();
+        //创建工作表单
+        HSSFSheet sheet = workbook.createSheet();
+        List<Order> orderList = orderService.listRel(param);
+        HSSFRow row = sheet.createRow(0);
+        row.createCell(0).setCellValue("订单号");
+        row.createCell(1).setCellValue("下单人手机号");
+        row.createCell(2).setCellValue("购买的产品");
+        row.createCell(3).setCellValue("IMEI");
+        row.createCell(4).setCellValue("型号");
+        row.createCell(5).setCellValue("系列");
+        row.createCell(6).setCellValue("上报人工号");
+        row.createCell(7).setCellValue("上报人姓名");
+        row.createCell(8).setCellValue("激活状态");
+        row.createCell(9).setCellValue("激活时间");
+        row.createCell(10).setCellValue("门店");
+        row.createCell(11).setCellValue("二级区域名称");
+        row.createCell(12).setCellValue("零售商名称");
+        row.createCell(13).setCellValue("好/坏机");
+        row.createCell(14).setCellValue("下单人信息");
+        row.createCell(15).setCellValue("下单门店信息");
+        row.createCell(16).setCellValue("有效期开始时间");
+        row.createCell(17).setCellValue("有效期结束时间");
+        row.createCell(18).setCellValue("订单金额");
+        row.createCell(19).setCellValue("成本价");
+        row.createCell(20).setCellValue("下单人佣金");
+        row.createCell(21).setCellValue("区域代理佣金");
+        row.createCell(22).setCellValue("订单状态");
+        row.createCell(23).setCellValue("下单时间");
+        int rowNum = 1;
+        for (Order order : orderList) {
+            //订单状态(0已取消1待支付2已支付3已结束4退款审核中5退款成功6退款失败)
+            String orderStatus = "";
+            HSSFRow orderRow = sheet.createRow(rowNum);
+            Goods goods = goodsService.getById(order.getGoodsId());
+            String storeName = "";
+            if (order.getStoreId() != null) {
+                VivoStore store = storeService.getById(order.getStoreId());
+                if (store != null) storeName = store.getName();
+            }
+            if (order.getFixStoreId() != null) {
+                VivoFixStore store = fixStoreService.getById(order.getFixStoreId());
+                if (store != null) storeName = store.getName();
+            }
+            User user = userService.getById(order.getUserId());
+            orderRow.createCell(0).setCellValue(order.getOrderNo());
+            orderRow.createCell(1).setCellValue(user.getPhone());
+            orderRow.createCell(2).setCellValue(goods.getGoodsName());
+            orderRow.createCell(3).setCellValue(order.getImei());
+            orderRow.createCell(4).setCellValue(order.getSkuName());
+            orderRow.createCell(5).setCellValue(order.getModelName());
+            orderRow.createCell(6).setCellValue(order.getSellerCode());
+            orderRow.createCell(7).setCellValue(order.getSellerName());
+            orderRow.createCell(8).setCellValue(order.getActiveState());
+            orderRow.createCell(9).setCellValue(order.getActiveDate());
+            orderRow.createCell(10).setCellValue(order.getStoreName());
+            orderRow.createCell(11).setCellValue(order.getSecondAreaName());
+            orderRow.createCell(12).setCellValue(order.getRetailerName());
+            orderRow.createCell(13).setCellValue(!order.getGoodOrBad().equals("undefined") ? order.getGoodOrBad() : "");
+            orderRow.createCell(14).setCellValue(user.getRealName());
+            orderRow.createCell(15).setCellValue(storeName);
+            orderRow.createCell(16).setCellValue(DateUtil.formatDateTime(order.getStartTime()) + " ");
+            orderRow.createCell(17).setCellValue(DateUtil.formatDateTime(order.getExpirationTime()) + " ");
+            orderRow.createCell(18).setCellValue(order.getTotalPrice().toString());
+            orderRow.createCell(19).setCellValue(goods.getCost().toString());
+            orderRow.createCell(20).setCellValue(order.getCommission() != null ? order.getCommission().toString() : "0");
+            orderRow.createCell(21).setCellValue(order.getAgentCommission() != null ? order.getAgentCommission().toString() : "0");
+            orderRow.createCell(22).setCellValue(OrderConstants.ORDER_STATUS_MAP.get(order.getOrderStatus()));
+            orderRow.createCell(23).setCellValue(DateUtil.formatDateTime(order.getCreateTime()) + " ");
+            rowNum++;
+        }
+        FileOutputStream output = new FileOutputStream(path);
+        workbook.write(output);
+        output.flush();
+
+        FileRecord result = new FileRecord();
+        result.setCreateUserId(getLoginUserId());
+        result.setName(filename);
+        result.setPath(path);
+        result.setUrl(requestURL + "/" + filename);
+//        result.setMerchantCode(getMerchantCode());
+        fileRecordService.save(result);
+        return success(result);
+    }
+
+    @Scheduled(fixedDelay = 5000)
+    protected void task() {
+        // 1小时未支付的单
+        orderService.update(
+                new UpdateWrapper<Order>().eq("order_status", 1)
+                        .lt("create_time", DateUtil.offsetHour(new Date(), -1))
+                        .set("order_status", 0)
+        );
     }
 }
diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderGoodsController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderGoodsController.java
index 890f75d..ca66558 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/OrderGoodsController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/OrderGoodsController.java
@@ -67,7 +67,7 @@ public class OrderGoodsController extends BaseController {
         User loginUser = getLoginUser();
         if (loginUser != null) {
           orderGoods.setUserId(loginUser.getUserId());
-          orderGoods.setMerchantCode(getMerchantCode());
+//          orderGoods.setMerchantCode(getMerchantCode());
         }
         if (orderGoodsService.save(orderGoods)) {
             return success("添加成功");
diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java
index fc66a55..c33a2e6 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java
@@ -1,7 +1,5 @@
 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;
@@ -38,8 +36,6 @@ public class OrderRefundController extends BaseController {
     private OrderRefundService orderRefundService;
     @Resource
     private OrderService orderService;
-    @Resource
-    private EquipmentService equipmentService;
 
     @PreAuthorize("hasAuthority('shop:orderRefund:list')")
     @OperationLog
@@ -90,15 +86,6 @@ public class OrderRefundController extends BaseController {
     @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("退租失败");
diff --git a/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java b/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java
index 8721f97..6f1a6fd 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java
@@ -2,24 +2,10 @@ 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;
@@ -44,7 +30,6 @@ 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.*;
@@ -72,13 +57,9 @@ public class PaymentController extends BaseController {
   @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("分页查询商城支付方式记录表")
@@ -179,157 +160,11 @@ public class PaymentController extends BaseController {
     return fail("删除失败");
   }
 
-  @ApiOperation("支付宝手机号码")
-  @PostMapping("/getPhoneNumber")
-  public ApiResult<?> getPhoneNumber(@RequestBody Map<String, String> 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<String, String> 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 {
+  public ApiResult<?> balance(@PathVariable("id") Integer id){
     // 1. 验证签名
     isCheckSign();
     // 订单数据
@@ -385,15 +220,7 @@ public class PaymentController extends BaseController {
       order.setExpirationTime(nextMonthTime);
       orderService.updateById(order);
     }
-    // 6. 是否是临时报餐
-    final BcTemporaryParam bcTemporaryParam = new BcTemporaryParam();
-    bcTemporaryParam.setUserId(getLoginUserId());
-    bcTemporaryParam.setApplyStatus(1);
-    final List<BcTemporary> bcTemporaries = bcTemporaryService.listRel(bcTemporaryParam);
-    bcTemporaries.forEach(b -> {
-      b.setStatus(1);
-      bcTemporaryService.updateById(b);
-    });
+
     return success("支付成功",user);
   }
 
@@ -401,7 +228,7 @@ public class PaymentController extends BaseController {
   @ApiModelProperty("余额支付批量")
   @PostMapping("/balanceBatch")
   @Transactional(rollbackFor = {Exception.class})
-  public ApiResult<?> balanceBatch(@RequestBody List<Integer> orderIds) throws AlipayApiException {
+  public ApiResult<?> balanceBatch(@RequestBody List<Integer> orderIds) {
     // 1. 验证签名
     isCheckSign();
     // 订单数据
@@ -461,79 +288,8 @@ public class PaymentController extends BaseController {
         d.setExpirationTime(nextMonthTime);
         orderService.updateById(d);
       }
-      // 6. 是否是临时报餐
-      final BcTemporaryParam bcTemporaryParam = new BcTemporaryParam();
-      bcTemporaryParam.setUserId(getLoginUserId());
-      bcTemporaryParam.setApplyStatus(1);
-      final List<BcTemporary> 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/SchedulingController.java b/src/main/java/com/gxwebsoft/shop/controller/SchedulingController.java
index dbdd166..877378d 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/SchedulingController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/SchedulingController.java
@@ -1,39 +1,11 @@
 package com.gxwebsoft.shop.controller;
 
-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.alipay.api.internal.util.AlipayEncrypt;
-import com.alipay.api.internal.util.AlipaySignature;
-import com.alipay.api.request.AlipayTradeCreateRequest;
-import com.alipay.api.response.AlipayTradeCreateResponse;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.config.ConfigProperties;
 import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.service.OperationRecordService;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.entity.Payment;
-import com.gxwebsoft.shop.param.PaymentParam;
 import com.gxwebsoft.shop.service.OrderService;
-import com.gxwebsoft.shop.service.PaymentService;
-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.scheduling.annotation.Scheduled;
-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;
-import java.util.Map;
 
 /**
  * 定时任务
@@ -48,16 +20,4 @@ public class SchedulingController extends BaseController {
   @Resource
   private OrderService orderService;
 
-//  /**
-//   * 删除失效订单
-//   */
-//  @Scheduled(cron="0 0 */1 * * ?")
-//  public void reportCurrentTime() {
-//    System.out.println("定时任务开始 = " + new Date());
-//    boolean remove = orderService.remove(new LambdaQueryWrapper<Order>()
-//      .lt(Order::getExpirationTime, new Date())
-//      .eq(Order::getPayStatus, 10)
-//      .eq(Order::getOrderStatus, 10));
-//    System.out.println("remove = " + remove);
-//  }
 }
diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserBalanceLogController.java b/src/main/java/com/gxwebsoft/shop/controller/UserBalanceLogController.java
index d828832..7ba193c 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/UserBalanceLogController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/UserBalanceLogController.java
@@ -1,7 +1,18 @@
 package com.gxwebsoft.shop.controller;
 
+import cn.hutool.core.date.DateUtil;
 import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.entity.FileRecord;
 import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.service.FileRecordService;
+import com.gxwebsoft.common.system.service.UserService;
+import com.gxwebsoft.shop.constants.OrderConstants;
+import com.gxwebsoft.shop.entity.Goods;
+import com.gxwebsoft.shop.entity.Order;
+import com.gxwebsoft.shop.param.OrderParam;
+import com.gxwebsoft.shop.service.GoodsPriceService;
+import com.gxwebsoft.shop.service.GoodsService;
+import com.gxwebsoft.shop.service.OrderService;
 import com.gxwebsoft.shop.service.UserBalanceLogService;
 import com.gxwebsoft.shop.entity.UserBalanceLog;
 import com.gxwebsoft.shop.param.UserBalanceLogParam;
@@ -10,12 +21,24 @@ 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.vivo.entity.VivoFixStore;
+import com.gxwebsoft.vivo.entity.VivoStore;
+import com.gxwebsoft.vivo.service.VivoFixStoreService;
+import com.gxwebsoft.vivo.service.VivoStoreService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.springframework.beans.factory.annotation.Value;
 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.FileOutputStream;
+import java.io.IOException;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -30,14 +53,62 @@ import java.util.List;
 public class UserBalanceLogController extends BaseController {
     @Resource
     private UserBalanceLogService userBalanceLogService;
+    @Resource
+    private OrderService orderService;
+    @Resource
+    private VivoFixStoreService fixStoreService;
+    @Resource
+    private VivoStoreService storeService;
+    @Resource
+    private GoodsService goodsService;
+    @Resource
+    private GoodsPriceService goodsPriceService;
+    @Resource
+    private UserService userService;
+    @Resource
+    private FileRecordService fileRecordService;
+
+    @Value("${config.upload-path}")
+    private String uploadPath;
+
+    @Value("${config.server-url}")
+    private String requestURL;
+
+    @PostMapping("/list")
+    public ApiResult<List<UserBalanceLog>> listForFront(@RequestBody UserBalanceLogParam param) {
+        // 使用关联查询
+        User loginUser = getLoginUser();
+        param.setUserId(getLoginUserId());
+        List<UserBalanceLog> userBalanceLogList = userBalanceLogService.listRel(param);
+        userBalanceLogList.forEach(userBalanceLog -> {
+            Order order = orderService.getByIdRel(userBalanceLog.getOrderId());
+            if (order.getStoreId() != null && order.getStoreId() != 0) {
+                VivoStore store = storeService.getById(order.getStoreId());
+                if (store != null) order.setStore(store);
+            }
+            if (order.getFixStoreId() != null && order.getFixStoreId() != 0) {
+                VivoFixStore fixStore = fixStoreService.getById(order.getFixStoreId());
+                if (fixStore != null) order.setFixStore(fixStore);
+            }
+            Goods goods = goodsService.getById(order.getGoodsId());
+            goods.setGoodsPrice(goodsPriceService.getByGoodsIdNCity(goods.getGoodsId(), loginUser.getCityId()));
+            order.setGoods(goods);
+            userBalanceLog.setOrder(order);
+        });
+        return success(userBalanceLogList);
+    }
 
     @PreAuthorize("hasAuthority('shop:userBalanceLog:list')")
     @OperationLog
     @ApiOperation("分页查询用户余额变动明细表")
     @GetMapping("/page")
     public ApiResult<PageResult<UserBalanceLog>> page(UserBalanceLogParam param) {
+        PageResult<UserBalanceLog> list = userBalanceLogService.pageRel(param);
+        list.getList().forEach(userBalanceLog -> {
+            userBalanceLog.setUser(userService.getByIdRel(userBalanceLog.getUserId()));
+        });
         // 使用关联查询
-        return success(userBalanceLogService.pageRel(param));
+        return success(list);
     }
 
     @PreAuthorize("hasAuthority('shop:userBalanceLog:list')")
@@ -70,8 +141,8 @@ public class UserBalanceLogController extends BaseController {
         // 记录当前登录用户id、租户id、商户编号
         User loginUser = getLoginUser();
         if (loginUser != null) {
-          userBalanceLog.setUserId(loginUser.getUserId());
-          userBalanceLog.setMerchantCode(getMerchantCode());
+            userBalanceLog.setUserId(loginUser.getUserId());
+//            userBalanceLog.setMerchantCode(getMerchantCode());
         }
         if (userBalanceLogService.save(userBalanceLog)) {
             return success("添加成功");
@@ -134,4 +205,53 @@ public class UserBalanceLogController extends BaseController {
         return fail("删除失败");
     }
 
+    @PreAuthorize("hasAuthority('shop:userBalanceLog:list')")
+    @OperationLog
+    @ApiOperation("导出")
+    @PostMapping("/export")
+    public ApiResult<?> export(@RequestBody UserBalanceLogParam param, HttpServletRequest request) throws IOException {
+        User loginUser = getLoginUser();
+        String filename = "file/excel/佣金表" + new Date().getTime() + ".xls";
+        String path = uploadPath + filename;
+        HSSFWorkbook workbook = new HSSFWorkbook();
+        //创建工作表单
+        HSSFSheet sheet = workbook.createSheet();
+        List<UserBalanceLog> list = userBalanceLogService.listRel(param);
+        HSSFRow row = sheet.createRow(0);
+        row.createCell(0).setCellValue("订单号");
+        row.createCell(1).setCellValue("手机号");
+        row.createCell(2).setCellValue("姓名");
+        row.createCell(3).setCellValue("订单金额");
+        row.createCell(4).setCellValue("收/支");
+        row.createCell(5).setCellValue("佣金");
+        row.createCell(6).setCellValue("下单时间");
+        int rowNum = 1;
+        for (UserBalanceLog log : list) {
+            HSSFRow orderRow = sheet.createRow(rowNum);
+            Order order = orderService.getById(log.getOrderId());
+            User user = userService.getById(order.getUserId());
+            orderRow.createCell(0).setCellValue(order.getOrderNo());
+            orderRow.createCell(1).setCellValue(user.getPhone());
+            orderRow.createCell(2).setCellValue(user.getRealName());
+            orderRow.createCell(3).setCellValue(order.getTotalPrice().toString());
+            orderRow.createCell(4).setCellValue(log.getScene().equals(1) ? "退款" : "收入");
+            orderRow.createCell(5).setCellValue((log.getScene().equals(1) ? "-" : "") + log.getMoney().toString());
+            orderRow.createCell(6).setCellValue(DateUtil.formatDateTime(order.getCreateTime()) + " ");
+            rowNum++;
+        }
+        FileOutputStream output = new FileOutputStream(path);
+        workbook.write(output);
+        output.flush();
+
+        FileRecord result = new FileRecord();
+        result.setCreateUserId(getLoginUserId());
+        result.setName(filename);
+        result.setPath(path);
+        result.setUrl(requestURL + "/" + filename);
+//        result.setMerchantCode(getMerchantCode());
+        fileRecordService.save(result);
+        return success(result);
+    }
+
+
 }
diff --git a/src/main/java/com/gxwebsoft/shop/controller/WxLoginController.java b/src/main/java/com/gxwebsoft/shop/controller/WxLoginController.java
index 56efd02..431bd16 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/WxLoginController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/WxLoginController.java
@@ -1,8 +1,13 @@
 package com.gxwebsoft.shop.controller;
 
+//import cn.binarywang.wx.miniapp.api.WxMaService;
+
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
+import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
+import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
+import cn.binarywang.wx.miniapp.util.WxMaConfigHolder;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
@@ -26,6 +31,7 @@ import com.gxwebsoft.shop.entity.UserOauth;
 import com.gxwebsoft.shop.service.UserOauthService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.error.WxRuntimeException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -44,210 +50,230 @@ import static com.gxwebsoft.common.core.constants.RedisConstants.ACCESS_TOKEN_KE
 @RequestMapping("/api/shop/wx-login")
 @Api(tags = "微信小程序登录API")
 public class WxLoginController extends BaseController {
-  @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 WxMaProperties wxMaProperties;
+    @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 WxMaProperties wxMaProperties;
 
-  @Autowired
-  private StringRedisTemplate redisTemplate;
+    @Autowired
+    private StringRedisTemplate redisTemplate;
+
+//  @Autowired
+//  private  WxMaService wxMaService;
 
 
-  @ApiOperation("获取微信openId")
-  @Transactional(rollbackFor = {Exception.class})
-  @PostMapping("/getOpenId")
-  public ApiResult<LoginResult> 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);
+    @ApiOperation("获取微信openId")
+    @Transactional(rollbackFor = {Exception.class})
+    @PostMapping("/getOpenId")
+    public ApiResult<LoginResult> getOpenId(@RequestBody UserParam userParam, HttpServletRequest request) throws WxErrorException {
+        // 1.获取openid
+        JSONObject result = getOpenIdByCode(userParam);
+        String openid = result.getString("openid");
+        String unionid = result.getString("unionid");
+//    WxMaJscode2SessionResult result = getOpenIdByCode(userParam);
+//    String openid = result.getOpenid();
+//    String unionid = result.getUnionid();
+        if (openid == null) {
+            return fail("获取openid失败", null);
+        }
+        // 2.通过openid查询用户是否已存在
+        User user = userOauthService.getByOauthId(openid);
+        // 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));
     }
-    // 2.通过openid查询用户是否已存在
-    User user = userOauthService.getByOauthId(openid);
-    // 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<LoginResult> loginByMpWxPhone(@RequestBody UserParam userParam, HttpServletRequest request) {
-    // 获取手机号码
-    String phone = getPhoneByCode(userParam);
-    // 查询是否存在
-    User user = userService.getByPhone(phone);
-    // 不存在
-    if (user == null) {
-      return fail("该用户不存在", new LoginResult());
-    }
-    // 签发token
-    String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()),
-      configProperties.getTokenExpireTime(), configProperties.getTokenKey());
-    loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_LOGIN, null, user.getTenantId(), request);
-    return success("登录成功", new LoginResult(access_token, user));
-  }
+    @ApiOperation("微信授权手机号码并登录")
+    @Transactional(rollbackFor = {Exception.class})
+    @PostMapping("/loginByMpWxPhone")
+    public ApiResult<LoginResult> loginByMpWxPhone(@RequestBody UserParam userParam, HttpServletRequest request) throws WxErrorException {
+        // 获取手机号码
+        String phone = getPhoneByCode(userParam);
+        System.out.println("phone:" + phone);
 
-  @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);
+        // 查询是否存在
+        User user = userService.getByPhone(phone);
+        System.out.println("用户:" + user);
+        // 不存在
+        if (user == null) {
+            return fail("该用户不存在", new LoginResult());
+        }
+        // 签发token
+        String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()),
+                configProperties.getTokenExpireTime(), configProperties.getTokenKey());
+        loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_LOGIN, null, user.getTenantId(), request);
+        return success("登录成功", new LoginResult(access_token, user));
     }
-    return fail("更新失败");
-  }
 
-  /**
-   * 新用户注册
-   */
-  private User addUser(UserParam userParam) {
-    User addUser = new User();
-    // 注册用户
-    addUser.setStatus(0);
-    addUser.setUsername(createUsername("wx_"));
-    addUser.setNickname("微信用户");
-    addUser.setPassword(userService.encodePassword(CommonUtil.randomUUID16()));
-    addUser.setTenantId(getTenantId());
-    Role role = roleService.getOne(new QueryWrapper<Role>().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);
+    @ApiOperation("微信授权手机号码并更新")
+    @Transactional(rollbackFor = {Exception.class})
+    @PostMapping("/updatePhoneByMpWx")
+    public ApiResult<?> updatePhoneByMpWx(@RequestBody UserParam userParam) throws WxErrorException {
+        // 获取微信授权手机号
+        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("更新失败");
     }
-    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);
-    System.out.println("result = " + result);
-    // 解析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<String, Object> paramMap = new HashMap<>();
-    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"));
-      // 微信用户的手机号码
-      return phoneInfo.getString("phoneNumber");
+    /**
+     * 新用户注册
+     */
+    private User addUser(UserParam userParam) {
+        User addUser = new User();
+        // 注册用户
+        addUser.setStatus(0);
+        addUser.setUsername(createUsername("wx_"));
+        addUser.setNickname("微信用户");
+        addUser.setPassword(userService.encodePassword(CommonUtil.randomUUID16()));
+        addUser.setTenantId(getTenantId());
+        Role role = roleService.getOne(new QueryWrapper<Role>().eq("role_code", "user"), false);
+        addUser.setRoleId(role.getRoleId());
+        if (userService.saveUser(addUser)) {
+            // 添加用户角色
+            final UserRole userRole = new UserRole();
+            userRole.setUserId(addUser.getUserId());
+            userRole.setTenantId(addUser.getTenantId());
+            userRole.setRoleId(addUser.getRoleId());
+            userRoleService.save(userRole);
+        }
+        return addUser;
     }
-    return null;
-  }
 
-  /**
-   * 生成随机账号
-   *
-   * @return username
-   */
-  private String createUsername(String type) {
-    return type.concat(RandomUtil.randomString(12));
-  }
+    // 获取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);
+        System.out.println("result = " + result);
+        // 解析access_token
+        return JSON.parseObject(result);
+//    return wxMaService.getUserService().getSessionInfo(userParam.getCode());
+    }
 
-  /**
-   * 获取接口调用凭据AccessToken
-   * https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-access-token/getAccessToken.html
-   */
-  public String getAccessToken() {
-    // 获取微信小程序配置信息
-    JSONObject setting = settingService.getBySettingKey("mp-weixin");
-    // 从缓存获取access_token
-    String value = redisTemplate.opsForValue().get(ACCESS_TOKEN_KEY.concat(getTenantId().toString()));
-    if (value != null) {
-      // 解析access_token
-      JSONObject response = JSON.parseObject(value);
-      return response.getString("access_token");
+    /**
+     * 获取微信手机号码
+     *
+     * @param userParam 需要传微信凭证code
+     */
+    private String getPhoneByCode(UserParam userParam) {
+        // 获取手机号码
+        String apiUrl = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=" + getAccessToken();
+        HashMap<String, Object> paramMap = new HashMap<>();
+        paramMap.put("code", userParam.getPhoneCode());
+        // 执行post请求
+        String post = HttpUtil.post(apiUrl, JSON.toJSONString(paramMap));
+        JSONObject json = JSON.parseObject(post);
+        System.out.println("json = " + json);
+        if (json.get("errcode").equals(0)) {
+            JSONObject phoneInfo = JSON.parseObject(json.getString("phone_info"));
+            // 微信用户的手机号码
+            return phoneInfo.getString("phoneNumber");
+        }
+        return null;
+        // 解密
+//    WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService().getPhoneNoInfo(userParam.getPhoneCode());
+//    WxMaConfigHolder.remove();//清理ThreadLocal
+//    return phoneNoInfo.getPhoneNumber();
     }
-    // 微信获取凭证接口
-    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(ACCESS_TOKEN_KEY.concat(getTenantId().toString()), result);
-      return response.getString("access_token");
-    }
-    return null;
-  }
 
-  public WxMaService wxMaService() {
-    List<WxMaProperties.Config> configs = wxMaProperties.getConfigs();
-    if (configs == null) {
-      throw new WxRuntimeException("大哥，拜托先看下项目首页的说明（readme文件），添加下相关配置，注意别配错了！");
+    /**
+     * 生成随机账号
+     *
+     * @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
+     */
+    public String getAccessToken() {
+        System.out.println(getTenantId());
+        // 获取微信小程序配置信息
+//    JSONObject setting = settingService.getBySettingKey("mp-weixin");
+        String appid = "wx7bdcb7c68d53062b";
+        String secret = "8d747742fa81da3211da1d504e494531";
+        // 从缓存获取access_token
+        String value = redisTemplate.opsForValue().get(ACCESS_TOKEN_KEY.concat(getTenantId().toString()));
+//        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"));
+        String url = apiUrl.concat("?grant_type=client_credential").concat("&appid=").concat(appid).concat("&secret=").concat(secret);
+        // 执行get请求
+        String result = HttpUtil.get(url);
+        // 解析access_token
+        JSONObject response = JSON.parseObject(result);
+        return response.getString("access_token");
+//    if (response.getString("access_token") != null) {
+        // 存入缓存
+//      redisTemplate.opsForValue().set(ACCESS_TOKEN_KEY.concat(getTenantId().toString()), result);
+//      return response.getString("access_token");
+//    }
+//    return null;
+    }
+
+    public WxMaService wxMaService() {
+        List<WxMaProperties.Config> configs = wxMaProperties.getConfigs();
+        if (configs == null) {
+            throw new WxRuntimeException("大哥，拜托先看下项目首页的说明（readme文件），添加下相关配置，注意别配错了！");
+        }
+        WxMaService maService = new WxMaServiceImpl();
+        maService.setMultiConfigs(
+                configs.stream()
+                        .map(a -> {
+                            WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
+                            config.setAppid(a.getAppid());
+                            config.setSecret(a.getSecret());
+                            config.setToken(a.getToken());
+                            config.setAesKey(a.getAesKey());
+                            config.setMsgDataFormat(a.getMsgDataFormat());
+                            return config;
+                        }).collect(Collectors.toMap(WxMaDefaultConfigImpl::getAppid, a -> a, (o, n) -> o)));
+        return maService;
     }
-    WxMaService maService = new WxMaServiceImpl();
-    maService.setMultiConfigs(
-            configs.stream()
-                    .map(a -> {
-                      WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
-                      config.setAppid(a.getAppid());
-                      config.setSecret(a.getSecret());
-                      config.setToken(a.getToken());
-                      config.setAesKey(a.getAesKey());
-                      config.setMsgDataFormat(a.getMsgDataFormat());
-                      return config;
-                    }).collect(Collectors.toMap(WxMaDefaultConfigImpl::getAppid, a -> a, (o, n) -> o)));
-    return maService;
-  }
 
 
 }
diff --git a/src/main/java/com/gxwebsoft/shop/controller/WxPayController.java b/src/main/java/com/gxwebsoft/shop/controller/WxPayController.java
index 32f0f1f..93bb892 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/WxPayController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/WxPayController.java
@@ -1,25 +1,223 @@
 package com.gxwebsoft.shop.controller;
 
+import cn.hutool.core.date.DateUtil;
 import com.gxwebsoft.common.core.web.ApiResult;
 import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.shop.service.OrderService;
+import com.gxwebsoft.common.system.entity.DictData;
+import com.gxwebsoft.common.system.service.DictDataService;
+import com.gxwebsoft.common.system.service.UserService;
+import com.gxwebsoft.shop.constants.OrderConstants;
+import com.gxwebsoft.shop.entity.*;
+import com.gxwebsoft.shop.service.*;
+import com.wechat.pay.java.core.RSAAutoCertificateConfig;
+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.RequestParam;
+import com.wechat.pay.java.service.partnerpayments.nativepay.model.Amount;
+import com.wechat.pay.java.service.partnerpayments.nativepay.model.PrepayRequest;
+import com.wechat.pay.java.service.partnerpayments.nativepay.model.Transaction;
+import com.wechat.pay.java.service.partnerpayments.model.TransactionAmount;
+import com.wechat.pay.java.service.partnerpayments.nativepay.NativePayService;
+import com.wechat.pay.java.service.partnerpayments.nativepay.model.PrepayResponse;
+import com.wechat.pay.java.service.refund.RefundService;
+import com.wechat.pay.java.service.refund.model.AmountReq;
+import com.wechat.pay.java.service.refund.model.CreateRequest;
+import com.wechat.pay.java.service.refund.model.RefundNotification;
+import com.wechat.pay.java.service.refund.model.Status;
 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.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import com.wechat.pay.java.core.Config;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/api/shop/wx-pay")
 @Api(tags = "微信支付API")
-public class WxPayController extends BaseController
-{
-  @Resource
-  private OrderService orderService;
+@Configuration
+public class WxPayController extends BaseController {
+    @Resource
+    private OrderService orderService;
+    @Resource
+    private DictDataService dictDataService;
+    @Resource
+    private OrderRefundService orderRefundService;
+    @Autowired
+    private UserBalanceLogController userBalanceLogController;
 
-  public ApiResult<?> nativePay(@PathVariable String orderId){
-      return success("支付成功");
-  }
+    private final Integer tenantId = 10036;
+
+    @Value("${wxpay.app-id}")
+    public String appId;
+    /**
+     * 商户号
+     */
+    @Value("${wxpay.mch-id}")
+    public String merchantId;
+    /**
+     * 商户API私钥路径
+     */
+    @Value("${wxpay.private-key-path}")
+    public String privateKeyPath;
+    /**
+     * 商户证书序列号
+     */
+    @Value("${wxpay.mch-serial-no}")
+    public String merchantSerialNumber;
+    /**
+     * 商户APIV3密钥
+     */
+    @Value("${wxpay.api-v3-key}")
+    public String apiV3key;
+
+    @Value("${wxpay.notify-domain}")
+    public String notifyUrl;
+
+    @Value("${wxpay.cert-path}")
+    public String wechatPayCertificatePath;
+
+    private final String spAppId = "wxa67c676fc445590e";
+    private final String spMerchantId = "1615739384";
+
+    public String nativePay(String orderNo, Integer payAmount, String title) {
+        Config config = new RSAAutoCertificateConfig.Builder()
+                .merchantId(spMerchantId)
+                .privateKeyFromPath(privateKeyPath)
+                .merchantSerialNumber(merchantSerialNumber)
+                .apiV3Key(apiV3key)
+                .build();
+        // 构建service
+        NativePayService service = new NativePayService.Builder().config(config).build();
+        PrepayRequest request = new PrepayRequest();
+        Amount amount = new Amount();
+        DictData dictData = dictDataService.getByDictCodeAndName("PAY_TEST_MODE", "模式");
+        if (Integer.valueOf(dictData.getDictDataCode()).equals(0)) {
+            amount.setTotal(1);
+        }else {
+            amount.setTotal(payAmount);
+        }
+        request.setSpAppid(spAppId);
+        request.setSpMchid(spMerchantId);
+        request.setSubAppid(appId);
+        request.setSubMchid(merchantId);
+        request.setAmount(amount);
+        request.setDescription(title);
+        request.setNotifyUrl(notifyUrl);
+        request.setOutTradeNo(orderNo);
+        PrepayResponse response = service.prepay(request);
+        // 调用下单方法，得到应答
+        return response.getCodeUrl();
+    }
+
+    /***
+     * 退款申请
+     * @param orderRefund
+     */
+    public void refund(OrderRefund orderRefund) {
+        Config config = new RSAAutoCertificateConfig.Builder()
+                .merchantId(spMerchantId)
+                .privateKeyFromPath(privateKeyPath)
+                .merchantSerialNumber(merchantSerialNumber)
+                .apiV3Key(apiV3key)
+                .build();
+        RefundService service = new RefundService.Builder().config(config).build();
+        CreateRequest request = new CreateRequest();
+        // 金额
+        AmountReq amount = new AmountReq();
+        amount.setTotal(orderRefund.getRefundMoney().multiply(BigDecimal.valueOf(100)).longValue());
+        amount.setRefund(orderRefund.getRefundMoney().multiply(BigDecimal.valueOf(100)).longValue());
+        amount.setCurrency("CNY");
+        request.setSubMchid(merchantId);
+        request.setAmount(amount);
+        request.setOutTradeNo(orderRefund.getOrder().getOrderNo());
+        request.setOutRefundNo("R" + orderRefund.getOrder().getOrderNo());
+        String wechatRefundNotifyUrl = "https://vivo-server.gxwebsoft.com/api/shop/wx-pay/refund-notify";
+        request.setNotifyUrl(wechatRefundNotifyUrl);
+        service.create(request);
+
+    }
+
+    @PostMapping("/notify")
+    public ApiResult<?> notify(@RequestBody String body, @RequestHeader Map<String, Object> header) throws ParseException {
+        RequestParam requestParam = new RequestParam.Builder()
+                .serialNumber(header.get("wechatpay-serial").toString())
+                .nonce(header.get("wechatpay-nonce").toString())
+                .signature(header.get("wechatpay-signature").toString())
+                .timestamp(header.get("wechatpay-timestamp").toString())
+                .body(body)
+                .build();
+        NotificationConfig config = new RSAAutoCertificateConfig.Builder()
+                .merchantId(spMerchantId)
+                .privateKeyFromPath(privateKeyPath)
+                .merchantSerialNumber(merchantSerialNumber)
+                .apiV3Key(apiV3key)
+                .build();
+        // 初始化 NotificationParser
+        NotificationParser parser = new NotificationParser(config);
+        Transaction transaction = parser.parse(requestParam, Transaction.class);
+        TransactionAmount transactionAmount = transaction.getAmount();
+        // 支付金额
+        Integer payAmount = transactionAmount.getPayerTotal();
+        float calAmount = (float) payAmount / 100f;
+        BigDecimal userPaid = BigDecimal.valueOf(calAmount);
+        // 订单号
+        String orderNo = transaction.getOutTradeNo();
+        // 微信支付订单号
+        String transactionId = transaction.getTransactionId();
+        // 支付状态
+        Transaction.TradeStateEnum tradeStateEnum = transaction.getTradeState();
+        System.out.println("支付结果:" + transaction);
+        if (tradeStateEnum == Transaction.TradeStateEnum.SUCCESS) {
+            Order order = orderService.getByOutTradeNo(orderNo);
+            order.setOrderStatus(OrderConstants.ORDER_STATUS_PAID);
+            order.setPayMethod(OrderConstants.ORDER_PAY_METHOD_WECHAT.toString());
+            order.setTradeId(transactionId);
+            order.setReceiptAmount(userPaid);
+            order.setPayTime(DateUtil.date());
+            orderService.updateById(order);
+
+            orderService.updateIncome(order);
+        }
+        return success();
+    }
+
+    @PostMapping("/refund-notify")
+    public ApiResult<?> refundNotify(@RequestBody String body, @RequestHeader Map<String, Object> header) throws ParseException {
+        RequestParam requestParam = new RequestParam.Builder()
+                .serialNumber(header.get("wechatpay-serial").toString())
+                .nonce(header.get("wechatpay-nonce").toString())
+                .signature(header.get("wechatpay-signature").toString())
+                .timestamp(header.get("wechatpay-timestamp").toString())
+                .body(body)
+                .build();
+        NotificationConfig config = new RSAAutoCertificateConfig.Builder()
+                .merchantId(spMerchantId)
+                .privateKeyFromPath(privateKeyPath)
+                .merchantSerialNumber(merchantSerialNumber)
+                .apiV3Key(apiV3key)
+                .build();
+        // 初始化 NotificationParser
+        NotificationParser parser = new NotificationParser(config);
+        RefundNotification notification = parser.parse(requestParam, RefundNotification.class);
+        String orderNo = notification.getOutTradeNo();
+        if (notification.getRefundStatus().equals(Status.SUCCESS)) {
+            Order order = orderService.getByOutTradeNo(orderNo);
+            OrderRefund orderRefund = orderRefundService.getByOrderId(order.getOrderId());
+            if (orderRefund.getRefundStatus().equals(0)) {
+                orderRefund.setRefundStatus(1);
+                orderRefundService.updateById(orderRefund);
+            }
+        }
+        return success();
+    }
 }
diff --git a/src/main/java/com/gxwebsoft/shop/entity/Goods.java b/src/main/java/com/gxwebsoft/shop/entity/Goods.java
index 690a73a..49a00d6 100644
--- a/src/main/java/com/gxwebsoft/shop/entity/Goods.java
+++ b/src/main/java/com/gxwebsoft/shop/entity/Goods.java
@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 商品记录表
@@ -148,6 +149,9 @@ public class Goods implements Serializable {
     @ApiModelProperty(value = "分销佣金(三级)")
     private BigDecimal thirdMoney;
 
+    @ApiModelProperty(value = "成本")
+    private BigDecimal cost;
+
     @ApiModelProperty(value = "用户ID")
     private Integer userId;
 
@@ -192,4 +196,10 @@ public class Goods implements Serializable {
     @TableField(exist = false)
     private Integer noDeliveryTimes;
 
+    @TableField(exist = false)
+    private List<GoodsPhoneModel> goodsPhoneModelList;
+
+    @TableField(exist = false)
+    private GoodsPrice goodsPrice;
+
 }
diff --git a/src/main/java/com/gxwebsoft/shop/entity/GoodsPhoneModel.java b/src/main/java/com/gxwebsoft/shop/entity/GoodsPhoneModel.java
new file mode 100644
index 0000000..d14aff6
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/shop/entity/GoodsPhoneModel.java
@@ -0,0 +1,54 @@
+package com.gxwebsoft.shop.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 商品匹配机型
+ *
+ * @author 科技小王子
+ * @since 2024-03-12 01:30:55
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "GoodsPhoneModel对象", description = "商品匹配机型")
+@TableName("shop_goods_phone_model")
+public class GoodsPhoneModel implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer goodsId;
+
+    private Integer modelId;
+
+    @ApiModelProperty(value = "状态, 0上架, 1下架")
+    private Integer status;
+
+    @ApiModelProperty(value = "是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+    @ApiModelProperty(value = "注册时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "修改时间")
+    private LocalDateTime updateTime;
+
+    @TableField(exist = false)
+    private String phoneModelName;
+
+    @TableField(exist = false)
+    private String phoneModelCode;
+
+}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/GoodsPrice.java b/src/main/java/com/gxwebsoft/shop/entity/GoodsPrice.java
new file mode 100644
index 0000000..c243d87
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/shop/entity/GoodsPrice.java
@@ -0,0 +1,102 @@
+package com.gxwebsoft.shop.entity;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 商品价格()
+ *
+ * @author 科技小王子
+ * @since 2024-03-12 01:35:40
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "GoodsPrice对象", description = "商品价格()")
+@TableName("shop_goods_price")
+public class GoodsPrice implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer goodsId;
+
+    @ApiModelProperty(value = "售价")
+    private BigDecimal amount;
+
+    @ApiModelProperty(value = "零售商店长返利比例")
+    @TableField(value = "level_3_commission_rate")
+    private BigDecimal level3commissionRate;
+
+    @ApiModelProperty(value = "零售商店长返利模式(0金额1比例)")
+    @TableField(value = "level_3_commission_mode")
+    private Integer level3commissionMode;
+
+    @ApiModelProperty(value = "导购返利比例")
+    @TableField(value = "level_4_commission_rate")
+    private BigDecimal level4commissionRate;
+
+    @ApiModelProperty(value = "导购返利模式(0金额1比例)")
+    @TableField(value = "level_4_commission_mode")
+    private Integer level4commissionMode;
+
+    @ApiModelProperty(value = "售后返利比例")
+    @TableField(value = "level_5_commission_rate")
+    private BigDecimal level5commissionRate;
+
+    @ApiModelProperty(value = "散户返利比例")
+    @TableField(value = "level_6_commission_rate")
+    private BigDecimal level6commissionRate;
+
+    @ApiModelProperty(value = "散户返利模式(0金额1比例)")
+    @TableField(value = "level_6_commission_mode")
+    private Integer level6commissionMode;
+
+    @ApiModelProperty(value = "编外合伙人返利比例")
+    @TableField(value = "level_7_commission_rate")
+    private BigDecimal level7commissionRate;
+
+    @ApiModelProperty(value = "编外合伙人返利模式(0金额1比例)")
+    @TableField(value = "level_7_commission_mode")
+    private Integer level7commissionMode;
+
+    @ApiModelProperty(value = "售后店长返利比例")
+    @TableField(value = "level_8_commission_rate")
+    private BigDecimal level8commissionRate;
+
+    @ApiModelProperty(value = "售后店长全店返利比例")
+    private BigDecimal fixStoreLeaderCommissionRate;
+
+    @ApiModelProperty(value = "状态, 0上架, 1下架")
+    private Integer status;
+
+    @ApiModelProperty(value = "是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
+    private Integer province;
+
+    private Integer city;
+
+    @ApiModelProperty(value = "区代ID")
+    private Integer userId;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+    @ApiModelProperty(value = "注册时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "修改时间")
+    private LocalDateTime updateTime;
+
+}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/Order.java b/src/main/java/com/gxwebsoft/shop/entity/Order.java
index 77e2914..a112349 100644
--- a/src/main/java/com/gxwebsoft/shop/entity/Order.java
+++ b/src/main/java/com/gxwebsoft/shop/entity/Order.java
@@ -1,8 +1,9 @@
 package com.gxwebsoft.shop.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.gxwebsoft.apps.entity.Equipment;
-import com.gxwebsoft.apps.entity.EquipmentOrderGoods;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.vivo.entity.VivoFixStore;
+import com.gxwebsoft.vivo.entity.VivoStore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -34,7 +35,7 @@ public class Order implements Serializable {
     private String subject;
 
     @ApiModelProperty(value = "订单号")
-    private Long orderNo;
+    private String orderNo;
 
     @ApiModelProperty(value = "商品总金额(不含优惠折扣)")
     private BigDecimal totalPrice;
@@ -177,12 +178,25 @@ public class Order implements Serializable {
     @ApiModelProperty(value = "用户ID")
     private Integer userId;
 
+    @ApiModelProperty(value = "所属城市")
+    private Integer cityId;
+
     @ApiModelProperty(value = "所属门店ID")
-    private Integer shopId;
+    private Integer storeId;
+
+    @ApiModelProperty(value = "所属门店ID")
+    private Integer fixStoreId;
+
+    @ApiModelProperty(value = "所属零售商ID")
+    private Integer orgId;
 
     @ApiModelProperty(value = "商品ID")
     private Integer goodsId;
 
+    @ApiModelProperty(value = "商品名称")
+    @TableField(exist = false)
+    private String goodsName;
+
     @ApiModelProperty(value = "设备ID")
     private Integer equipmentId;
 
@@ -199,6 +213,59 @@ public class Order implements Serializable {
     @ApiModelProperty(value = "备注")
     private String comments;
 
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+
+    @ApiModelProperty(value = "照片")
+    private String photo;
+
+    @ApiModelProperty(value = "视频")
+    private String video;
+
+    @ApiModelProperty(value = "支付凭证")
+    private String payVoucher;
+
+    @ApiModelProperty(value = "分佣")
+    private BigDecimal commission;
+
+    @ApiModelProperty(value = "区代毛利")
+    private BigDecimal agentCommission;
+
+    @ApiModelProperty(value = "店长门店返利")
+    private BigDecimal fixStoreLeaderCommission;
+
+    @ApiModelProperty(value = "退款码")
+    private String refundCode;
+
+    @ApiModelProperty(value = "型号")
+    private String modelName;
+
+    @ApiModelProperty(value = "RAM+ROM")
+    private String productMemory;
+
+    private String imei;
+
+    private String skuCode;
+
+    private String skuName;
+
+    private String skuColor;
+
+    @ApiModelProperty("门店")
+    private String storeName;
+
+    @ApiModelProperty("二级区域名称")
+    private String secondAreaName;
+
+    @ApiModelProperty("零售商名称")
+    private String retailerName;
+
+    @ApiModelProperty("好/坏")
+    private String goodOrBad;
+
     @ApiModelProperty(value = "状态, 0正常, 1冻结")
     private Integer status;
 
@@ -215,6 +282,9 @@ public class Order implements Serializable {
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
 
+    @ApiModelProperty(value = "出险时间")
+    private Date useTime;
+
     @ApiModelProperty("账号")
     @TableField(exist = false)
     private String username;
@@ -227,10 +297,6 @@ public class Order implements Serializable {
     @TableField(exist = false)
     private String nickname;
 
-    @ApiModelProperty(value = "联系电话")
-    @TableField(exist = false)
-    private String phone;
-
     @ApiModelProperty(value = "头像")
     @TableField(exist = false)
     private String avatar;
@@ -247,15 +313,39 @@ public class Order implements Serializable {
     @TableField(exist = false)
     private List<OrderGoods> goodsList;
 
-    @ApiModelProperty("管理电池商品")
+    @ApiModelProperty("商品列表")
     @TableField(exist = false)
-    private EquipmentOrderGoods equipmentGoods;
-
-    @ApiModelProperty("设备")
-    @TableField(exist = false)
-    private Equipment equipment;
+    private OrderGoods orderGoods;
 
     @ApiModelProperty("推荐人ID")
     @TableField(exist = false)
     private Integer dealerId;
+
+    @TableField(exist = false)
+    private Goods goods;
+
+    @ApiModelProperty("上报人姓名")
+    private String sellerName;
+
+    @ApiModelProperty("上报人工号")
+    private String sellerCode;
+
+    @ApiModelProperty("后台状态：已激活/未激活")
+    private String activeState;
+
+    @ApiModelProperty("后台激活日期")
+    private String activeDate;
+
+    @TableField(exist = false)
+    private BigDecimal totalAmount;
+
+    @TableField(exist = false)
+    private VivoStore store;
+
+    @TableField(exist = false)
+    private VivoFixStore fixStore;
+
+    @TableField(exist = false)
+    private User user;
+
 }
diff --git a/src/main/java/com/gxwebsoft/shop/entity/OrderRefund.java b/src/main/java/com/gxwebsoft/shop/entity/OrderRefund.java
index 67400a9..dcecc08 100644
--- a/src/main/java/com/gxwebsoft/shop/entity/OrderRefund.java
+++ b/src/main/java/com/gxwebsoft/shop/entity/OrderRefund.java
@@ -48,6 +48,9 @@ public class OrderRefund implements Serializable {
     @ApiModelProperty(value = "商家审核状态(0待审核 10已同意 20已拒绝)")
     private Integer auditStatus;
 
+    @ApiModelProperty(value = "0未到账1已到账")
+    private Integer refundStatus;
+
     @ApiModelProperty(value = "商家拒绝原因(说明)")
     private String refuseDesc;
 
@@ -113,5 +116,6 @@ public class OrderRefund implements Serializable {
     @TableField(exist = false)
     private String merchantName;
 
-
+    @TableField(exist = false)
+    private Order order;
 }
diff --git a/src/main/java/com/gxwebsoft/shop/entity/UserBalanceLog.java b/src/main/java/com/gxwebsoft/shop/entity/UserBalanceLog.java
index 792e3cd..0bfa1ff 100644
--- a/src/main/java/com/gxwebsoft/shop/entity/UserBalanceLog.java
+++ b/src/main/java/com/gxwebsoft/shop/entity/UserBalanceLog.java
@@ -8,6 +8,7 @@ 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;
@@ -33,7 +34,14 @@ public class UserBalanceLog implements Serializable {
     @ApiModelProperty(value = "用户ID")
     private Integer userId;
 
-    @ApiModelProperty(value = "余额变动场景(10用户充值 20用户消费 30管理员操作 40订单退款)")
+    @ApiModelProperty(value = "订单ID")
+    private Integer orderId;
+
+
+    @ApiModelProperty(value = "订单")
+    private Order order;
+
+    @ApiModelProperty(value = "余额变动场景余额变动场景(0分佣 1订单退款)")
     private Integer scene;
 
     @ApiModelProperty(value = "变动金额")
@@ -78,4 +86,10 @@ public class UserBalanceLog implements Serializable {
     @TableField(exist = false)
     private String avatar;
 
+    @TableField(exist = false)
+    private BigDecimal totalAmount;
+
+    @TableField(exist = false)
+    private User user;
+
 }
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/GoodsPhoneModelMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/GoodsPhoneModelMapper.java
new file mode 100644
index 0000000..1ca2971
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/shop/mapper/GoodsPhoneModelMapper.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.GoodsPhoneModel;
+import com.gxwebsoft.shop.param.GoodsPhoneModelParam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 商品匹配机型Mapper
+ *
+ * @author 科技小王子
+ * @since 2024-03-12 01:30:55
+ */
+public interface GoodsPhoneModelMapper extends BaseMapper<GoodsPhoneModel> {
+
+    /**
+     * 分页查询
+     *
+     * @param page  分页对象
+     * @param param 查询参数
+     * @return List<GoodsPhoneModel>
+     */
+    List<GoodsPhoneModel> selectPageRel(@Param("page") IPage<GoodsPhoneModel> page,
+                             @Param("param") GoodsPhoneModelParam param);
+
+    /**
+     * 查询全部
+     *
+     * @param param 查询参数
+     * @return List<User>
+     */
+    List<GoodsPhoneModel> selectListRel(@Param("param") GoodsPhoneModelParam param);
+
+}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/GoodsPriceMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/GoodsPriceMapper.java
new file mode 100644
index 0000000..d2dfff3
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/shop/mapper/GoodsPriceMapper.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.GoodsPrice;
+import com.gxwebsoft.shop.param.GoodsPriceParam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 商品价格()Mapper
+ *
+ * @author 科技小王子
+ * @since 2024-03-12 01:35:40
+ */
+public interface GoodsPriceMapper extends BaseMapper<GoodsPrice> {
+
+    /**
+     * 分页查询
+     *
+     * @param page  分页对象
+     * @param param 查询参数
+     * @return List<GoodsPrice>
+     */
+    List<GoodsPrice> selectPageRel(@Param("page") IPage<GoodsPrice> page,
+                             @Param("param") GoodsPriceParam param);
+
+    /**
+     * 查询全部
+     *
+     * @param param 查询参数
+     * @return List<User>
+     */
+    List<GoodsPrice> selectListRel(@Param("param") GoodsPriceParam param);
+
+}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsMapper.xml
index 03aaa5b..82c6dda 100644
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsMapper.xml
+++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsMapper.xml
@@ -5,10 +5,8 @@
     <!-- 关联查询sql -->
     <sql id="selectSql">
         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
         <where>
             <if test="param.goodsId != null">
@@ -143,9 +141,7 @@
             <if test="param.merchantCode != null">
               AND a.merchant_code = #{param.merchantCode}
             </if>
-            <if test="param.merchantName != null">
-              AND b.merchant_name = #{param.merchantName}
-            </if>
+
             <if test="param.period != null">
               AND a.period = #{param.period}
             </if>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectBuildingMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsPhoneModelMapper.xml
similarity index 59%
rename from src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectBuildingMapper.xml
rename to src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsPhoneModelMapper.xml
index dc9ccb9..b632f3f 100644
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectBuildingMapper.xml
+++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsPhoneModelMapper.xml
@@ -1,27 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerProjectBuildingMapper">
+<mapper namespace="com.gxwebsoft.shop.mapper.GoodsPhoneModelMapper">
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
-        SELECT a.*
-        FROM tower_project_building a
+        SELECT a.*, b.name as phone_model_name, b.code as phone_model_code
+        FROM shop_goods_phone_model a
+        LEFT JOIN vivo_phone_model b ON a.model_id = b.id
         <where>
-            <if test="param.buildingId != null">
-                AND a.building_id = #{param.buildingId}
+            <if test="param.id != null">
+                AND a.id = #{param.id}
             </if>
-            <if test="param.projectId != null">
-                AND a.project_id = #{param.projectId}
+            <if test="param.goodsId != null">
+                AND a.goods_id = #{param.goodsId}
             </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
+            <if test="param.modelId != null">
+                AND a.model_id = #{param.modelId}
             </if>
             <if test="param.status != null">
                 AND a.status = #{param.status}
             </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
             <if test="param.deleted != null">
                 AND a.deleted = #{param.deleted}
             </if>
@@ -38,12 +36,12 @@
     </sql>
 
     <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerProjectBuilding">
+    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.GoodsPhoneModel">
         <include refid="selectSql"></include>
     </select>
 
     <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerProjectBuilding">
+    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.GoodsPhoneModel">
         <include refid="selectSql"></include>
     </select>
 
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcCookbookMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsPriceMapper.xml
similarity index 57%
rename from src/main/java/com/gxwebsoft/apps/mapper/xml/BcCookbookMapper.xml
rename to src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsPriceMapper.xml
index 577901f..bbefbde 100644
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcCookbookMapper.xml
+++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsPriceMapper.xml
@@ -1,36 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.apps.mapper.BcCookbookMapper">
+<mapper namespace="com.gxwebsoft.shop.mapper.GoodsPriceMapper">
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
         SELECT a.*
-        FROM apps_bc_cookbook a
+        FROM shop_goods_price a
         <where>
-            <if test="param.cookbookId != null">
-                AND a.cookbook_id = #{param.cookbookId}
+            <if test="param.id != null">
+                AND a.id = #{param.id}
             </if>
-            <if test="param.planId != null">
-                AND a.plan_id = #{param.planId}
+            <if test="param.goodsId != null">
+                AND a.goods_id = #{param.goodsId}
             </if>
-            <if test="param.period != null">
-                AND a.period LIKE CONCAT('%', #{param.period}, '%')
+            <if test="param.amount != null">
+                AND a.amount = #{param.amount}
+            </if>
+            <if test="param.commissionRate != null">
+                AND a.commission_rate = #{param.commissionRate}
             </if>
             <if test="param.status != null">
                 AND a.status = #{param.status}
             </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
             <if test="param.deleted != null">
                 AND a.deleted = #{param.deleted}
             </if>
             <if test="param.deleted == null">
                 AND a.deleted = 0
             </if>
+            <if test="param.province != null">
+                AND a.province LIKE CONCAT('%', #{param.province}, '%')
+            </if>
+            <if test="param.city != null">
+                AND a.city LIKE CONCAT('%', #{param.city}, '%')
+            </if>
+            <if test="param.userId != null">
+                AND a.user_id = #{param.userId}
+            </if>
             <if test="param.createTimeStart != null">
                 AND a.create_time &gt;= #{param.createTimeStart}
             </if>
@@ -41,12 +47,12 @@
     </sql>
 
     <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.BcCookbook">
+    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.GoodsPrice">
         <include refid="selectSql"></include>
     </select>
 
     <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.BcCookbook">
+    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.GoodsPrice">
         <include refid="selectSql"></include>
     </select>
 
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderMapper.xml
index b9174db..d5da59e 100644
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderMapper.xml
+++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderMapper.xml
@@ -5,16 +5,13 @@
     <!-- 关联查询sql -->
     <sql id="selectSql">
         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
+        b.nickname,b.alias,b.username,b.user_id,b.avatar,b.phone,b.real_name,
+        c.goods_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
+        LEFT JOIN shop_goods c ON c.goods_id = a.goods_id
         <where>
+            AND a.order_status != 0
             <if test="param.orderId != null">
                 AND a.order_id = #{param.orderId}
             </if>
@@ -111,6 +108,9 @@
             <if test="param.transactionId != null">
                 AND a.transaction_id LIKE CONCAT('%', #{param.transactionId}, '%')
             </if>
+            <if test="param.imei != null">
+                AND a.imei LIKE CONCAT('%', #{param.imei}, '%')
+            </if>
             <if test="param.isComment != null">
                 AND a.is_comment = #{param.isComment}
             </if>
@@ -144,8 +144,20 @@
                 #{item}
               </foreach>
             </if>
-            <if test="param.shopId != null">
-                AND a.shop_id = #{param.shopId}
+            <if test="param.storeId != null">
+                AND a.store_id = #{param.storeId}
+            </if>
+            <if test="param.fixStoreId != null">
+                AND a.fix_store_id = #{param.fixStoreId}
+            </if>
+            <if test="param.fixOnly != null">
+                AND a.fix_store_id != 0
+            </if>
+            <if test="param.orgId != null">
+                AND a.org_id = #{param.orgId}
+            </if>
+            <if test="param.cityId != null">
+                AND a.city_id = #{param.cityId}
             </if>
             <if test="param.sortNumber != null">
                 AND a.sort_number = #{param.sortNumber}
@@ -174,16 +186,23 @@
             <if test="param.merchantCode != null">
               AND a.merchant_code = #{param.merchantCode}
             </if>
+            <if test="param.userLevel != null">
+              AND b.user_level = #{param.userLevel}
+            </if>
+            <if test="param.userLevelList != null">
+                AND b.user_level IN
+                <foreach collection="param.userLevelList" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
             <if test="param.keywords != null">
               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}, '%')
+              a.order_no LIKE CONCAT('%', #{param.keywords}, '%')
+              OR a.phone LIKE CONCAT('%', #{param.keywords}, '%')
+              OR a.sku_name LIKE CONCAT('%', #{param.keywords}, '%')
+              OR a.imei LIKE CONCAT('%', #{param.keywords}, '%')
+              OR b.phone LIKE CONCAT('%', #{param.keywords}, '%')
+              OR b.real_name LIKE CONCAT('%', #{param.keywords}, '%')
               )
             </if>
         </where>
diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerProjectBuildingParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsPhoneModelParam.java
similarity index 62%
rename from src/main/java/com/gxwebsoft/tower/param/TowerProjectBuildingParam.java
rename to src/main/java/com/gxwebsoft/shop/param/GoodsPhoneModelParam.java
index 196852e..9f73150 100644
--- a/src/main/java/com/gxwebsoft/tower/param/TowerProjectBuildingParam.java
+++ b/src/main/java/com/gxwebsoft/shop/param/GoodsPhoneModelParam.java
@@ -1,4 +1,4 @@
-package com.gxwebsoft.tower.param;
+package com.gxwebsoft.shop.param;
 
 import com.gxwebsoft.common.core.annotation.QueryField;
 import com.gxwebsoft.common.core.annotation.QueryType;
@@ -10,35 +10,31 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 项目标地查询参数
+ * 商品匹配机型查询参数
  *
  * @author 科技小王子
- * @since 2024-01-05 22:01:16
+ * @since 2024-03-12 01:30:55
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerProjectBuildingParam对象", description = "项目标地查询参数")
-public class TowerProjectBuildingParam extends BaseParam {
+@ApiModel(value = "GoodsPhoneModelParam对象", description = "商品匹配机型查询参数")
+public class GoodsPhoneModelParam extends BaseParam {
     private static final long serialVersionUID = 1L;
 
     @QueryField(type = QueryType.EQ)
-    private Integer buildingId;
+    private Integer id;
 
     @QueryField(type = QueryType.EQ)
-    private Integer projectId;
+    private Integer goodsId;
 
-    @ApiModelProperty(value = "名称")
-    private String name;
+    @QueryField(type = QueryType.EQ)
+    private Integer modelId;
 
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
+    @ApiModelProperty(value = "状态, 0上架, 1下架")
     @QueryField(type = QueryType.EQ)
     private Integer status;
 
-    @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/TowerContractFinalSettleLostParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsPriceParam.java
similarity index 60%
rename from src/main/java/com/gxwebsoft/tower/param/TowerContractFinalSettleLostParam.java
rename to src/main/java/com/gxwebsoft/shop/param/GoodsPriceParam.java
index 70521b9..6496618 100644
--- a/src/main/java/com/gxwebsoft/tower/param/TowerContractFinalSettleLostParam.java
+++ b/src/main/java/com/gxwebsoft/shop/param/GoodsPriceParam.java
@@ -1,4 +1,4 @@
-package com.gxwebsoft.tower.param;
+package com.gxwebsoft.shop.param;
 
 import com.gxwebsoft.common.core.annotation.QueryField;
 import com.gxwebsoft.common.core.annotation.QueryType;
@@ -12,43 +12,46 @@ import lombok.EqualsAndHashCode;
 import java.math.BigDecimal;
 
 /**
- * 结算书缺失物品查询参数
+ * 商品价格()查询参数
  *
  * @author 科技小王子
- * @since 2023-06-18 00:52:41
+ * @since 2024-03-12 01:35:40
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerContractFinalSettleLostParam对象", description = "结算书缺失物品查询参数")
-public class TowerContractFinalSettleLostParam extends BaseParam {
+@ApiModel(value = "GoodsPriceParam对象", description = "商品价格()查询参数")
+public class GoodsPriceParam extends BaseParam {
     private static final long serialVersionUID = 1L;
 
     @QueryField(type = QueryType.EQ)
-    private Integer finalSettleLostId;
+    private Integer id;
 
-    @ApiModelProperty(value = "结算书ID")
     @QueryField(type = QueryType.EQ)
-    private Integer finalSettleId;
+    private Integer goodsId;
 
-    @ApiModelProperty(value = "配机ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer itemId;
-
-    @ApiModelProperty(value = "赔偿金额")
+    @ApiModelProperty(value = "售价")
     @QueryField(type = QueryType.EQ)
     private BigDecimal amount;
 
-    @ApiModelProperty(value = "赔偿数量")
+    @ApiModelProperty(value = "返利比例")
     @QueryField(type = QueryType.EQ)
-    private Integer num;
+    private BigDecimal commissionRate;
 
-    @ApiModelProperty(value = "所有人")
+    @ApiModelProperty(value = "状态, 0上架, 1下架")
     @QueryField(type = QueryType.EQ)
-    private Integer userId;
+    private Integer status;
 
     @ApiModelProperty(value = "是否删除, 0否, 1是")
     @QueryField(type = QueryType.EQ)
     private Integer deleted;
 
+    private String province;
+
+    private String city;
+
+    @ApiModelProperty(value = "区代ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer userId;
+
 }
diff --git a/src/main/java/com/gxwebsoft/shop/param/OrderParam.java b/src/main/java/com/gxwebsoft/shop/param/OrderParam.java
index f70f473..5925243 100644
--- a/src/main/java/com/gxwebsoft/shop/param/OrderParam.java
+++ b/src/main/java/com/gxwebsoft/shop/param/OrderParam.java
@@ -12,6 +12,7 @@ import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -69,6 +70,8 @@ public class OrderParam extends BaseParam {
     @ApiModelProperty(value = "买家留言")
     private String buyerRemark;
 
+    private String imei;
+
     @ApiModelProperty(value = "支付方式(废弃)")
     @QueryField(type = QueryType.EQ)
     private Integer payType;
@@ -186,7 +189,19 @@ public class OrderParam extends BaseParam {
 
     @ApiModelProperty(value = "所属门店ID")
     @QueryField(type = QueryType.EQ)
-    private Integer shopId;
+    private Integer storeId;
+
+    @ApiModelProperty(value = "所属门店ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer fixStoreId;
+
+    @ApiModelProperty(value = "所属零售商ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer orgId;
+
+    @ApiModelProperty(value = "所属门店ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer cityId;
 
     @ApiModelProperty(value = "商品ID")
     private Integer goodsId;
@@ -237,4 +252,16 @@ public class OrderParam extends BaseParam {
     @TableField(exist = false)
     private Set<Integer> userIds;
 
+    @ApiModelProperty(value = "仅显示售后店订单")
+    @TableField(exist = false)
+    private Integer fixOnly;
+
+    @ApiModelProperty(value = "用户等级集合")
+    @TableField(exist = false)
+    private List<Integer> userLevelList;
+
+    @ApiModelProperty(value = "用户等级")
+    @TableField(exist = false)
+    private Integer userLevel;
+
 }
diff --git a/src/main/java/com/gxwebsoft/shop/service/GoodsPhoneModelService.java b/src/main/java/com/gxwebsoft/shop/service/GoodsPhoneModelService.java
new file mode 100644
index 0000000..087e821
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/shop/service/GoodsPhoneModelService.java
@@ -0,0 +1,46 @@
+package com.gxwebsoft.shop.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.shop.entity.GoodsPhoneModel;
+import com.gxwebsoft.shop.param.GoodsPhoneModelParam;
+
+import java.util.List;
+
+/**
+ * 商品匹配机型Service
+ *
+ * @author 科技小王子
+ * @since 2024-03-12 01:30:55
+ */
+public interface GoodsPhoneModelService extends IService<GoodsPhoneModel> {
+
+    /**
+     * 分页关联查询
+     *
+     * @param param 查询参数
+     * @return PageResult<GoodsPhoneModel>
+     */
+    PageResult<GoodsPhoneModel> pageRel(GoodsPhoneModelParam param);
+
+    /**
+     * 关联查询全部
+     *
+     * @param param 查询参数
+     * @return List<GoodsPhoneModel>
+     */
+    List<GoodsPhoneModel> listRel(GoodsPhoneModelParam param);
+
+    /**
+     * 根据id查询
+     *
+     * @param id 
+     * @return GoodsPhoneModel
+     */
+    GoodsPhoneModel getByIdRel(Integer id);
+
+    List<GoodsPhoneModel> getByModelId(Integer modelId);
+
+    void delByGoodsId(Integer goodsId);
+
+}
diff --git a/src/main/java/com/gxwebsoft/shop/service/GoodsPriceService.java b/src/main/java/com/gxwebsoft/shop/service/GoodsPriceService.java
new file mode 100644
index 0000000..ff144ff
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/shop/service/GoodsPriceService.java
@@ -0,0 +1,44 @@
+package com.gxwebsoft.shop.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.shop.entity.GoodsPrice;
+import com.gxwebsoft.shop.param.GoodsPriceParam;
+
+import java.util.List;
+
+/**
+ * 商品价格()Service
+ *
+ * @author 科技小王子
+ * @since 2024-03-12 01:35:40
+ */
+public interface GoodsPriceService extends IService<GoodsPrice> {
+
+    /**
+     * 分页关联查询
+     *
+     * @param param 查询参数
+     * @return PageResult<GoodsPrice>
+     */
+    PageResult<GoodsPrice> pageRel(GoodsPriceParam param);
+
+    /**
+     * 关联查询全部
+     *
+     * @param param 查询参数
+     * @return List<GoodsPrice>
+     */
+    List<GoodsPrice> listRel(GoodsPriceParam param);
+
+    /**
+     * 根据id查询
+     *
+     * @param id 
+     * @return GoodsPrice
+     */
+    GoodsPrice getByIdRel(Integer id);
+
+    GoodsPrice getByGoodsIdNCity(Integer id, Integer cityId);
+
+}
diff --git a/src/main/java/com/gxwebsoft/shop/service/GoodsService.java b/src/main/java/com/gxwebsoft/shop/service/GoodsService.java
index 98e8c64..0bdbea3 100644
--- a/src/main/java/com/gxwebsoft/shop/service/GoodsService.java
+++ b/src/main/java/com/gxwebsoft/shop/service/GoodsService.java
@@ -2,6 +2,7 @@ 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.Goods;
 import com.gxwebsoft.shop.param.GoodsParam;
 
@@ -39,4 +40,9 @@ public interface GoodsService extends IService<Goods> {
      */
     Goods getByIdRel(Integer goodsId);
 
+    List<Goods> getByPhoneModelCode(String modelCode);
+
+    List<Goods> getByPhoneModel(String phoneModel);
+
+    void setData(List<Goods> goodsList, User loginUser );
 }
diff --git a/src/main/java/com/gxwebsoft/shop/service/OrderRefundService.java b/src/main/java/com/gxwebsoft/shop/service/OrderRefundService.java
index 8f5a2cb..ae9be18 100644
--- a/src/main/java/com/gxwebsoft/shop/service/OrderRefundService.java
+++ b/src/main/java/com/gxwebsoft/shop/service/OrderRefundService.java
@@ -39,4 +39,6 @@ public interface OrderRefundService extends IService<OrderRefund> {
      */
     OrderRefund getByIdRel(Integer orderRefundId);
 
+    OrderRefund getByOrderId(Integer orderId);
+
 }
diff --git a/src/main/java/com/gxwebsoft/shop/service/OrderService.java b/src/main/java/com/gxwebsoft/shop/service/OrderService.java
index a6efb9b..79ef411 100644
--- a/src/main/java/com/gxwebsoft/shop/service/OrderService.java
+++ b/src/main/java/com/gxwebsoft/shop/service/OrderService.java
@@ -1,12 +1,13 @@
 package com.gxwebsoft.shop.service;
 
-import com.alipay.api.response.AlipayTradeQueryResponse;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -26,6 +27,8 @@ public interface OrderService extends IService<Order> {
      */
     PageResult<Order> pageRel(OrderParam param);
 
+    Page<Order> getByPage(OrderParam param);
+
     /**
      * 关联查询全部
      *
@@ -44,9 +47,6 @@ public interface OrderService extends IService<Order> {
 
     Order getByOutTradeNo(String outTradeNo);
 
-    @InterceptorIgnore(tenantLine = "true")
-    void paySuccess(AlipayTradeQueryResponse params);
-
     boolean allinPay(Map<String, String> params);
 
     @InterceptorIgnore(tenantLine = "true")
@@ -57,6 +57,11 @@ public interface OrderService extends IService<Order> {
 
     PageResult<Order> selectPageSettled(OrderParam param);
 
-    void updateByIdSettled(Order order);
+    Integer countNum(OrderParam param);
 
+    BigDecimal sumData(OrderParam param, String field);
+
+    BigDecimal sumIncome(OrderParam param);
+
+    void updateIncome(Order order);
 }
diff --git a/src/main/java/com/gxwebsoft/shop/service/PaymentService.java b/src/main/java/com/gxwebsoft/shop/service/PaymentService.java
index eea8d25..d3766cf 100644
--- a/src/main/java/com/gxwebsoft/shop/service/PaymentService.java
+++ b/src/main/java/com/gxwebsoft/shop/service/PaymentService.java
@@ -1,6 +1,5 @@
 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;
diff --git a/src/main/java/com/gxwebsoft/shop/service/UserBalanceLogService.java b/src/main/java/com/gxwebsoft/shop/service/UserBalanceLogService.java
index ba488f5..2021fe1 100644
--- a/src/main/java/com/gxwebsoft/shop/service/UserBalanceLogService.java
+++ b/src/main/java/com/gxwebsoft/shop/service/UserBalanceLogService.java
@@ -5,6 +5,7 @@ import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.shop.entity.UserBalanceLog;
 import com.gxwebsoft.shop.param.UserBalanceLogParam;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -39,4 +40,6 @@ public interface UserBalanceLogService extends IService<UserBalanceLog> {
      */
     UserBalanceLog getByIdRel(Integer logId);
 
+    BigDecimal sumData(UserBalanceLogParam param);
+
 }
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsPhoneModelServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsPhoneModelServiceImpl.java
new file mode 100644
index 0000000..9785c06
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsPhoneModelServiceImpl.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.shop.mapper.GoodsPhoneModelMapper;
+import com.gxwebsoft.shop.service.GoodsPhoneModelService;
+import com.gxwebsoft.shop.entity.GoodsPhoneModel;
+import com.gxwebsoft.shop.param.GoodsPhoneModelParam;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 商品匹配机型Service实现
+ *
+ * @author 科技小王子
+ * @since 2024-03-12 01:30:55
+ */
+@Service
+public class GoodsPhoneModelServiceImpl extends ServiceImpl<GoodsPhoneModelMapper, GoodsPhoneModel> implements GoodsPhoneModelService {
+
+    @Override
+    public PageResult<GoodsPhoneModel> pageRel(GoodsPhoneModelParam param) {
+        PageParam<GoodsPhoneModel, GoodsPhoneModelParam> page = new PageParam<>(param);
+        //page.setDefaultOrder("create_time desc");
+        List<GoodsPhoneModel> list = baseMapper.selectPageRel(page, param);
+        return new PageResult<>(list, page.getTotal());
+    }
+
+    @Override
+    public List<GoodsPhoneModel> listRel(GoodsPhoneModelParam param) {
+        List<GoodsPhoneModel> list = baseMapper.selectListRel(param);
+        // 排序
+        PageParam<GoodsPhoneModel, GoodsPhoneModelParam> page = new PageParam<>();
+        //page.setDefaultOrder("create_time desc");
+        return page.sortRecords(list);
+    }
+
+    @Override
+    public GoodsPhoneModel getByIdRel(Integer id) {
+        GoodsPhoneModelParam param = new GoodsPhoneModelParam();
+        param.setId(id);
+        return param.getOne(baseMapper.selectListRel(param));
+    }
+
+    @Override
+    public List<GoodsPhoneModel> getByModelId(Integer modelId) {
+        return list(
+                new LambdaQueryWrapper<GoodsPhoneModel>()
+                        .eq(GoodsPhoneModel::getModelId, modelId)
+                        .eq(GoodsPhoneModel::getDeleted, 0)
+        );
+    }
+
+    @Override
+    public void delByGoodsId(Integer goodsId) {
+        remove(
+                new LambdaQueryWrapper<GoodsPhoneModel>()
+                        .eq(GoodsPhoneModel::getGoodsId, goodsId)
+        );
+    }
+
+}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsPriceServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsPriceServiceImpl.java
new file mode 100644
index 0000000..0de1ce0
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsPriceServiceImpl.java
@@ -0,0 +1,59 @@
+package com.gxwebsoft.shop.service.impl;
+
+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.shop.entity.GoodsService;
+import com.gxwebsoft.shop.mapper.GoodsPriceMapper;
+import com.gxwebsoft.shop.service.GoodsPriceService;
+import com.gxwebsoft.shop.entity.GoodsPrice;
+import com.gxwebsoft.shop.param.GoodsPriceParam;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 商品价格()Service实现
+ *
+ * @author 科技小王子
+ * @since 2024-03-12 01:35:40
+ */
+@Service
+public class GoodsPriceServiceImpl extends ServiceImpl<GoodsPriceMapper, GoodsPrice> implements GoodsPriceService {
+
+    @Override
+    public PageResult<GoodsPrice> pageRel(GoodsPriceParam param) {
+        PageParam<GoodsPrice, GoodsPriceParam> page = new PageParam<>(param);
+        //page.setDefaultOrder("create_time desc");
+        List<GoodsPrice> list = baseMapper.selectPageRel(page, param);
+        return new PageResult<>(list, page.getTotal());
+    }
+
+    @Override
+    public List<GoodsPrice> listRel(GoodsPriceParam param) {
+        List<GoodsPrice> list = baseMapper.selectListRel(param);
+        // 排序
+        PageParam<GoodsPrice, GoodsPriceParam> page = new PageParam<>();
+        //page.setDefaultOrder("create_time desc");
+        return page.sortRecords(list);
+    }
+
+    @Override
+    public GoodsPrice getByIdRel(Integer id) {
+        GoodsPriceParam param = new GoodsPriceParam();
+        param.setId(id);
+        return param.getOne(baseMapper.selectListRel(param));
+    }
+
+    @Override
+    public GoodsPrice getByGoodsIdNCity(Integer id, Integer cityId) {
+        return getOne(
+                new LambdaQueryWrapper<GoodsPrice>()
+                        .eq(GoodsPrice::getGoodsId, id)
+                        .eq(GoodsPrice::getCity, cityId)
+        );
+    }
+
+}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceImpl.java
index c7408e5..ec6be71 100644
--- a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceImpl.java
@@ -1,15 +1,26 @@
 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.common.system.entity.User;
 import com.gxwebsoft.shop.entity.Goods;
+import com.gxwebsoft.shop.entity.GoodsPhoneModel;
+import com.gxwebsoft.shop.entity.GoodsPrice;
 import com.gxwebsoft.shop.mapper.GoodsMapper;
 import com.gxwebsoft.shop.param.GoodsParam;
+import com.gxwebsoft.shop.param.GoodsPhoneModelParam;
+import com.gxwebsoft.shop.service.GoodsPhoneModelService;
+import com.gxwebsoft.shop.service.GoodsPriceService;
 import com.gxwebsoft.shop.service.GoodsService;
+import com.gxwebsoft.vivo.entity.VivoPhoneModel;
+import com.gxwebsoft.vivo.service.VivoPhoneModelService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 商品记录表Service实现
@@ -20,6 +31,13 @@ import java.util.List;
 @Service
 public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements GoodsService {
 
+    @Resource
+    private VivoPhoneModelService vivoPhoneModelService;
+    @Resource
+    private GoodsPhoneModelService goodsPhoneModelService;
+    @Resource
+    private GoodsPriceService goodsPriceService;
+
     @Override
     public PageResult<Goods> pageRel(GoodsParam param) {
         PageParam<Goods, GoodsParam> page = new PageParam<>(param);
@@ -44,4 +62,45 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         return param.getOne(baseMapper.selectListRel(param));
     }
 
+    @Override
+    public List<Goods> getByPhoneModelCode(String modelCode) {
+        VivoPhoneModel vivoPhoneModel = vivoPhoneModelService.getModelByCode(modelCode);
+        if (vivoPhoneModel != null) {
+            List<GoodsPhoneModel> goodsPhoneModel = goodsPhoneModelService.getByModelId(vivoPhoneModel.getId());
+            if (!goodsPhoneModel.isEmpty()) {
+                return list(
+                        new LambdaQueryWrapper<Goods>()
+                                .in(Goods::getGoodsId, goodsPhoneModel.stream().map(GoodsPhoneModel::getGoodsId).collect(Collectors.toList()))
+                );
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public List<Goods> getByPhoneModel(String phoneModel) {
+        VivoPhoneModel vivoPhoneModel = vivoPhoneModelService.getModelByName(phoneModel);
+        if (vivoPhoneModel != null) {
+            List<GoodsPhoneModel> goodsPhoneModel = goodsPhoneModelService.getByModelId(vivoPhoneModel.getId());
+            if (!goodsPhoneModel.isEmpty()) {
+                return list(
+                        new LambdaQueryWrapper<Goods>()
+                                .in(Goods::getGoodsId, goodsPhoneModel.stream().map(GoodsPhoneModel::getGoodsId).collect(Collectors.toList()))
+                );
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public void setData(List<Goods> goodsList, User loginUser ) {
+        goodsList.forEach(goods -> {
+            goods.setGoodsPhoneModelList(goodsPhoneModelService.listRel(
+                    new GoodsPhoneModelParam() {{
+                        setGoodsId(goods.getGoodsId());
+                    }}));
+            GoodsPrice goodsPrice = goodsPriceService.getByGoodsIdNCity(goods.getGoodsId(), loginUser.getCityId());
+            goods.setGoodsPrice(goodsPrice);
+        });
+    }
 }
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/OrderRefundServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/OrderRefundServiceImpl.java
index 8ea3545..f53cf1e 100644
--- a/src/main/java/com/gxwebsoft/shop/service/impl/OrderRefundServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/shop/service/impl/OrderRefundServiceImpl.java
@@ -1,5 +1,6 @@
 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.shop.mapper.OrderRefundMapper;
 import com.gxwebsoft.shop.service.OrderRefundService;
@@ -44,4 +45,12 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
         return param.getOne(baseMapper.selectListRel(param));
     }
 
+    @Override
+    public OrderRefund getByOrderId(Integer orderId) {
+        return getOne(
+                new LambdaQueryWrapper<OrderRefund>()
+                        .eq(OrderRefund::getOrderId, orderId)
+        );
+    }
+
 }
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/OrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/OrderServiceImpl.java
index 2682087..4e7f476 100644
--- a/src/main/java/com/gxwebsoft/shop/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/shop/service/impl/OrderServiceImpl.java
@@ -1,27 +1,34 @@
 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.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.service.EquipmentGoodsService;
-import com.gxwebsoft.apps.service.EquipmentService;
+import com.github.yulichang.query.MPJQueryWrapper;
 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.common.system.entity.User;
+import com.gxwebsoft.common.system.service.UserService;
+import com.gxwebsoft.shop.entity.*;
 import com.gxwebsoft.shop.mapper.OrderMapper;
 import com.gxwebsoft.shop.param.OrderParam;
+import com.gxwebsoft.shop.service.GoodsPriceService;
+import com.gxwebsoft.shop.service.GoodsService;
 import com.gxwebsoft.shop.service.OrderGoodsService;
 import com.gxwebsoft.shop.service.OrderService;
+import com.gxwebsoft.shop.service.UserBalanceLogService;
+import com.gxwebsoft.vivo.entity.VivoFixStore;
+import com.gxwebsoft.vivo.service.VivoFixStoreService;
+import org.springframework.security.core.parameters.P;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -39,98 +46,128 @@ import static com.gxwebsoft.common.core.constants.OrderConstants.*;
  */
 @Service
 public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> 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<Order> pageRel(OrderParam param) {
-    PageParam<Order, OrderParam> page = new PageParam<>(param);
-    page.setDefaultOrder("delivery_time desc,create_time desc");
-    List<Order> list = baseMapper.selectPageRel(page, param);
-    // 是否查询订单商品
-    if(param.getShowGoodsList() != null){
-      list.forEach(d -> {
-        final List<OrderGoods> goodsList = orderGoodsService.list(new LambdaQueryWrapper<OrderGoods>().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, 21);
-          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 = " + before);
-          } catch (ParseException e) {
-            e.printStackTrace();
-          }
-        });
-        d.setGoodsList(goodsList);
-      });
-    }
-    return new PageResult<>(list, page.getTotal());
-  }
+    @Resource
+    private OrderService orderService;
+    @Resource
+    private OrderGoodsService orderGoodsService;
+    @Resource
+    private CacheClient cacheClient;
+    @Resource
+    private UserService userService;
+    @Resource
+    private UserBalanceLogService userBalanceLogService;
+    @Resource
+    private VivoFixStoreService fixStoreService;
+    @Resource
+    private GoodsService goodsService;
 
-  @Override
-  public List<Order> listRel(OrderParam param) {
-    List<Order> list = baseMapper.selectListRel(param);
-    // 排序
-    PageParam<Order, OrderParam> 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<String, String> 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;
+    @Override
+    public PageResult<Order> pageRel(OrderParam param) {
+        PageParam<Order, OrderParam> page = new PageParam<>(param);
+//        param.setOrder("desc");
+//        param.setSort("create_time");
+        page.setDefaultOrder("create_time desc, order_id desc");
+        List<Order> list = baseMapper.selectPageRel(page, param);
+        return new PageResult<>(list, page.getTotal());
     }
 
-    // 2.订单金额是否一致
-    final BigDecimal payPrice = new BigDecimal(trxamt).divide(new BigDecimal(100));
+    @Override
+    public Page<Order> getByPage(OrderParam param) {
+        Page<Order> pageParam = new Page<>(param.getPage(), param.getLimit());
+        MPJQueryWrapper<Order> wrapper = new MPJQueryWrapper<>();
+        wrapper.setAlias("o");
+        wrapper.leftJoin(true, " shop_goods as goods ON goods.goods_id = o.goods_id");
+        wrapper.leftJoin(true, " sys_user as user ON user.user_id = o.user_id");
+        wrapper.select("o.*, goods.goods_name");
+        if (param.getOrderStatus() != null) {
+            wrapper.eq("order_status", param.getOrderStatus());
+        }
+        if (param.getCreateTimeStart() != null && !param.getCreateTimeStart().isEmpty()) {
+            wrapper.between("o.create_time", param.getCreateTimeStart(), param.getCreateTimeEnd());
+        }
+        if (param.getStoreId() != null) {
+            wrapper.eq("o.store_id", param.getStoreId());
+        }
+        if (param.getOrgId() != null) {
+            wrapper.eq("o.org_id", param.getOrgId());
+        }
+        if (param.getCityId() != null) {
+            wrapper.eq("o.city_id", param.getCityId());
+        }
+        if (param.getUserId() != null) {
+            wrapper.eq("o.user_id", param.getUserId());
+        }
+        if (param.getKeywords() != null && !param.getKeywords().isEmpty()) {
+            wrapper.like("order_no", param.getKeywords())
+                    .or().like("user.phone", param.getKeywords())
+                    .or().like("user.real_name", param.getKeywords())
+                    .or().like("o.sku_name", param.getKeywords())
+            ;
+        }
+        if (param.getSort() == null && param.getOrder() == null) {
+            wrapper.orderByDesc("o.order_id");
+        } else {
+            wrapper.orderBy(true, param.getOrder().equals("asc"), param.getSort());
+        }
+        if (param.getUserLevelList() != null && !param.getUserLevelList().isEmpty()) {
+            wrapper.in("user.user_level", param.getUserLevelList());
+        }
+        return page(pageParam, wrapper);
+    }
 
-    // 3.订单商户是否一致
+    @Override
+    public List<Order> listRel(OrderParam param) {
+        List<Order> list = baseMapper.selectListRel(param);
+        // 排序
+        PageParam<Order, OrderParam> 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<String, String> 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是否一致
+        // 4.验证appId是否一致
 //    String appId = params.get("app_id");
 //    System.out.println("验证appId是否一致"+appId);
 //    String appIdPro = "2021003156628508";
@@ -138,112 +175,184 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 //      System.out.println("验证appId校验失败");
 //      return false;
 //    }
-    // 5.判断交易状态
-    if (!"2".equals(trxStatus)) {
-      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);
     }
-    // 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 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 boolean updateByIdRel(Order order) {
+        return baseMapper.updateByIdRel(order);
+    }
 
     @Override
     public PageResult<Order> selectPageSettled(OrderParam param) {
-      PageParam<Order, OrderParam> page = new PageParam<>(param);
-      //page.setDefaultOrder("create_time desc");
-      List<Order> list = baseMapper.selectPageSettled(page, param);
-      return new PageResult<>(list, page.getTotal());
+        PageParam<Order, OrderParam> page = new PageParam<>(param);
+        //page.setDefaultOrder("create_time desc");
+        List<Order> 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;
+    @Override
+    public Integer countNum(OrderParam param) {
+        return count(
+                new LambdaQueryWrapper<Order>()
+//                        .in(Order::getOrderStatus, 2, 3)
+                        .between(Order::getCreateTime, param.getCreateTimeStart(), param.getCreateTimeEnd())
+        );
     }
 
-    // 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);
+    @Override
+    public BigDecimal sumData(OrderParam param, String field) {
+        Order data = getOne(
+                new QueryWrapper<Order>()
+                        .select("SUM(`" + field + "`) AS total_amount")
+//                        .in("order_status", 2, 3)
+                        .between("create_time", param.getCreateTimeStart(), param.getCreateTimeEnd())
+        );
+        return data == null ? BigDecimal.ZERO : data.getTotalAmount();
     }
-  }
 
-  /**
-   * 批量查询订单的关联商品
-   *
-   * @param orders 商品集合
-   */
-  private void selectOrderGoods(List<Order> orders) {
-    if (orders != null && orders.size() > 0) {
-      List<Integer> orderIds = orders.stream().map(Order::getOrderId).collect(Collectors.toList());
-      List<OrderGoods> orderGoods = orderGoodsService.listByOrderIds(orderIds);
-      for (Order order : orders) {
-        List<OrderGoods> goodsList = orderGoods.stream().filter(d -> order.getOrderId().equals(d.getOrderId()))
-          .collect(Collectors.toList());
-        order.setGoodsList(goodsList);
-      }
+    @Override
+    public BigDecimal sumIncome(OrderParam param) {
+        Order data = getOne(
+                new QueryWrapper<Order>()
+                        .select("SUM(`total_price`) AS total_amount")
+                        .in("order_status", 2, 3)
+                        .between("create_time", param.getCreateTimeStart(), param.getCreateTimeEnd())
+        );
+        return data == null ? BigDecimal.ZERO : data.getTotalAmount();
+    }
+
+    @Override
+    public void updateIncome(Order order) {
+        User orderUser = userService.getById(order.getUserId());
+        orderUser.setTotalIncome(orderUser.getTotalIncome().add(order.getCommission()));
+        orderUser.setBalance(orderUser.getBalance().add(order.getCommission()));
+        userService.updateById(orderUser);
+        userBalanceLogService.save(
+                new UserBalanceLog() {{
+                    setOrderId(order.getOrderId());
+                    setUserId(orderUser.getUserId());
+                    setScene(0);
+                    setMoney(order.getCommission());
+                    setBalance(orderUser.getBalance());
+                    setTenantId(10049);
+                    setCreateTime(DateUtil.date());
+                    setRemark("订单:" + order.getOrderNo() + "支付返利");
+                }}
+        );
+        // 总售后收入
+        User mainAdmin = userService.getCityLevel2(orderUser.getCityId());
+        BigDecimal mainAdminIncome = order.getTotalPrice()
+                .subtract(order.getCommission());
+        // 售后店长提成
+//        if (orderUser.getUserLevel().equals(5) || orderUser.getUserLevel().equals(8)) {
+//            if (order.getFixStoreId() != 0
+//                    && orderUser.getFixStoreId() != null) {
+//                VivoFixStore fixStore = fixStoreService.getById(orderUser.getFixStoreId());
+//                if (fixStore != null) {
+//                    User fixStoreUser = userService.getById(fixStore.getUserId());
+//                    if (order.getFixStoreLeaderCommission() != null && fixStoreUser != null) {
+//                        fixStoreUser.setTotalIncome(fixStoreUser.getTotalIncome().add(order.getFixStoreLeaderCommission()));
+//                        fixStoreUser.setBalance(fixStoreUser.getBalance().add(order.getFixStoreLeaderCommission()));
+//                        userService.updateById(fixStoreUser);
+//
+//                        userBalanceLogService.save(
+//                                new UserBalanceLog() {{
+//                                    setOrderId(order.getOrderId());
+//                                    setUserId(fixStoreUser.getUserId());
+//                                    setScene(0);
+//                                    setMoney(order.getFixStoreLeaderCommission());
+//                                    setBalance(fixStoreUser.getBalance());
+//                                    setTenantId(10049);
+//                                    setCreateTime(DateUtil.date());
+//                                    setRemark("订单:" + order.getOrderNo() + "支付获得门店返利");
+//                                }}
+//                        );
+//
+//                        mainAdminIncome = mainAdminIncome.subtract(order.getFixStoreLeaderCommission());
+//                    }
+//                }
+//            }
+//        }else{
+        Goods goods = goodsService.getById(order.getGoodsId());
+        mainAdminIncome = goods.getCost();
+//        }
+
+        User cityAgent = userService.getCityAgent(orderUser.getCityId());
+        if (order.getFixStoreId() == 0
+                && cityAgent != null
+                && order.getAgentCommission() != null
+                && order.getAgentCommission().compareTo(BigDecimal.ZERO) > 0) {
+            cityAgent.setTotalIncome(cityAgent.getTotalIncome().add(order.getAgentCommission()));
+            cityAgent.setBalance(cityAgent.getBalance().add(order.getAgentCommission()));
+            userService.updateById(cityAgent);
+
+            userBalanceLogService.save(
+                    new UserBalanceLog() {{
+                        setOrderId(order.getOrderId());
+                        setUserId(cityAgent.getUserId());
+                        setScene(0);
+                        setMoney(order.getAgentCommission());
+                        setBalance(cityAgent.getBalance());
+                        setTenantId(10049);
+                        setCreateTime(DateUtil.date());
+                        setRemark("订单:" + order.getOrderNo() + "支付获得区域代理返利");
+                    }}
+            );
+        }
+
+        if (mainAdmin != null) {
+            mainAdmin.setTotalIncome(mainAdminIncome);
+            mainAdmin.setBalance(mainAdminIncome);
+            userService.updateById(mainAdmin);
+            BigDecimal finalMainAdminIncome = mainAdminIncome;
+            userBalanceLogService.save(
+                    new UserBalanceLog() {{
+                        setOrderId(order.getOrderId());
+                        setUserId(mainAdmin.getUserId());
+                        setScene(0);
+                        setMoney(finalMainAdminIncome);
+                        setBalance(mainAdmin.getBalance());
+                        setTenantId(10049);
+                        setCreateTime(DateUtil.date());
+                        setRemark("订单:" + order.getOrderNo() + "支付获得总售后返利");
+                    }}
+            );
+        }
+
+    }
+
+    /**
+     * 批量查询订单的关联商品
+     *
+     * @param orders 商品集合
+     */
+    private void selectOrderGoods(List<Order> orders) {
+        if (orders != null && orders.size() > 0) {
+            List<Integer> orderIds = orders.stream().map(Order::getOrderId).collect(Collectors.toList());
+            List<OrderGoods> orderGoods = orderGoodsService.listByOrderIds(orderIds);
+            for (Order order : orders) {
+                List<OrderGoods> 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
index 9fee559..efb06a1 100644
--- a/src/main/java/com/gxwebsoft/shop/service/impl/PaymentServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/shop/service/impl/PaymentServiceImpl.java
@@ -1,9 +1,5 @@
 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;
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/UserBalanceLogServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserBalanceLogServiceImpl.java
index 374ccf0..b60ac5f 100644
--- a/src/main/java/com/gxwebsoft/shop/service/impl/UserBalanceLogServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/shop/service/impl/UserBalanceLogServiceImpl.java
@@ -1,7 +1,10 @@
 package com.gxwebsoft.shop.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gxwebsoft.shop.entity.Order;
 import com.gxwebsoft.shop.mapper.UserBalanceLogMapper;
+import com.gxwebsoft.shop.param.OrderParam;
 import com.gxwebsoft.shop.service.UserBalanceLogService;
 import com.gxwebsoft.shop.entity.UserBalanceLog;
 import com.gxwebsoft.shop.param.UserBalanceLogParam;
@@ -9,6 +12,7 @@ import com.gxwebsoft.common.core.web.PageParam;
 import com.gxwebsoft.common.core.web.PageResult;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -23,7 +27,7 @@ public class UserBalanceLogServiceImpl extends ServiceImpl<UserBalanceLogMapper,
     @Override
     public PageResult<UserBalanceLog> pageRel(UserBalanceLogParam param) {
         PageParam<UserBalanceLog, UserBalanceLogParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
+        page.setDefaultOrder("a.create_time desc");
         List<UserBalanceLog> list = baseMapper.selectPageRel(page, param);
         return new PageResult<>(list, page.getTotal());
     }
@@ -33,7 +37,7 @@ public class UserBalanceLogServiceImpl extends ServiceImpl<UserBalanceLogMapper,
         List<UserBalanceLog> list = baseMapper.selectListRel(param);
         // 排序
         PageParam<UserBalanceLog, UserBalanceLogParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
+        page.setDefaultOrder("a.create_time desc");
         return page.sortRecords(list);
     }
 
@@ -44,4 +48,15 @@ public class UserBalanceLogServiceImpl extends ServiceImpl<UserBalanceLogMapper,
         return param.getOne(baseMapper.selectListRel(param));
     }
 
+    @Override
+    public BigDecimal sumData(UserBalanceLogParam param) {
+        UserBalanceLog data = getOne(
+                new QueryWrapper<UserBalanceLog>()
+                        .select("SUM(`money`) AS total_amount")
+                        .eq("scene", param.getScene())
+                        .between("create_time", param.getCreateTimeStart(), param.getCreateTimeEnd())
+        );
+        return data == null ? BigDecimal.ZERO : data.getTotalAmount();
+    }
+
 }
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerAccessoryController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerAccessoryController.java
deleted file mode 100644
index 831beba..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerAccessoryController.java
+++ /dev/null
@@ -1,132 +0,0 @@
-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<PageResult<TowerAccessory>> page(TowerAccessoryParam param) {
-        // 使用关联查询
-        return success(towerAccessoryService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerAccessory:list')")
-    @OperationLog
-    @ApiOperation("查询全部配件管理")
-    @GetMapping()
-    public ApiResult<List<TowerAccessory>> list(TowerAccessoryParam param) {
-        // 使用关联查询
-        return success(towerAccessoryService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerAccessory:list')")
-    @OperationLog
-    @ApiOperation("根据id查询配件管理")
-    @GetMapping("/{id}")
-    public ApiResult<TowerAccessory> 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<TowerAccessory> list) {
-        if (towerAccessoryService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerAccessory:update')")
-    @OperationLog
-    @ApiOperation("批量修改配件管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerAccessory> 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<Integer> ids) {
-        if (towerAccessoryService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerContractController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerContractController.java
deleted file mode 100644
index bd54c98..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerContractController.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.Company;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.*;
-import com.gxwebsoft.tower.mapper.TowerContractMapper;
-import com.gxwebsoft.tower.service.TowerContractService;
-import com.gxwebsoft.tower.param.TowerContractParam;
-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.tower.service.TowerContractSettleEquipmentService;
-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 java.util.Map;
-
-/**
- * 合同存档控制器
- *
- * @author 科技小王子
- * @since 2023-06-08 22:36:47
- */
-@Api(tags = "合同存档管理")
-@RestController
-@RequestMapping("/api/tower/tower-contract")
-public class TowerContractController extends BaseController {
-    @Resource
-    private TowerContractService towerContractService;
-    @Resource
-    private TowerContractSettleEquipmentService towerContractSettleEquipmentService;
-
-    @PreAuthorize("hasAuthority('tower:towerContract:list')")
-    @OperationLog
-    @ApiOperation("分页查询合同存档")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerContract>> page(TowerContractParam param) {
-        MPJLambdaWrapper<TowerContract> wrapper = new MPJLambdaWrapper<>();
-        wrapper.selectAll(TowerContract.class)
-                .selectAs(TowerCustomer::getName, TowerContract::getCustomerName)
-                .selectAs(Company::getCompanyName, TowerContract::getCompanyName)
-                .leftJoin(TowerCustomer.class, TowerCustomer::getCustomerId, TowerContract::getCustomerId)
-                .leftJoin(Company.class, Company::getCompanyId, TowerContract::getCompanyId);
-        PageParam<TowerContract, TowerContractParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        PageResult<TowerContract> pageRes = towerContractService.pageRel(param);
-        return success(pageRes);
-//        return success(towerContractService.page(page, wrapper));
-        // 使用关联查询
-        //return success(towerContractService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContract:list')")
-    @OperationLog
-    @ApiOperation("查询全部合同存档")
-    @GetMapping()
-    public ApiResult<List<TowerContract>> list(TowerContractParam param) {
-        PageParam<TowerContract, TowerContractParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerContractService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerContractService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContract:list')")
-    @OperationLog
-    @ApiOperation("根据id查询合同存档")
-    @GetMapping("/{id}")
-    public ApiResult<TowerContract> get(@PathVariable("id") Integer id) {
-        return success(towerContractService.getById(id));
-        // 使用关联查询
-        //return success(towerContractService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContract:save')")
-    @OperationLog
-    @ApiOperation("添加合同存档")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerContract towerContract) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-            towerContract.setUserId(loginUser.getUserId());
-        }
-        if (towerContractService.save(towerContract)) {
-            return success(towerContract.getContractId());
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContract:update')")
-    @OperationLog
-    @ApiOperation("修改合同存档")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerContract towerContract) {
-        if (towerContractService.updateById(towerContract)) {
-            return success(towerContract.getContractId());
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContract:remove')")
-    @OperationLog
-    @ApiOperation("删除合同存档")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerContractService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContract:save')")
-    @OperationLog
-    @ApiOperation("批量添加合同存档")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerContract> list) {
-        if (towerContractService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContract:update')")
-    @OperationLog
-    @ApiOperation("批量修改合同存档")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerContract> batchParam) {
-        if (batchParam.update(towerContractService, "contract_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContract:remove')")
-    @OperationLog
-    @ApiOperation("批量删除合同存档")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerContractService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerContractEquipmentController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerContractEquipmentController.java
deleted file mode 100644
index 0c9a12c..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerContractEquipmentController.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.TowerContractFile;
-import com.gxwebsoft.tower.entity.TowerEquipment;
-import com.gxwebsoft.tower.service.TowerContractEquipmentService;
-import com.gxwebsoft.tower.entity.TowerContractEquipment;
-import com.gxwebsoft.tower.param.TowerContractEquipmentParam;
-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.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 合同设备清单控制器
- *
- * @author 科技小王子
- * @since 2023-06-09 13:42:20
- */
-@Api(tags = "合同设备清单管理")
-@RestController
-@RequestMapping("/api/tower/tower-contract-equipment")
-public class TowerContractEquipmentController extends BaseController {
-    @Resource
-    private TowerContractEquipmentService towerContractEquipmentService;
-
-    @OperationLog
-    @ApiOperation("分页查询合同设备清单")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerContractEquipment>> page(TowerContractEquipmentParam param) {
-        PageParam<TowerContractEquipment, TowerContractEquipmentParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerContractEquipmentService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(towerContractEquipmentService.pageRel(param));
-    }
-
-    @OperationLog
-    @ApiOperation("查询全部合同设备清单")
-    @GetMapping()
-    public ApiResult<List<TowerContractEquipment>> list(@RequestParam Map<String, String> params) {
-        int contractId = Integer.parseInt(params.get("contractId"));
-
-        MPJLambdaWrapper<TowerContractEquipment> wrapper = new MPJLambdaWrapper<>();
-        wrapper.eq(TowerContractEquipment::getContractId, contractId)
-        .selectAll(TowerContractEquipment.class)
-                .selectAs(TowerEquipment::getName, TowerEquipment::getEquipmentName)
-                .select(TowerEquipment::getFactoryNo)
-                .select(TowerEquipment::getEquipmentNo)
-                .select(TowerEquipment::getFilingNo)
-                .leftJoin(TowerEquipment.class, TowerEquipment::getEquipmentId, TowerContractEquipment::getEquipmentId);
-        TowerContractEquipmentParam towerContractEquipmentParam = new TowerContractEquipmentParam();
-//        towerContractEquipmentParam.setContractId(contractId);
-
-        PageParam<TowerContractEquipment, TowerContractEquipmentParam> page = new PageParam<>(towerContractEquipmentParam);
-        page.setDefaultOrder("create_time desc");
-        return success(towerContractEquipmentService.list(wrapper));
-        // 使用关联查询
-        //return success(towerContractEquipmentService.listRel(param));
-    }
-
-    @OperationLog
-    @ApiOperation("根据id查询合同设备清单")
-    @GetMapping("/{id}")
-    public ApiResult<TowerContractEquipment> get(@PathVariable("id") Integer id) {
-        return success(towerContractEquipmentService.getById(id));
-        // 使用关联查询
-        //return success(towerContractEquipmentService.getByIdRel(id));
-    }
-
-    @OperationLog
-    @ApiOperation("添加合同设备清单")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerContractEquipment towerContractEquipment) {
-        // 记录当前登录用户idfc vbnm,dxcybc yhguc
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-            towerContractEquipment.setUserId(loginUser.getUserId());
-        }
-        if (towerContractEquipmentService.save(towerContractEquipment)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @OperationLog
-    @ApiOperation("修改合同设备清单")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerContractEquipment towerContractEquipment) {
-        if (towerContractEquipmentService.updateById(towerContractEquipment)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @OperationLog
-    @ApiOperation("删除合同设备清单")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerContractEquipmentService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @OperationLog
-    @ApiOperation("批量添加合同设备清单")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerContractEquipment> list) {
-        QueryWrapper<TowerContractEquipment> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("contract_id", list.get(0).getContractId());
-        towerContractEquipmentService.remove(queryWrapper);
-        if (towerContractEquipmentService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @OperationLog
-    @ApiOperation("批量修改合同设备清单")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerContractEquipment> batchParam) {
-        if (batchParam.update(towerContractEquipmentService, "contract_equipment_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @OperationLog
-    @ApiOperation("批量删除合同设备清单")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerContractEquipmentService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerContractFileController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerContractFileController.java
deleted file mode 100644
index a3eba54..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerContractFileController.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.service.TowerContractFileService;
-import com.gxwebsoft.tower.entity.TowerContractFile;
-import com.gxwebsoft.tower.param.TowerContractFileParam;
-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.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 合同附件控制器
- *
- * @author 科技小王子
- * @since 2023-06-09 13:42:20
- */
-@Api(tags = "合同附件管理")
-@RestController
-@RequestMapping("/api/tower/tower-contract-file")
-public class TowerContractFileController extends BaseController {
-    @Resource
-    private TowerContractFileService towerContractFileService;
-
-    @OperationLog
-    @ApiOperation("分页查询合同附件")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerContractFile>> page(TowerContractFileParam param) {
-        PageParam<TowerContractFile, TowerContractFileParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerContractFileService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(towerContractFileService.pageRel(param));
-    }
-
-    @OperationLog
-    @PreAuthorize("permitAll()")
-    @ApiOperation("查询全部合同附件")
-    @GetMapping()
-    public ApiResult<List<TowerContractFile>> list(TowerContractFileParam param) {
-        PageParam<TowerContractFile, TowerContractFileParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerContractFileService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerContractFileService.listRel(param));
-    }
-
-    @OperationLog
-    @ApiOperation("根据id查询合同附件")
-    @GetMapping("/{id}")
-    public ApiResult<TowerContractFile> get(@PathVariable("id") Integer id) {
-        return success(towerContractFileService.getById(id));
-        // 使用关联查询
-        //return success(towerContractFileService.getByIdRel(id));
-    }
-
-    @OperationLog
-    @ApiOperation("添加合同附件")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerContractFile towerContractFile) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-            towerContractFile.setUserId(loginUser.getUserId());
-        }
-        if (towerContractFileService.save(towerContractFile)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @OperationLog
-    @ApiOperation("修改合同附件")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerContractFile towerContractFile) {
-        if (towerContractFileService.updateById(towerContractFile)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @OperationLog
-    @ApiOperation("删除合同附件")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerContractFileService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @OperationLog
-    @PreAuthorize("permitAll()")
-    @ApiOperation("批量添加合同附件")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerContractFile> list) {
-        QueryWrapper<TowerContractFile> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("contract_id", list.get(0).getContractId());
-        towerContractFileService.remove(queryWrapper);
-        if (towerContractFileService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @OperationLog
-    @ApiOperation("批量修改合同附件")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerContractFile> batchParam) {
-        if (batchParam.update(towerContractFileService, "contract_file_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @OperationLog
-    @ApiOperation("批量删除合同附件")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerContractFileService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerContractFinalSettleController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerContractFinalSettleController.java
deleted file mode 100644
index cef6e37..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerContractFinalSettleController.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.Company;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.*;
-import com.gxwebsoft.tower.service.TowerContractFinalSettleService;
-import com.gxwebsoft.tower.param.TowerContractFinalSettleParam;
-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-06-17 22:34:32
- */
-@Api(tags = "项目结算书管理")
-@RestController
-@RequestMapping("/api/tower/tower-contract-final-settle")
-public class TowerContractFinalSettleController extends BaseController {
-    @Resource
-    private TowerContractFinalSettleService towerContractFinalSettleService;
-
-    @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:list')")
-    @OperationLog
-    @ApiOperation("分页查询项目结算书")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerContractFinalSettle>> page(TowerContractFinalSettleParam param) {
-        MPJLambdaWrapper<TowerContractFinalSettle> wrapper = new MPJLambdaWrapper<>();
-        wrapper.selectAll(TowerContractFinalSettle.class)
-                .select(TowerContract::getContactNumber)
-                .select(TowerContract::getTotalInvoicingAmount)
-                .select(TowerContract::getTotalIncomeAmount)
-                .select(TowerContract::getEndDate)
-                .select(Company::getCompanyName)
-                .leftJoin(TowerContract.class, TowerContract::getContractId, TowerContractFinalSettle::getContractId)
-                .leftJoin(Company.class, Company::getCompanyId, TowerContractFinalSettle::getSettleCompanyId);
-        PageParam<TowerContractFinalSettle, TowerContractFinalSettleParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerContractFinalSettleService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(towerContractFinalSettleService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:list')")
-    @OperationLog
-    @ApiOperation("查询全部项目结算书")
-    @GetMapping()
-    public ApiResult<List<TowerContractFinalSettle>> list(TowerContractFinalSettleParam param) {
-        PageParam<TowerContractFinalSettle, TowerContractFinalSettleParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerContractFinalSettleService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerContractFinalSettleService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:list')")
-    @OperationLog
-    @ApiOperation("根据id查询项目结算书")
-    @GetMapping("/{id}")
-    public ApiResult<TowerContractFinalSettle> get(@PathVariable("id") Integer id) {
-        return success(towerContractFinalSettleService.getById(id));
-        // 使用关联查询
-        //return success(towerContractFinalSettleService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:save')")
-    @OperationLog
-    @ApiOperation("添加项目结算书")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerContractFinalSettle towerContractFinalSettle) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerContractFinalSettle.setUserId(loginUser.getUserId());
-        }
-        if (towerContractFinalSettleService.save(towerContractFinalSettle)) {
-            return success(towerContractFinalSettle.getContractFinalSettleId());
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:update')")
-    @OperationLog
-    @ApiOperation("修改项目结算书")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerContractFinalSettle towerContractFinalSettle) {
-        if (towerContractFinalSettleService.updateById(towerContractFinalSettle)) {
-            return success(towerContractFinalSettle.getContractFinalSettleId());
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:remove')")
-    @OperationLog
-    @ApiOperation("删除项目结算书")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerContractFinalSettleService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:save')")
-    @OperationLog
-    @ApiOperation("批量添加项目结算书")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerContractFinalSettle> list) {
-        if (towerContractFinalSettleService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:update')")
-    @OperationLog
-    @ApiOperation("批量修改项目结算书")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerContractFinalSettle> batchParam) {
-        if (batchParam.update(towerContractFinalSettleService, "contract_final_settle_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:remove')")
-    @OperationLog
-    @ApiOperation("批量删除项目结算书")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerContractFinalSettleService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerContractFinalSettleLostController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerContractFinalSettleLostController.java
deleted file mode 100644
index 52dd37f..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerContractFinalSettleLostController.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.service.TowerContractFinalSettleLostService;
-import com.gxwebsoft.tower.entity.TowerContractFinalSettleLost;
-import com.gxwebsoft.tower.param.TowerContractFinalSettleLostParam;
-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-06-18 00:52:41
- */
-@Api(tags = "结算书缺失物品管理")
-@RestController
-@RequestMapping("/api/tower/tower-contract-final-settle-lost")
-public class TowerContractFinalSettleLostController extends BaseController {
-    @Resource
-    private TowerContractFinalSettleLostService towerContractFinalSettleLostService;
-
-    @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:list')")
-    @OperationLog
-    @ApiOperation("分页查询结算书缺失物品")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerContractFinalSettleLost>> page(TowerContractFinalSettleLostParam param) {
-        PageParam<TowerContractFinalSettleLost, TowerContractFinalSettleLostParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerContractFinalSettleLostService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(towerContractFinalSettleLostService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:list')")
-    @OperationLog
-    @ApiOperation("查询全部结算书缺失物品")
-    @GetMapping()
-    public ApiResult<List<TowerContractFinalSettleLost>> list(TowerContractFinalSettleLostParam param) {
-        PageParam<TowerContractFinalSettleLost, TowerContractFinalSettleLostParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerContractFinalSettleLostService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerContractFinalSettleLostService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:list')")
-    @OperationLog
-    @ApiOperation("根据id查询结算书缺失物品")
-    @GetMapping("/{id}")
-    public ApiResult<TowerContractFinalSettleLost> get(@PathVariable("id") Integer id) {
-        return success(towerContractFinalSettleLostService.getById(id));
-        // 使用关联查询
-        //return success(towerContractFinalSettleLostService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:save')")
-    @OperationLog
-    @ApiOperation("添加结算书缺失物品")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerContractFinalSettleLost towerContractFinalSettleLost) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerContractFinalSettleLost.setUserId(loginUser.getUserId());
-        }
-        if (towerContractFinalSettleLostService.save(towerContractFinalSettleLost)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:update')")
-    @OperationLog
-    @ApiOperation("修改结算书缺失物品")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerContractFinalSettleLost towerContractFinalSettleLost) {
-        if (towerContractFinalSettleLostService.updateById(towerContractFinalSettleLost)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:remove')")
-    @OperationLog
-    @ApiOperation("删除结算书缺失物品")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerContractFinalSettleLostService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:save')")
-    @OperationLog
-    @ApiOperation("批量添加结算书缺失物品")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerContractFinalSettleLost> list) {
-        if (towerContractFinalSettleLostService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:update')")
-    @OperationLog
-    @ApiOperation("批量修改结算书缺失物品")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerContractFinalSettleLost> batchParam) {
-        if (batchParam.update(towerContractFinalSettleLostService, "final_settle_lost_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContractFinalSettle:remove')")
-    @OperationLog
-    @ApiOperation("批量删除结算书缺失物品")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerContractFinalSettleLostService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerContractSettleEquipmentController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerContractSettleEquipmentController.java
deleted file mode 100644
index 527ca58..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerContractSettleEquipmentController.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.TowerContractSettleRule;
-import com.gxwebsoft.tower.service.TowerContractSettleEquipmentService;
-import com.gxwebsoft.tower.entity.TowerContractSettleEquipment;
-import com.gxwebsoft.tower.param.TowerContractSettleEquipmentParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * 合同结算设备控制器
- *
- * @author 科技小王子
- * @since 2023-06-10 16:52:12
- */
-@Api(tags = "合同结算设备管理")
-@RestController
-@RequestMapping("/api/tower/tower-contract-settle-equipment")
-public class TowerContractSettleEquipmentController extends BaseController {
-    @Resource
-    private TowerContractSettleEquipmentService towerContractSettleEquipmentService;
-
-    @PreAuthorize("hasAuthority('tower:towerContract:list')")
-    @OperationLog
-    @ApiOperation("分页查询合同结算设备")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerContractSettleEquipment>> page(TowerContractSettleEquipmentParam param) {
-        PageParam<TowerContractSettleEquipment, TowerContractSettleEquipmentParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerContractSettleEquipmentService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(towerContractSettleEquipmentService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContract:list')")
-    @OperationLog
-    @ApiOperation("查询全部合同结算设备")
-    @GetMapping()
-    public ApiResult<List<TowerContractSettleEquipment>> list(@RequestParam Map<String, String> param) {
-        int contractId = Integer.parseInt(param.get("contractId"));
-        TowerContractSettleEquipmentParam towerContractSettleEquipmentParam = new TowerContractSettleEquipmentParam();
-        towerContractSettleEquipmentParam.setContractId(contractId);
-        PageParam<TowerContractSettleEquipment, TowerContractSettleEquipmentParam> page = new PageParam<>(towerContractSettleEquipmentParam);
-        page.setDefaultOrder("create_time desc");
-        return success(towerContractSettleEquipmentService.list(page.getOrderWrapper()));
-        // 使用关联查询
-//        return success(null);
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContract:list')")
-    @OperationLog
-    @ApiOperation("根据id查询合同结算设备")
-    @GetMapping("/{id}")
-    public ApiResult<TowerContractSettleEquipment> get(@PathVariable("id") Integer id) {
-        return success(towerContractSettleEquipmentService.getById(id));
-        // 使用关联查询
-        //return success(towerContractSettleEquipmentService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContract:save')")
-    @OperationLog
-    @ApiOperation("添加合同结算设备")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerContractSettleEquipment towerContractSettleEquipment) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerContractSettleEquipment.setUserId(loginUser.getUserId());
-        }
-        if (towerContractSettleEquipmentService.save(towerContractSettleEquipment)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContract:update')")
-    @OperationLog
-    @ApiOperation("修改合同结算设备")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerContractSettleEquipment towerContractSettleEquipment) {
-        if (towerContractSettleEquipmentService.updateById(towerContractSettleEquipment)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContract:remove')")
-    @OperationLog
-    @ApiOperation("删除合同结算设备")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerContractSettleEquipmentService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContract:save')")
-    @OperationLog
-    @ApiOperation("批量添加合同结算设备")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerContractSettleEquipment> list) {
-        QueryWrapper<TowerContractSettleEquipment> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("contract_id", list.get(0).getContractId());
-        towerContractSettleEquipmentService.remove(queryWrapper);
-        if (towerContractSettleEquipmentService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContract:update')")
-    @OperationLog
-    @ApiOperation("批量修改合同结算设备")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerContractSettleEquipment> batchParam) {
-        if (batchParam.update(towerContractSettleEquipmentService, "contract_settle_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContract:remove')")
-    @OperationLog
-    @ApiOperation("批量删除合同结算设备")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerContractSettleEquipmentService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerContractSettleRuleController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerContractSettleRuleController.java
deleted file mode 100644
index a2d9ccb..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerContractSettleRuleController.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.TowerContractFile;
-import com.gxwebsoft.tower.param.TowerContractSettleEquipmentParam;
-import com.gxwebsoft.tower.service.TowerContractSettleRuleService;
-import com.gxwebsoft.tower.entity.TowerContractSettleRule;
-import com.gxwebsoft.tower.param.TowerContractSettleRuleParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 合同结算规则控制器
- *
- * @author 科技小王子
- * @since 2023-06-11 13:48:42
- */
-@Api(tags = "合同结算规则管理")
-@RestController
-@RequestMapping("/api/tower/tower-contract-settle-rule")
-public class TowerContractSettleRuleController extends BaseController {
-    @Resource
-    private TowerContractSettleRuleService towerContractSettleRuleService;
-
-    @PreAuthorize("hasAuthority('tower:towerContract:list')")
-    @OperationLog
-    @ApiOperation("分页查询合同结算规则")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerContractSettleRule>> page(TowerContractSettleRuleParam param) {
-        PageParam<TowerContractSettleRule, TowerContractSettleRuleParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerContractSettleRuleService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(towerContractSettleRuleService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContract:list')")
-    @OperationLog
-    @ApiOperation("查询全部合同结算规则")
-    @GetMapping()
-    public ApiResult<List<TowerContractSettleRule>> list(@RequestParam Map<String, String> param) {
-        int contractId = Integer.parseInt(param.get("contractId"));
-        TowerContractSettleRuleParam towerContractSettleRuleParam = new TowerContractSettleRuleParam();
-        towerContractSettleRuleParam.setContractId(contractId);
-        PageParam<TowerContractSettleRule, TowerContractSettleRuleParam> page = new PageParam<>(towerContractSettleRuleParam);
-        page.setDefaultOrder("create_time desc");
-        return success(towerContractSettleRuleService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerContractSettleRuleService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContract:list')")
-    @OperationLog
-    @ApiOperation("根据id查询合同结算规则")
-    @GetMapping("/{id}")
-    public ApiResult<TowerContractSettleRule> get(@PathVariable("id") Integer id) {
-        return success(towerContractSettleRuleService.getById(id));
-        // 使用关联查询
-        //return success(towerContractSettleRuleService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContract:save')")
-    @OperationLog
-    @ApiOperation("添加合同结算规则")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerContractSettleRule towerContractSettleRule) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerContractSettleRule.setUserId(loginUser.getUserId());
-        }
-        if (towerContractSettleRuleService.save(towerContractSettleRule)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContract:update')")
-    @OperationLog
-    @ApiOperation("修改合同结算规则")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerContractSettleRule towerContractSettleRule) {
-        if (towerContractSettleRuleService.updateById(towerContractSettleRule)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContract:remove')")
-    @OperationLog
-    @ApiOperation("删除合同结算规则")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerContractSettleRuleService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContract:save')")
-    @OperationLog
-    @ApiOperation("批量添加合同结算规则")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerContractSettleRule> list) {
-        QueryWrapper<TowerContractSettleRule> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("contract_id", list.get(0).getContractId());
-        towerContractSettleRuleService.remove(queryWrapper);
-        if (towerContractSettleRuleService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContract:update')")
-    @OperationLog
-    @ApiOperation("批量修改合同结算规则")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerContractSettleRule> batchParam) {
-        if (batchParam.update(towerContractSettleRuleService, "contract_settle_rule_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerContract:remove')")
-    @OperationLog
-    @ApiOperation("批量删除合同结算规则")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerContractSettleRuleService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerCustomerController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerCustomerController.java
deleted file mode 100644
index 8dc413b..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerCustomerController.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.service.TowerCustomerService;
-import com.gxwebsoft.tower.entity.TowerCustomer;
-import com.gxwebsoft.tower.param.TowerCustomerParam;
-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-06-08 21:04:27
- */
-@Api(tags = "客户管理管理")
-@RestController
-@RequestMapping("/api/tower/tower-customer")
-public class TowerCustomerController extends BaseController {
-    @Resource
-    private TowerCustomerService towerCustomerService;
-
-    @PreAuthorize("hasAuthority('tower:towerCustomer:list')")
-    @OperationLog
-    @ApiOperation("分页查询客户管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerCustomer>> page(TowerCustomerParam param) {
-//        PageParam<TowerCustomer, TowerCustomerParam> page = new PageParam<>(param);
-//        page.setDefaultOrder("create_time desc");
-//        return success(towerCustomerService.page(page, page.getWrapper()));
-        // 使用关联查询
-        return success(towerCustomerService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerCustomer:list')")
-    @OperationLog
-    @ApiOperation("查询全部客户管理")
-    @GetMapping()
-    public ApiResult<List<TowerCustomer>> list(TowerCustomerParam param) {
-        PageParam<TowerCustomer, TowerCustomerParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerCustomerService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerCustomerService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerCustomer:list')")
-    @OperationLog
-    @ApiOperation("根据id查询客户管理")
-    @GetMapping("/{id}")
-    public ApiResult<TowerCustomer> get(@PathVariable("id") Integer id) {
-        return success(towerCustomerService.getById(id));
-        // 使用关联查询
-        //return success(towerCustomerService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerCustomer:save')")
-    @OperationLog
-    @ApiOperation("添加客户管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerCustomer towerCustomer) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerCustomer.setUserId(loginUser.getUserId());
-        }
-        if (towerCustomerService.save(towerCustomer)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerCustomer:update')")
-    @OperationLog
-    @ApiOperation("修改客户管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerCustomer towerCustomer) {
-        if (towerCustomerService.updateById(towerCustomer)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerCustomer:remove')")
-    @OperationLog
-    @ApiOperation("删除客户管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerCustomerService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerCustomer:save')")
-    @OperationLog
-    @ApiOperation("批量添加客户管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerCustomer> list) {
-        if (towerCustomerService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerCustomer:update')")
-    @OperationLog
-    @ApiOperation("批量修改客户管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerCustomer> batchParam) {
-        if (batchParam.update(towerCustomerService, "customer_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerCustomer:remove')")
-    @OperationLog
-    @ApiOperation("批量删除客户管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerCustomerService.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
deleted file mode 100644
index 0f80c13..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerEquipmentController.java
+++ /dev/null
@@ -1,349 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import cn.binarywang.wx.miniapp.api.WxMaQrcodeService;
-import cn.binarywang.wx.miniapp.api.WxMaService;
-import cn.binarywang.wx.miniapp.api.impl.WxMaQrcodeServiceImpl;
-import cn.hutool.core.date.DateUtil;
-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.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.controller.WxLoginController;
-import com.gxwebsoft.tower.entity.TowerEquipment;
-import com.gxwebsoft.tower.entity.TowerProject;
-import com.gxwebsoft.tower.entity.TowerProjectOrder;
-import com.gxwebsoft.tower.param.TowerEquipmentParam;
-import com.gxwebsoft.tower.service.TowerEquipmentService;
-import com.gxwebsoft.tower.service.TowerProjectOrderService;
-import com.gxwebsoft.tower.service.TowerProjectService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import me.chanjar.weixin.common.error.WxErrorException;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * 塔吊设备管理控制器
- *
- * @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;
-    @Resource
-    private TowerProjectService projectService;
-    @Resource
-    private TowerProjectOrderService projectOrderService;
-
-    @Value("${config.upload-path}")
-    private String uploadPath;
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:list')")
-    @OperationLog
-    @ApiOperation("塔吊设备数据")
-    @GetMapping("/data")
-    public ApiResult<Map<String, Integer>> data() {
-        Map<String, Integer> data = new HashMap<>();
-        Integer totalNum = towerEquipmentService.count(
-                new LambdaQueryWrapper<TowerEquipment>()
-                        .ne(TowerEquipment::getStatus, 3)
-        );
-        Integer idleNum = towerEquipmentService.count(
-                new LambdaQueryWrapper<TowerEquipment>()
-                        .eq(TowerEquipment::getStatus, 0)
-        );
-        Integer scrapNum = towerEquipmentService.count(
-                  new LambdaQueryWrapper<TowerEquipment>()
-                          .lt(TowerEquipment::getScrapDate, new Date())
-          );
-        Integer totalNum2 = towerEquipmentService.count(
-          new LambdaQueryWrapper<TowerEquipment>()
-            .eq(TowerEquipment::getStatus, 2)
-        );
-        Integer totalNum3 = towerEquipmentService.count(
-          new LambdaQueryWrapper<TowerEquipment>()
-            .eq(TowerEquipment::getStatus, 3)
-        );
-        Integer totalNum4 = towerEquipmentService.count(
-          new LambdaQueryWrapper<TowerEquipment>()
-            .eq(TowerEquipment::getStatus, 4)
-        );
-        Integer totalNum5 = towerEquipmentService.count(
-          new LambdaQueryWrapper<TowerEquipment>()
-            .eq(TowerEquipment::getStatus, 5)
-        );
-        data.put("totalNum", totalNum);
-        data.put("idleNum", idleNum);
-        data.put("scrapNum", scrapNum);
-        data.put("totalNum2", totalNum2);
-        data.put("totalNum3", totalNum3);
-        data.put("totalNum4", totalNum4);
-        data.put("totalNum5", totalNum5);
-        return success(data);
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:list')")
-    @OperationLog
-    @ApiOperation("分页查询塔吊设备管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerEquipment>> page(TowerEquipmentParam param) {
-        System.out.println("param.getYearFilter(): " + param.getYearFilter());
-        List<Integer> equipmentIdList = new ArrayList<>();
-        if (param.getIdleOnly() != null && param.getIdleOnly()) {
-            // 不在未结案项目的设备列表
-            equipmentIdList = towerEquipmentService.list(
-                    new LambdaQueryWrapper<TowerEquipment>()
-                            .ne(TowerEquipment::getStatus, 4)
-            ).stream().map(TowerEquipment::getEquipmentId).collect(Collectors.toList());
-        }
-        // 使用关联查询
-        LambdaQueryWrapper<TowerEquipment> wrapper = new LambdaQueryWrapper<>();
-        if (!equipmentIdList.isEmpty()) wrapper.in(TowerEquipment::getEquipmentId, equipmentIdList);
-        if (param.getKeywords() != null) {
-            wrapper.and(i -> i.like(TowerEquipment::getFilingNo, param.getKeywords()).or()
-                    .like(TowerEquipment::getModel, param.getKeywords()).or()
-                    .like(TowerEquipment::getName, param.getKeywords()).or()
-                    .like(TowerEquipment::getFactoryNo, param.getKeywords()));
-        }
-        if (param.getYearFilter() != null)
-            wrapper.apply("CEIL( DATEDIFF(`scrap_date`, '" + DateUtil.today() + "') / 365) = {0}", param.getYearFilter());
-        if (param.getStatus() != null) {
-          if(param.getStatus().equals(1)){
-            wrapper.lt(TowerEquipment::getScrapDate,DateUtil.today());
-          }else {
-            wrapper.eq(TowerEquipment::getStatus, param.getStatus());
-          }
-        };
-        IPage<TowerEquipment> page = new PageParam<>(param);
-        IPage<TowerEquipment> list = towerEquipmentService.page(page, wrapper);
-        for (TowerEquipment equipment : list.getRecords()) {
-//            System.out.println("equipment item" + equipment);
-            List<TowerProjectOrder> projectOrderList = projectOrderService.list(
-                    new LambdaQueryWrapper<TowerProjectOrder>()
-                            .eq(TowerProjectOrder::getFilingNo, equipment.getFilingNo())
-            );
-            if (!projectOrderList.isEmpty()) {
-                equipment.setProjectList(
-                        projectService.list(
-                                new LambdaQueryWrapper<TowerProject>()
-                                        .in(TowerProject::getProjectId,
-                                                projectOrderList.stream().map(TowerProjectOrder::getProjectId).collect(Collectors.toList())
-                                        )
-                        )
-                );
-            }
-        }
-        return success(list);
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:list')")
-    @OperationLog
-    @ApiOperation("查询全部塔吊设备管理")
-    @GetMapping()
-    public ApiResult<List<TowerEquipment>> list(TowerEquipmentParam param) {
-        // 使用关联查询
-        return success(towerEquipmentService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:list')")
-    @OperationLog
-    @ApiOperation("根据id查询塔吊设备管理")
-    @GetMapping("/{id}")
-    public ApiResult<TowerEquipment> 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<TowerEquipment> list) {
-//        for (TowerEquipment equipment : list) {
-//            if (equipment.getProjectName() != null) {
-//                TowerProject checkProject = projectService.getOne(
-//                        new LambdaQueryWrapper<TowerProject>().eq(TowerProject::getProjectName, equipment.getProjectName())
-//                );
-//                if (checkProject == null) {
-//                    TowerProject newProject = new TowerProject();
-//                    newProject.setProjectName(equipment.getProjectName());
-//                    newProject.setProjectCity(equipment.getCurrentLocation());
-//                    newProject.setCompetentDepartment(equipment.getCompetentDepartment());
-//                    projectService.save(newProject);
-//
-//                    TowerProjectOrder newProjectOrder = new TowerProjectOrder();
-//                    newProjectOrder.setProjectId(newProjectOrder.getProjectId());
-//                    newProjectOrder.setEquipmentName(equipment.getEquipmentName());
-//                    newProjectOrder.setEquipmentModel(equipment.getEquipmentModel());
-//                    newProjectOrder.setFilingNo(equipment.getFilingNo());
-//                    newProjectOrder.setFactoryNo(equipment.getFactoryNo());
-//                    newProjectOrder.setSecurityStatus(equipment.getSecurityStatus());
-//                    projectOrderService.save(newProjectOrder);
-//                } else {
-//                    int checkProjectOrder = projectOrderService.count(
-//                            new LambdaQueryWrapper<TowerProjectOrder>().eq(TowerProjectOrder::getProjectId, checkProject.getProjectId())
-//                                    .eq(TowerProjectOrder::getFilingNo, equipment.getFilingNo())
-//                    );
-//                    if (checkProjectOrder == 0) {
-//                        TowerProjectOrder newProjectOrder = new TowerProjectOrder();
-//                        newProjectOrder.setProjectId(newProjectOrder.getProjectId());
-//                        newProjectOrder.setEquipmentName(equipment.getEquipmentName());
-//                        newProjectOrder.setEquipmentModel(equipment.getEquipmentModel());
-//                        newProjectOrder.setFilingNo(equipment.getFilingNo());
-//                        newProjectOrder.setFactoryNo(equipment.getFactoryNo());
-//                        newProjectOrder.setSecurityStatus(equipment.getSecurityStatus());
-//                        projectOrderService.save(newProjectOrder);
-//                    }
-//                }
-//            }
-//        }
-        if (towerEquipmentService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:update')")
-    @OperationLog
-    @ApiOperation("批量修改塔吊设备管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerEquipment> 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<Integer> ids) {
-        if (towerEquipmentService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:update')")
-    @OperationLog
-    @ApiOperation("批量修改塔吊设备状态")
-    @PutMapping("/status")
-    public ApiResult<?> statusBatch(@RequestBody List<TowerEquipment> batchParam) {
-        if (towerEquipmentService.updateBatchById(batchParam)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:list')")
-    @OperationLog
-    @ApiOperation("设备信息二维码")
-    @GetMapping("/qr")
-    public ApiResult<?> qr(TowerEquipmentParam equipmentParam) throws IOException, WxErrorException {
-//        WxLoginController wxLoginController = new WxLoginController();
-//        String apiUrl = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + wxLoginController.getAccessToken();
-//        JSONObject paramJson = new JSONObject();
-//        paramJson.put("path", "otherPages/pages/equipment");
-//        paramJson.put("scene",towerEquipmentParam.getEquipmentId());
-//        URL url = new URL(apiUrl);
-//        HttpURLConnection httpURLConnection = (HttpURLConnection) url.openConnection();
-//        httpURLConnection.setRequestMethod("POST");// 提交模式
-//        // 发送POST请求必须设置如下两行
-//        httpURLConnection.setDoOutput(true);
-//        httpURLConnection.setDoInput(true);
-//        PrintWriter printWriter = new PrintWriter(httpURLConnection.getOutputStream());
-//        printWriter.write(paramJson.toString());
-//        // flush输出流的缓冲
-//        printWriter.flush();
-//        //开始获取数据
-//        BufferedInputStream bis = new BufferedInputStream(httpURLConnection.getInputStream());
-//        OutputStream os = new FileOutputStream(new File(savePath));
-//        int len;
-//        byte[] arr = new byte[1024];
-//        while ((len = bis.read(arr)) != -1)
-//        {
-//            os.write(arr, 0, len);
-//            os.flush();
-//        }
-//        os.close();
-//        // 执行post请求
-//        Map<String, Object> paramMap = new HashMap<>();
-//        paramMap.put("path", "otherPages/pages/equipment");
-//        paramMap.put("scene", equipmentParam.getEquipmentId());
-//        String post = HttpUtil.post(apiUrl, JSON.toJSONString(paramMap));
-//        JSONObject json = JSON.parseObject(post);
-//        return success(json);
-//        if (json.get("errcode").equals(0)) {
-//        }
-//        return null;
-        String filepath = uploadPath + "qr";
-        String filename = filepath + "/" + getLoginUserId().toString() + ".png";
-        File checkFile = new File(filename);
-        if (!checkFile.exists()) {
-            WxLoginController wxLoginController = new WxLoginController();
-            WxMaService wxMaService = wxLoginController.wxMaService();
-            WxMaQrcodeService wxMaQrcodeService = new WxMaQrcodeServiceImpl(wxMaService);
-            wxMaQrcodeService.createWxaCodeUnlimit(equipmentParam.getEquipmentId().toString(), "otherPages/pages/equipment", uploadPath);
-        }
-        return success(filename);
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerFallController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerFallController.java
deleted file mode 100644
index f48fc4f..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerFallController.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.service.TowerFallService;
-import com.gxwebsoft.tower.entity.TowerFall;
-import com.gxwebsoft.tower.param.TowerFallParam;
-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-06-05 22:40:55
- */
-@Api(tags = "防坠器管理管理")
-@RestController
-@RequestMapping("/api/tower/tower-fall")
-public class TowerFallController extends BaseController {
-    @Resource
-    private TowerFallService towerFallService;
-
-    @PreAuthorize("hasAuthority('tower:towerFall:list')")
-    @OperationLog
-    @ApiOperation("分页查询防坠器管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerFall>> page(TowerFallParam param) {
-        PageParam<TowerFall, TowerFallParam> page = new PageParam<>(param);
-        page.setDefaultOrder("factory_date desc");
-        return success(towerFallService.page(page, page.getWrapper()));
-        // 使用关联查询
-//        return success(towerFallService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerFall:list')")
-    @OperationLog
-    @ApiOperation("查询全部防坠器管理")
-    @GetMapping()
-    public ApiResult<List<TowerFall>> list(TowerFallParam param) {
-        PageParam<TowerFall, TowerFallParam> page = new PageParam<>(param);
-        page.setDefaultOrder("factory_date desc");
-        return success(towerFallService.list(page.getOrderWrapper()));
-        // 使用关联查询
-//        return success(towerFallService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerFall:list')")
-    @OperationLog
-    @ApiOperation("根据id查询防坠器管理")
-    @GetMapping("/{id}")
-    public ApiResult<TowerFall> get(@PathVariable("id") Integer id) {
-        return success(towerFallService.getById(id));
-        // 使用关联查询
-        //return success(towerFallService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerFall:save')")
-    @OperationLog
-    @ApiOperation("添加防坠器管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerFall towerFall) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerFall.setUserId(loginUser.getUserId());
-        }
-        if (towerFallService.save(towerFall)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerFall:update')")
-    @OperationLog
-    @ApiOperation("修改防坠器管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerFall towerFall) {
-        if (towerFallService.updateById(towerFall)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerFall:remove')")
-    @OperationLog
-    @ApiOperation("删除防坠器管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerFallService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerFall:save')")
-    @OperationLog
-    @ApiOperation("批量添加防坠器管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerFall> list) {
-        if (towerFallService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerFall:update')")
-    @OperationLog
-    @ApiOperation("批量修改防坠器管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerFall> batchParam) {
-        if (batchParam.update(towerFallService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerFall:remove')")
-    @OperationLog
-    @ApiOperation("批量删除防坠器管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerFallService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerHistorySettleController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerHistorySettleController.java
deleted file mode 100644
index 32f5d54..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerHistorySettleController.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.*;
-import com.gxwebsoft.tower.service.TowerHistorySettleService;
-import com.gxwebsoft.tower.param.TowerHistorySettleParam;
-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-06-12 16:40:25
- */
-@Api(tags = "管理")
-@RestController
-@RequestMapping("/api/tower/tower-history-settle")
-public class TowerHistorySettleController extends BaseController {
-    @Resource
-    private TowerHistorySettleService towerHistorySettleService;
-
-    @PreAuthorize("hasAuthority('tower:towerHistorySettle:list')")
-    @OperationLog
-    @ApiOperation("分页查询")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerHistorySettle>> page(TowerHistorySettleParam param) {
-        MPJLambdaWrapper<TowerHistorySettle> wrapper = new MPJLambdaWrapper<>();
-        wrapper.selectAll(TowerHistorySettle.class)
-                .select(TowerProject::getProjectName)
-                .selectAs(TowerEquipment::getName, TowerEquipment::getEquipmentName)
-                .selectAs(TowerEquipment::getModel, TowerEquipment::getEquipmentModel)
-                .select(TowerEquipment::getEquipmentNo)
-                .select(TowerEquipment::getFactoryNo)
-                .select(TowerEquipment::getFilingNo)
-                .leftJoin(TowerProject.class, TowerProject::getProjectId, TowerHistorySettle::getProjectId)
-                .leftJoin(TowerEquipment.class, TowerEquipment::getEquipmentId, TowerHistorySettle::getEquipmentId);
-
-        PageParam<TowerHistorySettle, TowerHistorySettleParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerHistorySettleService.page(page, wrapper));
-        // 使用关联查询
-        //return success(towerHistorySettleService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerHistorySettle:list')")
-    @OperationLog
-    @ApiOperation("查询全部")
-    @GetMapping()
-    public ApiResult<List<TowerHistorySettle>> list(TowerHistorySettleParam param) {
-        PageParam<TowerHistorySettle, TowerHistorySettleParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerHistorySettleService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerHistorySettleService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerHistorySettle:list')")
-    @OperationLog
-    @ApiOperation("根据id查询")
-    @GetMapping("/{id}")
-    public ApiResult<TowerHistorySettle> get(@PathVariable("id") Integer id) {
-        return success(towerHistorySettleService.getById(id));
-        // 使用关联查询
-        //return success(towerHistorySettleService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerHistorySettle:save')")
-    @OperationLog
-    @ApiOperation("添加")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerHistorySettle towerHistorySettle) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-            towerHistorySettle.setUserId(loginUser.getUserId());
-        }
-        if (towerHistorySettleService.save(towerHistorySettle)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerHistorySettle:update')")
-    @OperationLog
-    @ApiOperation("修改")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerHistorySettle towerHistorySettle) {
-        if (towerHistorySettleService.updateById(towerHistorySettle)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerHistorySettle:remove')")
-    @OperationLog
-    @ApiOperation("删除")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerHistorySettleService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerHistorySettle:save')")
-    @OperationLog
-    @ApiOperation("批量添加")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerHistorySettle> list) {
-        if (towerHistorySettleService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerHistorySettle:update')")
-    @OperationLog
-    @ApiOperation("批量修改")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerHistorySettle> batchParam) {
-        if (batchParam.update(towerHistorySettleService, "history_settle_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerHistorySettle:remove')")
-    @OperationLog
-    @ApiOperation("批量删除")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerHistorySettleService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerIncomeController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerIncomeController.java
deleted file mode 100644
index 0fc32c4..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerIncomeController.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-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.core.conditions.update.UpdateWrapper;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.Company;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.*;
-import com.gxwebsoft.tower.service.TowerContractService;
-import com.gxwebsoft.tower.service.TowerIncomeService;
-import com.gxwebsoft.tower.param.TowerIncomeParam;
-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.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 收款管理控制器
- *
- * @author 科技小王子
- * @since 2023-06-17 16:56:18
- */
-@Api(tags = "收款管理管理")
-@RestController
-@RequestMapping("/api/tower/tower-income")
-public class TowerIncomeController extends BaseController {
-    @Resource
-    private TowerIncomeService towerIncomeService;
-    @Resource
-    private TowerContractService towerContractService;
-
-    @PreAuthorize("hasAuthority('tower:towerIncome:list')")
-    @OperationLog
-    @ApiOperation("分页查询收款管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerIncome>> page(TowerIncomeParam param) {
-        MPJLambdaWrapper<TowerIncome> wrapper = new MPJLambdaWrapper<>();
-        wrapper.selectAll(TowerIncome.class)
-                .select(TowerContract::getContactNumber)
-                .select(TowerContract::getTotalInvoicingAmount)
-                .select(TowerContract::getTotalIncomeAmount)
-                .select(TowerProject::getProjectName)
-                .selectAs(TowerCustomer::getName, TowerCustomer::getCustomerName)
-                .selectAs(Company::getCompanyName, Company::getIncomeCompanyName)
-                .leftJoin(TowerContract.class, TowerContract::getContractId, TowerIncome::getContractId)
-                .leftJoin(TowerProject.class, TowerProject::getProjectId, TowerContract::getProjectId)
-                .leftJoin(TowerCustomer.class, TowerCustomer::getCustomerId, TowerContract::getCustomerId)
-                .leftJoin(Company.class, Company::getCompanyId, TowerIncome::getIncomeCompanyId);
-
-        PageParam<TowerIncome, TowerIncomeParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerIncomeService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(towerIncomeService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerIncome:list')")
-    @OperationLog
-    @ApiOperation("查询全部收款管理")
-    @GetMapping()
-    public ApiResult<List<TowerIncome>> list(TowerIncomeParam param) {
-        PageParam<TowerIncome, TowerIncomeParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerIncomeService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerIncomeService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerIncome:list')")
-    @OperationLog
-    @ApiOperation("根据id查询收款管理")
-    @GetMapping("/{id}")
-    public ApiResult<TowerIncome> get(@PathVariable("id") Integer id) {
-        return success(towerIncomeService.getById(id));
-        // 使用关联查询
-        //return success(towerIncomeService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerIncome:save')")
-    @OperationLog
-    @ApiOperation("添加收款管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerIncome towerIncome) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-            towerIncome.setUserId(loginUser.getUserId());
-        }
-        if (towerIncomeService.save(towerIncome)) {
-            reCalIncome(towerIncome.getContractId());
-            return success(towerIncome.getIncomeId());
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerIncome:update')")
-    @OperationLog
-    @ApiOperation("修改收款管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerIncome towerIncome) {
-        if (towerIncomeService.updateById(towerIncome)) {
-            reCalIncome(towerIncome.getContractId());
-            return success(towerIncome.getIncomeId());
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerIncome:remove')")
-    @OperationLog
-    @ApiOperation("删除收款管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        int contractId = towerIncomeService.getById(id).getContractId();
-        if (towerIncomeService.removeById(id)) {
-            reCalIncome(contractId);
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerIncome:save')")
-    @OperationLog
-    @ApiOperation("批量添加收款管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerIncome> list) {
-        if (towerIncomeService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerIncome:update')")
-    @OperationLog
-    @ApiOperation("批量修改收款管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerIncome> batchParam) {
-        if (batchParam.update(towerIncomeService, "income_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerIncome:remove')")
-    @OperationLog
-    @ApiOperation("批量删除收款管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        List<Integer> contractIdList = new ArrayList<>();
-        for (int id : ids) {
-            int contractId = towerIncomeService.getById(id).getContractId();
-            if (!contractIdList.contains(contractId)) {
-                contractIdList.add(contractId);
-            }
-        }
-        if (towerIncomeService.removeByIds(ids)) {
-            for (int contractId : contractIdList) {
-                this.reCalIncome(contractId);
-            }
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    private void reCalIncome(int contractId) {
-        QueryWrapper<TowerIncome> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("contract_id", contractId)
-                .select("sum(`amount`) as `total_income_amount`");
-        TowerIncome towerIncomeAll = towerIncomeService.getOne(queryWrapper);
-
-        LambdaUpdateWrapper<TowerContract> updateWrapper = new LambdaUpdateWrapper<>();
-        BigDecimal totalIncomeAmount;
-        if (towerIncomeAll != null) {
-            totalIncomeAmount = towerIncomeAll.getTotalIncomeAmount();
-        } else {
-            totalIncomeAmount = BigDecimal.valueOf(0);
-        }
-        updateWrapper.eq(TowerContract::getContractId, contractId)
-                .set(TowerContract::getTotalIncomeAmount, totalIncomeAmount);
-        towerContractService.update(updateWrapper);
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerIncomeEquipmentController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerIncomeEquipmentController.java
deleted file mode 100644
index 807daee..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerIncomeEquipmentController.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.yulichang.query.MPJLambdaQueryWrapper;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.*;
-import com.gxwebsoft.tower.service.TowerIncomeEquipmentService;
-import com.gxwebsoft.tower.param.TowerIncomeEquipmentParam;
-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-06-17 17:06:39
- */
-@Api(tags = "收款设备费用分摊管理")
-@RestController
-@RequestMapping("/api/tower/tower-income-equipment")
-public class TowerIncomeEquipmentController extends BaseController {
-    @Resource
-    private TowerIncomeEquipmentService towerIncomeEquipmentService;
-
-    @PreAuthorize("hasAuthority('tower:towerIncome:list')")
-    @OperationLog
-    @ApiOperation("分页查询收款设备费用分摊")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerIncomeEquipment>> page(TowerIncomeEquipmentParam param) {
-        PageParam<TowerIncomeEquipment, TowerIncomeEquipmentParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerIncomeEquipmentService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(towerIncomeEquipmentService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerIncome:list')")
-    @OperationLog
-    @ApiOperation("查询全部收款设备费用分摊")
-    @GetMapping()
-    public ApiResult<List<TowerIncomeEquipment>> list(TowerIncomeEquipmentParam param) {
-        MPJLambdaWrapper<TowerIncomeEquipment> wrapper = new MPJLambdaWrapper<>();
-        wrapper.selectAll(TowerIncomeEquipment.class)
-                .select(TowerEquipment::getEquipmentName)
-                .selectAs(TowerEquipment::getModel, TowerEquipment::getEquipmentModel)
-                .select(TowerEquipment::getFilingNo)
-                .select(TowerEquipment::getFactoryNo)
-                .select(TowerEquipment::getEquipmentNo)
-                .select(TowerContractEquipment::getRentAmount)
-                .leftJoin(TowerContractEquipment.class, TowerContractEquipment::getEquipmentId, TowerIncomeEquipment::getEquipmentId)
-                .leftJoin(TowerEquipment.class, TowerEquipment::getEquipmentId, TowerContractEquipment::getEquipmentId);
-
-        PageParam<TowerIncomeEquipment, TowerIncomeEquipmentParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerIncomeEquipmentService.list(wrapper));
-        // 使用关联查询
-        //return success(towerIncomeEquipmentService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerIncome:list')")
-    @OperationLog
-    @ApiOperation("根据id查询收款设备费用分摊")
-    @GetMapping("/{id}")
-    public ApiResult<TowerIncomeEquipment> get(@PathVariable("id") Integer id) {
-        return success(towerIncomeEquipmentService.getById(id));
-        // 使用关联查询
-        //return success(towerIncomeEquipmentService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerIncome:save')")
-    @OperationLog
-    @ApiOperation("添加收款设备费用分摊")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerIncomeEquipment towerIncomeEquipment) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-            towerIncomeEquipment.setUserId(loginUser.getUserId());
-        }
-        if (towerIncomeEquipmentService.save(towerIncomeEquipment)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerIncome:update')")
-    @OperationLog
-    @ApiOperation("修改收款设备费用分摊")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerIncomeEquipment towerIncomeEquipment) {
-        if (towerIncomeEquipmentService.updateById(towerIncomeEquipment)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerIncome:remove')")
-    @OperationLog
-    @ApiOperation("删除收款设备费用分摊")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerIncomeEquipmentService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerIncome:save')")
-    @OperationLog
-    @ApiOperation("批量添加收款设备费用分摊")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerIncomeEquipment> list) {
-        if (towerIncomeEquipmentService.saveBatch(list)) {
-            QueryWrapper<TowerIncomeEquipment> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("income_id", list.get(0).getIncomeId());
-            towerIncomeEquipmentService.remove(queryWrapper);
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerIncome:update')")
-    @OperationLog
-    @ApiOperation("批量修改收款设备费用分摊")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerIncomeEquipment> batchParam) {
-        if (batchParam.update(towerIncomeEquipmentService, "income_equipment_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerIncome:remove')")
-    @OperationLog
-    @ApiOperation("批量删除收款设备费用分摊")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerIncomeEquipmentService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerInvoicingController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerInvoicingController.java
deleted file mode 100644
index 0f3bb17..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerInvoicingController.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.alipay.api.domain.Contract;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.Company;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.TowerContract;
-import com.gxwebsoft.tower.entity.TowerCustomer;
-import com.gxwebsoft.tower.entity.TowerProject;
-import com.gxwebsoft.tower.mapper.TowerContractMapper;
-import com.gxwebsoft.tower.service.TowerContractService;
-import com.gxwebsoft.tower.service.TowerInvoicingService;
-import com.gxwebsoft.tower.entity.TowerInvoicing;
-import com.gxwebsoft.tower.param.TowerInvoicingParam;
-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.tower.service.impl.TowerContractServiceImpl;
-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-17 12:47:08
- */
-@Api(tags = "开票管理管理")
-@RestController
-@RequestMapping("/api/tower/tower-invoicing")
-public class TowerInvoicingController extends BaseController {
-    @Resource
-    private TowerInvoicingService towerInvoicingService;
-    @Resource
-    private TowerContractService towerContractService;
-
-    @PreAuthorize("hasAuthority('tower:towerInvoicing:list')")
-    @OperationLog
-    @ApiOperation("分页查询开票管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerInvoicing>> page(TowerInvoicingParam param) {
-        MPJLambdaWrapper<TowerInvoicing> wrapper = new MPJLambdaWrapper<>();
-        wrapper.selectAll(TowerInvoicing.class)
-                .select(TowerContract::getContactNumber)
-                .select(TowerContract::getSignDate)
-                .select(TowerContract::getTotalInvoicingAmount)
-                .select(TowerProject::getProjectName)
-                .selectAs(TowerCustomer::getName, TowerCustomer::getCustomerName)
-                .select(Company::getCompanyName)
-                .leftJoin(TowerContract.class, TowerContract::getContractId, TowerInvoicing::getContractId)
-                .leftJoin(TowerProject.class, TowerProject::getProjectId, TowerContract::getProjectId)
-                .leftJoin(TowerCustomer.class, TowerCustomer::getCustomerId, TowerContract::getCustomerId)
-                .leftJoin(Company.class, Company::getCompanyId, TowerContract::getCompanyId);
-        PageParam<TowerInvoicing, TowerInvoicingParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerInvoicingService.page(page, wrapper));
-        // 使用关联查询
-        //return success(towerInvoicingService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerInvoicing:list')")
-    @OperationLog
-    @ApiOperation("查询全部开票管理")
-    @GetMapping()
-    public ApiResult<List<TowerInvoicing>> list(TowerInvoicingParam param) {
-        MPJLambdaWrapper<TowerInvoicing> wrapper = new MPJLambdaWrapper<>();
-        wrapper.selectAll(TowerInvoicing.class)
-                .selectAs(TowerContract::getContactNumber, TowerContract::getContractNumber)
-                .select(TowerContract::getContactNumber)
-                .select(TowerContract::getSignDate)
-                .select(TowerContract::getTotalInvoicingAmount)
-                .select(TowerProject::getProjectName)
-                .selectAs(TowerCustomer::getName, TowerCustomer::getCustomerName)
-                .select(Company::getCompanyName)
-                .leftJoin(TowerContract.class, TowerContract::getContractId, TowerInvoicing::getContractId)
-                .leftJoin(TowerProject.class, TowerProject::getProjectId, TowerContract::getProjectId)
-                .leftJoin(TowerCustomer.class, TowerCustomer::getCustomerId, TowerContract::getCustomerId)
-                .leftJoin(Company.class, Company::getCompanyId, TowerContract::getCompanyId);
-
-        PageParam<TowerInvoicing, TowerInvoicingParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerInvoicingService.list(wrapper));
-        // 使用关联查询
-        //return success(towerInvoicingService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerInvoicing:list')")
-    @OperationLog
-    @ApiOperation("根据id查询开票管理")
-    @GetMapping("/{id}")
-    public ApiResult<TowerInvoicing> get(@PathVariable("id") Integer id) {
-        return success(towerInvoicingService.getById(id));
-        // 使用关联查询
-        //return success(towerInvoicingService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerInvoicing:save')")
-    @OperationLog
-    @ApiOperation("添加开票管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerInvoicing towerInvoicing) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-            towerInvoicing.setUserId(loginUser.getUserId());
-        }
-        if (towerInvoicingService.save(towerInvoicing)) {
-            LambdaUpdateWrapper<TowerContract> updateWrapper = new LambdaUpdateWrapper<>();
-            updateWrapper.eq(TowerContract::getContractId, towerInvoicing.getContractId())
-                    .setSql("`total_invoicing_amount` = `total_invoicing_amount` + " + towerInvoicing.getInvoicingAmount());
-            towerContractService.update(null, updateWrapper);
-            return success(towerInvoicing.getInvoicingId());
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerInvoicing:update')")
-    @OperationLog
-    @ApiOperation("修改开票管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerInvoicing towerInvoicing) {
-        if (towerInvoicingService.updateById(towerInvoicing)) {
-            QueryWrapper<TowerInvoicing> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("contract_id", towerInvoicing.getContractId())
-                    .select("SUM(`invoicing_amount`) as `total_invoicing_amount`");
-            TowerInvoicing towerInvoicingAll = towerInvoicingService.getOne(queryWrapper);
-
-            LambdaUpdateWrapper<TowerContract> updateWrapper = new LambdaUpdateWrapper<>();
-            updateWrapper.eq(TowerContract::getContractId, towerInvoicing.getContractId());
-            updateWrapper.set(TowerContract::getTotalInvoicingAmount, towerInvoicingAll.getTotalInvoicingAmount());
-            towerContractService.update(null, updateWrapper);
-            return success(towerInvoicing.getInvoicingId());
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerInvoicing:remove')")
-    @OperationLog
-    @ApiOperation("删除开票管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerInvoicingService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerInvoicing:save')")
-    @OperationLog
-    @ApiOperation("批量添加开票管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerInvoicing> list) {
-        if (towerInvoicingService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerInvoicing:update')")
-    @OperationLog
-    @ApiOperation("批量修改开票管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerInvoicing> batchParam) {
-        if (batchParam.update(towerInvoicingService, "invoicing_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerInvoicing:remove')")
-    @OperationLog
-    @ApiOperation("批量删除开票管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerInvoicingService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerInvoicingSettleController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerInvoicingSettleController.java
deleted file mode 100644
index 677a93d..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerInvoicingSettleController.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.TowerLendingSettleList;
-import com.gxwebsoft.tower.entity.TowerSettle;
-import com.gxwebsoft.tower.service.TowerInvoicingSettleService;
-import com.gxwebsoft.tower.entity.TowerInvoicingSettle;
-import com.gxwebsoft.tower.param.TowerInvoicingSettleParam;
-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-06-17 12:47:08
- */
-@Api(tags = "开票结算单分摊管理")
-@RestController
-@RequestMapping("/api/tower/tower-invoicing-settle")
-public class TowerInvoicingSettleController extends BaseController {
-    @Resource
-    private TowerInvoicingSettleService towerInvoicingSettleService;
-
-    @PreAuthorize("hasAuthority('tower:towerInvoicing:list')")
-    @OperationLog
-    @ApiOperation("分页查询开票结算单分摊")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerInvoicingSettle>> page(TowerInvoicingSettleParam param) {
-        MPJLambdaWrapper<TowerInvoicingSettle> wrapper = new MPJLambdaWrapper<>();
-        wrapper.selectAll(TowerInvoicingSettle.class)
-                .select(TowerSettle::getSettleNo)
-                .select(TowerSettle::getStartDate)
-                .select(TowerSettle::getTotalAmount)
-                .leftJoin(TowerSettle.class, TowerSettle::getSettleId, TowerInvoicingSettle::getSettleId);
-        PageParam<TowerInvoicingSettle, TowerInvoicingSettleParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerInvoicingSettleService.page(page, wrapper));
-        // 使用关联查询
-        //return success(towerInvoicingSettleService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerInvoicing:list')")
-    @OperationLog
-    @ApiOperation("查询全部开票结算单分摊")
-    @GetMapping()
-    public ApiResult<List<TowerInvoicingSettle>> list(TowerInvoicingSettleParam param) {
-        PageParam<TowerInvoicingSettle, TowerInvoicingSettleParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerInvoicingSettleService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerInvoicingSettleService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerInvoicing:list')")
-    @OperationLog
-    @ApiOperation("根据id查询开票结算单分摊")
-    @GetMapping("/{id}")
-    public ApiResult<TowerInvoicingSettle> get(@PathVariable("id") Integer id) {
-        return success(towerInvoicingSettleService.getById(id));
-        // 使用关联查询
-        //return success(towerInvoicingSettleService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerInvoicing:save')")
-    @OperationLog
-    @ApiOperation("添加开票结算单分摊")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerInvoicingSettle towerInvoicingSettle) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerInvoicingSettle.setUserId(loginUser.getUserId());
-        }
-        if (towerInvoicingSettleService.save(towerInvoicingSettle)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerInvoicing:update')")
-    @OperationLog
-    @ApiOperation("修改开票结算单分摊")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerInvoicingSettle towerInvoicingSettle) {
-        if (towerInvoicingSettleService.updateById(towerInvoicingSettle)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerInvoicing:remove')")
-    @OperationLog
-    @ApiOperation("删除开票结算单分摊")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerInvoicingSettleService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerInvoicing:save')")
-    @OperationLog
-    @ApiOperation("批量添加开票结算单分摊")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerInvoicingSettle> list) {
-        QueryWrapper<TowerInvoicingSettle> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("invoicing_id", list.get(0).getInvoicingId());
-        towerInvoicingSettleService.remove(queryWrapper);
-        if (towerInvoicingSettleService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerInvoicing:update')")
-    @OperationLog
-    @ApiOperation("批量修改开票结算单分摊")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerInvoicingSettle> batchParam) {
-        if (batchParam.update(towerInvoicingSettleService, "invoicing_settle_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerInvoicing:remove')")
-    @OperationLog
-    @ApiOperation("批量删除开票结算单分摊")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerInvoicingSettleService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerLendingController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerLendingController.java
deleted file mode 100644
index afa986f..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerLendingController.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.Company;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.*;
-import com.gxwebsoft.tower.service.TowerLendingService;
-import com.gxwebsoft.tower.param.TowerLendingParam;
-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-06-15 10:29:54
- */
-@Api(tags = "拆借管理管理")
-@RestController
-@RequestMapping("/api/tower/tower-lending")
-public class TowerLendingController extends BaseController {
-    @Resource
-    private TowerLendingService towerLendingService;
-
-    @PreAuthorize("hasAuthority('tower:towerLending:list')")
-    @OperationLog
-    @ApiOperation("分页查询拆借管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerLending>> page(TowerLendingParam param) {
-        MPJLambdaWrapper<TowerLending> wrapper = new MPJLambdaWrapper<>();
-        wrapper.selectAll(TowerLending.class)
-                .select(TowerContract::getContactNumber)
-                .select(TowerContract::getSignDate)
-                .select(TowerProject::getProjectName)
-                .selectAs(TowerCustomer::getName, TowerCustomer::getCustomerName)
-                .select(Company::getCompanyName)
-                .leftJoin(TowerContract.class, TowerContract::getContractId, TowerLending::getContractId)
-                .leftJoin(TowerProject.class, TowerProject::getProjectId, TowerContract::getProjectId)
-                .leftJoin(TowerCustomer.class, TowerCustomer::getCustomerId, TowerContract::getCustomerId)
-                .leftJoin(Company.class, Company::getCompanyId, TowerContract::getCompanyId);
-        PageParam<TowerLending, TowerLendingParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerLendingService.page(page, wrapper));
-        // 使用关联查询
-        //return success(towerLendingService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerLending:list')")
-    @OperationLog
-    @ApiOperation("查询全部拆借管理")
-    @GetMapping()
-    public ApiResult<List<TowerLending>> list(TowerLendingParam param) {
-        PageParam<TowerLending, TowerLendingParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerLendingService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerLendingService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerLending:list')")
-    @OperationLog
-    @ApiOperation("根据id查询拆借管理")
-    @GetMapping("/{id}")
-    public ApiResult<TowerLending> get(@PathVariable("id") Integer id) {
-        return success(towerLendingService.getById(id));
-        // 使用关联查询
-        //return success(towerLendingService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerLending:save')")
-    @OperationLog
-    @ApiOperation("添加拆借管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerLending towerLending) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerLending.setUserId(loginUser.getUserId());
-        }
-        if (towerLendingService.save(towerLending)) {
-            return success(towerLending.getLendingId());
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerLending:update')")
-    @OperationLog
-    @ApiOperation("修改拆借管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerLending towerLending) {
-        if (towerLendingService.updateById(towerLending)) {
-            return success(towerLending.getLendingId());
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerLending:remove')")
-    @OperationLog
-    @ApiOperation("删除拆借管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerLendingService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerLending:save')")
-    @OperationLog
-    @ApiOperation("批量添加拆借管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerLending> list) {
-        if (towerLendingService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerLending:update')")
-    @OperationLog
-    @ApiOperation("批量修改拆借管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerLending> batchParam) {
-        if (batchParam.update(towerLendingService, "lending_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerLending:remove')")
-    @OperationLog
-    @ApiOperation("批量删除拆借管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerLendingService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerLendingSettleListController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerLendingSettleListController.java
deleted file mode 100644
index 3c89468..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerLendingSettleListController.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.gxwebsoft.apps.entity.Equipment;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.Company;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.*;
-import com.gxwebsoft.tower.service.TowerLendingSettleListService;
-import com.gxwebsoft.tower.param.TowerLendingSettleListParam;
-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-06-15 10:29:54
- */
-@Api(tags = "拆借结算清单管理")
-@RestController
-@RequestMapping("/api/tower/tower-lending-settle")
-public class TowerLendingSettleListController extends BaseController {
-    @Resource
-    private TowerLendingSettleListService towerLendingSettleListService;
-
-    @PreAuthorize("hasAuthority('tower:towerLending:list')")
-    @OperationLog
-    @ApiOperation("分页查询拆借结算清单")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerLendingSettleList>> page(TowerLendingSettleListParam param) {
-        PageParam<TowerLendingSettleList, TowerLendingSettleListParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerLendingSettleListService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(towerLendingSettleListService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerLending:list')")
-    @OperationLog
-    @ApiOperation("查询全部拆借结算清单")
-    @GetMapping()
-    public ApiResult<List<TowerLendingSettleList>> list(TowerLendingSettleListParam param) {
-        MPJLambdaWrapper<TowerLendingSettleList> wrapper = new MPJLambdaWrapper<>();
-        wrapper.selectAll(TowerLendingSettleList.class)
-                .selectAs(TowerEquipment::getName, TowerEquipment::getEquipmentName)
-                .select(TowerEquipment::getFactoryNo)
-                .select(TowerEquipment::getFilingNo)
-                .select(TowerEquipment::getEquipmentNo)
-                .leftJoin(TowerEquipment.class, TowerEquipment::getEquipmentId, TowerLendingSettleList::getEquipmentId);
-        PageParam<TowerLendingSettleList, TowerLendingSettleListParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerLendingSettleListService.list(wrapper));
-        // 使用关联查询
-        //return success(towerLendingSettleListService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerLending:list')")
-    @OperationLog
-    @ApiOperation("根据id查询拆借结算清单")
-    @GetMapping("/{id}")
-    public ApiResult<TowerLendingSettleList> get(@PathVariable("id") Integer id) {
-        return success(towerLendingSettleListService.getById(id));
-        // 使用关联查询
-        //return success(towerLendingSettleListService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerLending:save')")
-    @OperationLog
-    @ApiOperation("添加拆借结算清单")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerLendingSettleList towerLendingSettleList) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-            towerLendingSettleList.setUserId(loginUser.getUserId());
-        }
-        if (towerLendingSettleListService.save(towerLendingSettleList)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerLending:update')")
-    @OperationLog
-    @ApiOperation("修改拆借结算清单")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerLendingSettleList towerLendingSettleList) {
-        if (towerLendingSettleListService.updateById(towerLendingSettleList)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerLending:remove')")
-    @OperationLog
-    @ApiOperation("删除拆借结算清单")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerLendingSettleListService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerLending:save')")
-    @OperationLog
-    @ApiOperation("批量添加拆借结算清单")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerLendingSettleList> list) {
-        QueryWrapper<TowerLendingSettleList> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("lending_id", list.get(0).getLendingId());
-        towerLendingSettleListService.remove(queryWrapper);
-        if (towerLendingSettleListService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerLending:update')")
-    @OperationLog
-    @ApiOperation("批量修改拆借结算清单")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerLendingSettleList> batchParam) {
-        if (batchParam.update(towerLendingSettleListService, "lending_settle_list_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerLending:remove')")
-    @OperationLog
-    @ApiOperation("批量删除拆借结算清单")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerLendingSettleListService.removeByIds(ids)) {
-            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
deleted file mode 100644
index caea15d..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerModelController.java
+++ /dev/null
@@ -1,128 +0,0 @@
-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<PageResult<TowerModel>> page(TowerModelParam param) {
-        // 使用关联查询
-        return success(towerModelService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerModel:list')")
-    @OperationLog
-    @ApiOperation("查询全部设备型号管理表")
-    @GetMapping()
-    public ApiResult<List<TowerModel>> list(TowerModelParam param) {
-        // 使用关联查询
-        return success(towerModelService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerModel:list')")
-    @OperationLog
-    @ApiOperation("根据id查询设备型号管理表")
-    @GetMapping("/{id}")
-    public ApiResult<TowerModel> 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<TowerModel> list) {
-        if (towerModelService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerModel:update')")
-    @OperationLog
-    @ApiOperation("批量修改设备型号管理表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerModel> 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<Integer> ids) {
-        if (towerModelService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerPartController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerPartController.java
deleted file mode 100644
index f7e6233..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerPartController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.service.TowerPartService;
-import com.gxwebsoft.tower.entity.TowerPart;
-import com.gxwebsoft.tower.param.TowerPartParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 安全检查控制器
- *
- * @author 科技小王子
- * @since 2024-02-27 18:40:31
- */
-@Api(tags = "安全检查管理")
-@RestController
-@RequestMapping("/api/tower/tower-part")
-public class TowerPartController extends BaseController {
-    @Resource
-    private TowerPartService towerPartService;
-
-    @PreAuthorize("hasAuthority('tower:towerPart:list')")
-    @OperationLog
-    @ApiOperation("分页查询安全检查")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerPart>> page(TowerPartParam param) {
-        // 使用关联查询
-        return success(towerPartService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPart:list')")
-    @OperationLog
-    @ApiOperation("查询全部安全检查")
-    @GetMapping()
-    public ApiResult<List<TowerPart>> list(TowerPartParam param) {
-        PageParam<TowerPart, TowerPartParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerPartService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerPartService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPart:list')")
-    @OperationLog
-    @ApiOperation("根据id查询安全检查")
-    @GetMapping("/{id}")
-    public ApiResult<TowerPart> get(@PathVariable("id") Integer id) {
-        return success(towerPartService.getById(id));
-        // 使用关联查询
-        //return success(towerPartService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPart:save')")
-    @OperationLog
-    @ApiOperation("添加安全检查")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerPart towerPart) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerPart.setUserId(loginUser.getUserId());
-        }
-        if (towerPartService.save(towerPart)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPart:update')")
-    @OperationLog
-    @ApiOperation("修改安全检查")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerPart towerPart) {
-        if (towerPartService.updateById(towerPart)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPart:remove')")
-    @OperationLog
-    @ApiOperation("删除安全检查")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerPartService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPart:save')")
-    @OperationLog
-    @ApiOperation("批量添加安全检查")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerPart> list) {
-        if (towerPartService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPart:update')")
-    @OperationLog
-    @ApiOperation("批量修改安全检查")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerPart> batchParam) {
-        if (batchParam.update(towerPartService, "part_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPart:remove')")
-    @OperationLog
-    @ApiOperation("批量删除安全检查")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerPartService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerPartGoodsController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerPartGoodsController.java
deleted file mode 100644
index f073f18..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerPartGoodsController.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.TowerPartStock;
-import com.gxwebsoft.tower.service.TowerPartGoodsService;
-import com.gxwebsoft.tower.entity.TowerPartGoods;
-import com.gxwebsoft.tower.param.TowerPartGoodsParam;
-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.tower.service.TowerPartStockService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 安全检查控制器
- *
- * @author 科技小王子
- * @since 2024-02-27 19:41:23
- */
-@Api(tags = "安全检查管理")
-@RestController
-@RequestMapping("/api/tower/tower-part-goods")
-public class TowerPartGoodsController extends BaseController {
-    @Resource
-    private TowerPartGoodsService towerPartGoodsService;
-    @Resource
-    private TowerPartStockService towerPartStockService;
-
-    @PreAuthorize("hasAuthority('tower:towerPartGoods:list')")
-    @OperationLog
-    @ApiOperation("分页查询安全检查")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerPartGoods>> page(TowerPartGoodsParam param) {
-        // 使用关联查询
-        return success(towerPartGoodsService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPartGoods:list')")
-    @OperationLog
-    @ApiOperation("查询全部安全检查")
-    @GetMapping()
-    public ApiResult<List<TowerPartGoods>> list(TowerPartGoodsParam param) {
-        PageParam<TowerPartGoods, TowerPartGoodsParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerPartGoodsService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerPartGoodsService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPartGoods:list')")
-    @OperationLog
-    @ApiOperation("根据id查询安全检查")
-    @GetMapping("/{id}")
-    public ApiResult<TowerPartGoods> get(@PathVariable("id") Integer id) {
-        return success(towerPartGoodsService.getById(id));
-        // 使用关联查询
-        //return success(towerPartGoodsService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPartGoods:save')")
-    @OperationLog
-    @ApiOperation("添加安全检查")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerPartGoods towerPartGoods) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerPartGoods.setUserId(loginUser.getUserId());
-        }
-        if (towerPartGoodsService.save(towerPartGoods)) {
-          // 同步添加库存表
-          final TowerPartStock towerPartStock = new TowerPartStock();
-          towerPartStock.setGoodsId(towerPartGoods.getGoodsId());
-          towerPartStock.setTenantId(towerPartGoods.getTenantId());
-          towerPartStockService.save(towerPartStock);
-          return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPartGoods:update')")
-    @OperationLog
-    @ApiOperation("修改安全检查")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerPartGoods towerPartGoods) {
-        if (towerPartGoodsService.updateById(towerPartGoods)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPartGoods:remove')")
-    @OperationLog
-    @ApiOperation("删除安全检查")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerPartGoodsService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPartGoods:save')")
-    @OperationLog
-    @ApiOperation("批量添加安全检查")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerPartGoods> list) {
-        if (towerPartGoodsService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPartGoods:update')")
-    @OperationLog
-    @ApiOperation("批量修改安全检查")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerPartGoods> batchParam) {
-        if (batchParam.update(towerPartGoodsService, "goods_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPartGoods:remove')")
-    @OperationLog
-    @ApiOperation("批量删除安全检查")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerPartGoodsService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerPartStockController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerPartStockController.java
deleted file mode 100644
index 39f50e6..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerPartStockController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.service.TowerPartStockService;
-import com.gxwebsoft.tower.entity.TowerPartStock;
-import com.gxwebsoft.tower.param.TowerPartStockParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 产品库存控制器
- *
- * @author 科技小王子
- * @since 2024-02-27 19:41:23
- */
-@Api(tags = "产品库存管理")
-@RestController
-@RequestMapping("/api/tower/tower-part-stock")
-public class TowerPartStockController extends BaseController {
-    @Resource
-    private TowerPartStockService towerPartStockService;
-
-    @PreAuthorize("hasAuthority('tower:towerPartStock:list')")
-    @OperationLog
-    @ApiOperation("分页查询产品库存")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerPartStock>> page(TowerPartStockParam param) {
-        // 使用关联查询
-        return success(towerPartStockService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPartStock:list')")
-    @OperationLog
-    @ApiOperation("查询全部产品库存")
-    @GetMapping()
-    public ApiResult<List<TowerPartStock>> list(TowerPartStockParam param) {
-        PageParam<TowerPartStock, TowerPartStockParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerPartStockService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerPartStockService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPartStock:list')")
-    @OperationLog
-    @ApiOperation("根据id查询产品库存")
-    @GetMapping("/{id}")
-    public ApiResult<TowerPartStock> get(@PathVariable("id") Integer id) {
-        return success(towerPartStockService.getById(id));
-        // 使用关联查询
-        //return success(towerPartStockService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPartStock:save')")
-    @OperationLog
-    @ApiOperation("添加产品库存")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerPartStock towerPartStock) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerPartStock.setUserId(loginUser.getUserId());
-        }
-        if (towerPartStockService.save(towerPartStock)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPartStock:update')")
-    @OperationLog
-    @ApiOperation("修改产品库存")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerPartStock towerPartStock) {
-        if (towerPartStockService.updateById(towerPartStock)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPartStock:remove')")
-    @OperationLog
-    @ApiOperation("删除产品库存")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerPartStockService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPartStock:save')")
-    @OperationLog
-    @ApiOperation("批量添加产品库存")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerPartStock> list) {
-        if (towerPartStockService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPartStock:update')")
-    @OperationLog
-    @ApiOperation("批量修改产品库存")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerPartStock> batchParam) {
-        if (batchParam.update(towerPartStockService, "part_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPartStock:remove')")
-    @OperationLog
-    @ApiOperation("批量删除产品库存")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerPartStockService.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
deleted file mode 100644
index 033aa73..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceController.java
+++ /dev/null
@@ -1,157 +0,0 @@
-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<PageResult<TowerPlace>> page(TowerPlaceParam param) {
-        PageParam<TowerPlace, TowerPlaceParam> 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<TowerPlace>> list(TowerPlaceParam param) {
-        PageParam<TowerPlace, TowerPlaceParam> 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<TowerPlace> 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<TowerPlaceStandard> 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<TowerPlaceStandard> 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<TowerPlaceStandard>().eq(TowerPlaceStandard::getPlaceId,id));
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlace:save')")
-    @OperationLog
-    @ApiOperation("批量添加检查/保养部位记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerPlace> list) {
-        if (towerPlaceService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlace:update')")
-    @OperationLog
-    @ApiOperation("批量修改检查/保养部位记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerPlace> 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<Integer> ids) {
-        if (towerPlaceService.removeByIds(ids)) {
-            for (Integer id: ids){
-              towerPlaceStandardService.remove(new LambdaQueryWrapper<TowerPlaceStandard>().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
deleted file mode 100644
index c2e01dc..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceSafetyController.java
+++ /dev/null
@@ -1,135 +0,0 @@
-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<PageResult<TowerPlaceSafety>> page(TowerPlaceSafetyParam param) {
-        PageParam<TowerPlaceSafety, TowerPlaceSafetyParam> 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<TowerPlaceSafety>> list(TowerPlaceSafetyParam param) {
-        PageParam<TowerPlaceSafety, TowerPlaceSafetyParam> 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<TowerPlaceSafety> 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<TowerPlaceSafety> list) {
-        if (towerPlaceSafetyService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceSafety:update')")
-    @OperationLog
-    @ApiOperation("批量修改安全巡检部位管理表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerPlaceSafety> 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<Integer> 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
deleted file mode 100644
index 62397ba..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceStandardController.java
+++ /dev/null
@@ -1,129 +0,0 @@
-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<PageResult<TowerPlaceStandard>> page(TowerPlaceStandardParam param) {
-        PageParam<TowerPlaceStandard, TowerPlaceStandardParam> 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<TowerPlaceStandard>> list(TowerPlaceStandardParam param) {
-        PageParam<TowerPlaceStandard, TowerPlaceStandardParam> 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<TowerPlaceStandard> 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<TowerPlaceStandard> list) {
-        if (towerPlaceStandardService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceStandard:update')")
-    @OperationLog
-    @ApiOperation("批量修改检查标准附件表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerPlaceStandard> batchParam) {
-        if (batchParam.update(towerPlaceStandardService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceStandard:remove')")
-    @OperationLog
-    @ApiOperation("批量删除检查标准附件表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerPlaceStandardService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectBuildingController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerProjectBuildingController.java
deleted file mode 100644
index 5c81b9c..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectBuildingController.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.service.TowerProjectBuildingService;
-import com.gxwebsoft.tower.entity.TowerProjectBuilding;
-import com.gxwebsoft.tower.param.TowerProjectBuildingParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 项目标地控制器
- *
- * @author 科技小王子
- * @since 2024-01-05 22:01:16
- */
-@Api(tags = "项目标地管理")
-@RestController
-@RequestMapping("/api/tower/tower-project-building")
-public class TowerProjectBuildingController extends BaseController {
-    @Resource
-    private TowerProjectBuildingService towerProjectBuildingService;
-
-    @PreAuthorize("hasAuthority('tower:towerProjectBuilding:list')")
-    @OperationLog
-    @ApiOperation("分页查询项目标地")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerProjectBuilding>> page(TowerProjectBuildingParam param) {
-        PageParam<TowerProjectBuilding, TowerProjectBuildingParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerProjectBuildingService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(towerProjectBuildingService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectBuilding:list')")
-    @OperationLog
-    @ApiOperation("查询全部项目标地")
-    @GetMapping()
-    public ApiResult<List<TowerProjectBuilding>> list(TowerProjectBuildingParam param) {
-        PageParam<TowerProjectBuilding, TowerProjectBuildingParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerProjectBuildingService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerProjectBuildingService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectBuilding:list')")
-    @OperationLog
-    @ApiOperation("根据id查询项目标地")
-    @GetMapping("/{id}")
-    public ApiResult<TowerProjectBuilding> get(@PathVariable("id") Integer id) {
-        return success(towerProjectBuildingService.getById(id));
-        // 使用关联查询
-        //return success(towerProjectBuildingService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectBuilding:save')")
-    @OperationLog
-    @ApiOperation("添加项目标地")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerProjectBuilding towerProjectBuilding) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerProjectBuilding.setUserId(loginUser.getUserId());
-        }
-        if (towerProjectBuildingService.save(towerProjectBuilding)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectBuilding:update')")
-    @OperationLog
-    @ApiOperation("修改项目标地")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerProjectBuilding towerProjectBuilding) {
-        if (towerProjectBuildingService.updateById(towerProjectBuilding)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectBuilding:remove')")
-    @OperationLog
-    @ApiOperation("删除项目标地")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerProjectBuildingService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectBuilding:save')")
-    @OperationLog
-    @ApiOperation("批量添加项目标地")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerProjectBuilding> list) {
-        if (towerProjectBuildingService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectBuilding:update')")
-    @OperationLog
-    @ApiOperation("批量修改项目标地")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerProjectBuilding> batchParam) {
-        if (batchParam.update(towerProjectBuildingService, "building_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectBuilding:remove')")
-    @OperationLog
-    @ApiOperation("批量删除项目标地")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerProjectBuildingService.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
deleted file mode 100644
index b08538b..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectController.java
+++ /dev/null
@@ -1,265 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-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.tower.entity.*;
-import com.gxwebsoft.tower.param.TowerProjectParam;
-import com.gxwebsoft.tower.service.*;
-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.*;
-
-/**
- * 项目管理控制器
- *
- * @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;
-    @Resource
-    private TowerEquipmentService equipmentService;
-    @Resource
-    private UserService userService;
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:list')")
-    @OperationLog
-    @ApiOperation("项目数据")
-    @GetMapping("/data")
-    public ApiResult<Map<String, Integer>> data() {
-        Map<String, Integer> data = new HashMap<>();
-        Integer totalNum = towerProjectService.count();
-        Integer startedNum = towerProjectService.count(
-                new LambdaQueryWrapper<TowerProject>()
-                        .eq(TowerProject::getProjectStatus, "建设中")
-        );
-        Integer notStartNum = towerProjectService.count(
-                new LambdaQueryWrapper<TowerProject>()
-                        .eq(TowerProject::getProjectStatus, "未开工")
-        );
-        Integer okNum = towerProjectService.count(
-          new LambdaQueryWrapper<TowerProject>()
-            .eq(TowerProject::getProjectStatus, "已完成")
-        );
-        Integer notStartNum2 = towerProjectService.count(
-          new LambdaQueryWrapper<TowerProject>()
-            .eq(TowerProject::getProjectStatus, "停工中")
-        );
-        Integer notStartNum3 = towerProjectService.count(
-          new LambdaQueryWrapper<TowerProject>()
-            .eq(TowerProject::getProjectStatus, "停工已拆机")
-        );
-        Integer notStartNum4 = towerProjectService.count(
-          new LambdaQueryWrapper<TowerProject>()
-            .eq(TowerProject::getProjectStatus, "完工未拆机")
-        );
-        data.put("totalNum", totalNum);
-        data.put("startedNum", startedNum);
-        data.put("notStartNum", notStartNum);
-        data.put("okNum", okNum);
-        data.put("notStartNum2", notStartNum2);
-        data.put("notStartNum3", notStartNum3);
-        data.put("notStartNum4", notStartNum4);
-        return success(data);
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProject:list')")
-    @ApiOperation("分页查询项目管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerProject>> page(TowerProjectParam param) {
-        // 使用关联查询
-        PageResult<TowerProject> list = towerProjectService.pageRel(param);
-        for (TowerProject project : list.getList()) {
-            project.setEquipmentNum(towerProjectOrderService.count(
-                    new LambdaQueryWrapper<TowerProjectOrder>()
-                            .eq(TowerProjectOrder::getProjectId, project.getProjectId())
-            ));
-            project.setOrders(
-                    new HashSet<>(towerProjectOrderService.list(
-                            new LambdaQueryWrapper<TowerProjectOrder>().eq(TowerProjectOrder::getProjectId, project.getProjectId())
-                    ))
-            );
-            if (!project.getDirector().equals("0")) project.setDirectorUser(userService.getById(project.getDirector()));
-        }
-        return success(list);
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProject:list')")
-    @ApiOperation("查询全部项目管理")
-    @GetMapping()
-    public ApiResult<List<TowerProject>> list(TowerProjectParam param) {
-        // 使用关联查询
-        return success(towerProjectService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProject:list')")
-    @ApiOperation("根据id查询项目管理")
-    @GetMapping("/{id}")
-    public ApiResult<TowerProject> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(towerProjectService.getByIdRel(id));
-    }
-
-    @ApiOperation("添加项目管理")
-    @PostMapping("/new")
-    public ApiResult<?> newProject(@RequestBody TowerProject towerProject) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-            towerProject.setUserId(loginUser.getUserId());
-        }
-        towerProjectService.save(towerProject);
-        return success(towerProject);
-    }
-
-    @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<TowerProjectUser> users = towerProject.getUsers();
-                users.forEach(d -> {
-                    d.setProjectId(projectId);
-                });
-                towerProjectUserService.saveBatch(users);
-            }
-            // 批量添加项目订单
-            if (!towerProject.getOrders().isEmpty()) {
-                final Set<TowerProjectOrder> orders = towerProject.getOrders();
-                orders.forEach(d -> {
-                    d.setProjectId(projectId);
-                });
-                towerProjectOrderService.saveBatch(orders);
-            }
-            // 批量添加检查部位配置
-            if (!towerProject.getPlaces1().isEmpty()) {
-                final Set<TowerProjectPlace> places1 = towerProject.getPlaces1();
-                places1.forEach(d -> {
-                    d.setProjectId(projectId);
-                });
-                towerProjectPlaceService.saveBatch(places1);
-            }
-            // 批量添加保养部位配置
-            if (!towerProject.getPlaces2().isEmpty()) {
-                final Set<TowerProjectPlace> 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());
-            // 批量修改项目订单
-            Set<TowerProjectOrder> projectOrders = towerProject.getOrders();
-            if (towerProject.getProjectStatus().equals("建设中")) {
-                for (TowerProjectOrder order : projectOrders) {
-                    equipmentService.update(
-                            new LambdaUpdateWrapper<TowerEquipment>()
-                                    .eq(TowerEquipment::getFilingNo, order.getFilingNo())
-                                    .set(TowerEquipment::getStatus, 4)
-                    );
-                }
-            } else if (towerProject.getProjectStatus().equals("完工")) {
-                for (TowerProjectOrder order : projectOrders) {
-                    equipmentService.update(
-                            new LambdaUpdateWrapper<TowerEquipment>()
-                                    .eq(TowerEquipment::getFilingNo, order.getFilingNo())
-                                    .set(TowerEquipment::getStatus, 0)
-                    );
-                }
-            }
-            towerProjectOrderService.saveOrUpdateBatch(projectOrders);
-            // 批量修改检查/保养部位配置
-            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<TowerProject> list) {
-        if (towerProjectService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProject:update')")
-    @ApiOperation("批量修改项目管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerProject> 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<Integer> 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
deleted file mode 100644
index 870010d..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectOrderController.java
+++ /dev/null
@@ -1,128 +0,0 @@
-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<PageResult<TowerProjectOrder>> page(TowerProjectOrderParam param) {
-        // 使用关联查询
-        return success(towerProjectOrderService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectOrder:list')")
-    @OperationLog
-    @ApiOperation("查询全部合同签订设备清单")
-    @GetMapping()
-    public ApiResult<List<TowerProjectOrder>> list(TowerProjectOrderParam param) {
-        // 使用关联查询
-        return success(towerProjectOrderService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectOrder:list')")
-    @OperationLog
-    @ApiOperation("根据id查询合同签订设备清单")
-    @GetMapping("/{id}")
-    public ApiResult<TowerProjectOrder> 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<TowerProjectOrder> list) {
-        if (towerProjectOrderService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectOrder:update')")
-    @OperationLog
-    @ApiOperation("批量修改合同签订设备清单")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerProjectOrder> 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<Integer> 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
deleted file mode 100644
index f634be0..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectPlaceController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-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<PageResult<TowerProjectPlace>> page(TowerProjectPlaceParam param) {
-        // 使用关联查询
-        return success(towerProjectPlaceService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectPlace:list')")
-    @OperationLog
-    @ApiOperation("查询全部检查/保养部位配置表")
-    @GetMapping()
-    public ApiResult<List<TowerProjectPlace>> list(TowerProjectPlaceParam param) {
-        // 使用关联查询
-        return success(towerProjectPlaceService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectPlace:list')")
-    @OperationLog
-    @ApiOperation("根据id查询检查/保养部位配置表")
-    @GetMapping("/{id}")
-    public ApiResult<TowerProjectPlace> 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<TowerProjectPlace>()
-        .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<TowerProjectPlace> list) {
-        if (towerProjectPlaceService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectPlace:update')")
-    @OperationLog
-    @ApiOperation("批量修改检查/保养部位配置表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerProjectPlace> batchParam) {
-        if (batchParam.update(towerProjectPlaceService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectPlace:remove')")
-    @OperationLog
-    @ApiOperation("批量删除检查/保养部位配置表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> 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
deleted file mode 100644
index ffce0fa..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectUserController.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-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.service.UserService;
-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;
-    @Resource
-    private UserService userService;
-
-    @PreAuthorize("hasAuthority('tower:towerProjectUser:list')")
-    @OperationLog
-    @ApiOperation("分页查询项目成员")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerProjectUser>> page(TowerProjectUserParam param) {
-        PageResult<TowerProjectUser> list = towerProjectUserService.pageRel(param);
-        for(TowerProjectUser projectUser: list.getList() ){
-            projectUser.setUser(userService.getById(projectUser.getUserId()));
-        }
-        return success(list);
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectUser:list')")
-    @OperationLog
-    @ApiOperation("查询全部项目成员")
-    @GetMapping()
-    public ApiResult<List<TowerProjectUser>> list(TowerProjectUserParam param) {
-        // 使用关联查询
-        return success(towerProjectUserService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectUser:list')")
-    @OperationLog
-    @ApiOperation("根据id查询项目成员")
-    @GetMapping("/{id}")
-    public ApiResult<TowerProjectUser> 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<TowerProjectUser>()
-          .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<TowerProjectUser> list) {
-        if (towerProjectUserService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectUser:update')")
-    @OperationLog
-    @ApiOperation("批量修改项目成员")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerProjectUser> batchParam) {
-        if (batchParam.update(towerProjectUserService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectUser:remove')")
-    @OperationLog
-    @ApiOperation("批量删除项目成员")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerProjectUserService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerPurchaseController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerPurchaseController.java
deleted file mode 100644
index 998d39e..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerPurchaseController.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.service.TowerPurchaseService;
-import com.gxwebsoft.tower.entity.TowerPurchase;
-import com.gxwebsoft.tower.param.TowerPurchaseParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 采购入库表控制器
- *
- * @author 科技小王子
- * @since 2024-02-05 20:53:32
- */
-@Api(tags = "采购入库表管理")
-@RestController
-@RequestMapping("/api/tower/tower-purchase")
-public class TowerPurchaseController extends BaseController {
-    @Resource
-    private TowerPurchaseService towerPurchaseService;
-
-    @PreAuthorize("hasAuthority('tower:towerPurchase:list')")
-    @OperationLog
-    @ApiOperation("分页查询采购入库表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerPurchase>> page(TowerPurchaseParam param) {
-        PageParam<TowerPurchase, TowerPurchaseParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerPurchaseService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(towerPurchaseService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPurchase:list')")
-    @OperationLog
-    @ApiOperation("查询全部采购入库表")
-    @GetMapping()
-    public ApiResult<List<TowerPurchase>> list(TowerPurchaseParam param) {
-        PageParam<TowerPurchase, TowerPurchaseParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerPurchaseService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerPurchaseService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPurchase:list')")
-    @OperationLog
-    @ApiOperation("根据id查询采购入库表")
-    @GetMapping("/{id}")
-    public ApiResult<TowerPurchase> get(@PathVariable("id") Integer id) {
-        return success(towerPurchaseService.getById(id));
-        // 使用关联查询
-        //return success(towerPurchaseService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPurchase:save')")
-    @OperationLog
-    @ApiOperation("添加采购入库表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerPurchase towerPurchase) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerPurchase.setUserId(loginUser.getUserId());
-        }
-        if (towerPurchaseService.save(towerPurchase)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPurchase:update')")
-    @OperationLog
-    @ApiOperation("修改采购入库表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerPurchase towerPurchase) {
-        if (towerPurchaseService.updateById(towerPurchase)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPurchase:remove')")
-    @OperationLog
-    @ApiOperation("删除采购入库表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerPurchaseService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPurchase:save')")
-    @OperationLog
-    @ApiOperation("批量添加采购入库表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerPurchase> list) {
-        if (towerPurchaseService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPurchase:update')")
-    @OperationLog
-    @ApiOperation("批量修改采购入库表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerPurchase> batchParam) {
-        if (batchParam.update(towerPurchaseService, "purchase_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPurchase:remove')")
-    @OperationLog
-    @ApiOperation("批量删除采购入库表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerPurchaseService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerRentController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerRentController.java
deleted file mode 100644
index 5b4675d..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerRentController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.service.TowerRentService;
-import com.gxwebsoft.tower.entity.TowerRent;
-import com.gxwebsoft.tower.param.TowerRentParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 标准节租金控制器
- *
- * @author 科技小王子
- * @since 2024-02-05 15:04:19
- */
-@Api(tags = "标准节租金管理")
-@RestController
-@RequestMapping("/api/tower/tower-rent")
-public class TowerRentController extends BaseController {
-    @Resource
-    private TowerRentService towerRentService;
-
-    @PreAuthorize("hasAuthority('tower:towerRent:list')")
-    @OperationLog
-    @ApiOperation("分页查询标准节租金")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerRent>> page(TowerRentParam param) {
-        // 使用关联查询
-        return success(towerRentService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerRent:list')")
-    @OperationLog
-    @ApiOperation("查询全部标准节租金")
-    @GetMapping()
-    public ApiResult<List<TowerRent>> list(TowerRentParam param) {
-        PageParam<TowerRent, TowerRentParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerRentService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerRentService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerRent:list')")
-    @OperationLog
-    @ApiOperation("根据id查询标准节租金")
-    @GetMapping("/{id}")
-    public ApiResult<TowerRent> get(@PathVariable("id") Integer id) {
-        return success(towerRentService.getById(id));
-        // 使用关联查询
-        //return success(towerRentService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerRent:save')")
-    @OperationLog
-    @ApiOperation("添加标准节租金")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerRent towerRent) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerRent.setUserId(loginUser.getUserId());
-        }
-        if (towerRentService.save(towerRent)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerRent:update')")
-    @OperationLog
-    @ApiOperation("修改标准节租金")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerRent towerRent) {
-        if (towerRentService.updateById(towerRent)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerRent:remove')")
-    @OperationLog
-    @ApiOperation("删除标准节租金")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerRentService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerRent:save')")
-    @OperationLog
-    @ApiOperation("批量添加标准节租金")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerRent> list) {
-        if (towerRentService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerRent:update')")
-    @OperationLog
-    @ApiOperation("批量修改标准节租金")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerRent> batchParam) {
-        if (batchParam.update(towerRentService, "rent_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerRent:remove')")
-    @OperationLog
-    @ApiOperation("批量删除标准节租金")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerRentService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerRentRecordController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerRentRecordController.java
deleted file mode 100644
index 005755b..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerRentRecordController.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.Company;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.TowerEquipment;
-import com.gxwebsoft.tower.entity.TowerHistorySettle;
-import com.gxwebsoft.tower.entity.TowerProject;
-import com.gxwebsoft.tower.service.TowerRentRecordService;
-import com.gxwebsoft.tower.entity.TowerRentRecord;
-import com.gxwebsoft.tower.param.TowerRentRecordParam;
-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-06-13 00:42:42
- */
-@Api(tags = "租单记录管理")
-@RestController
-@RequestMapping("/api/tower/tower-rent-record")
-public class TowerRentRecordController extends BaseController {
-    @Resource
-    private TowerRentRecordService towerRentRecordService;
-
-    @PreAuthorize("hasAuthority('tower:towerRentRecord:list')")
-    @OperationLog
-    @ApiOperation("分页查询租单记录")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerRentRecord>> page(TowerRentRecordParam param) {
-        MPJLambdaWrapper<TowerRentRecord> wrapper = new MPJLambdaWrapper<>();
-        wrapper.selectAll(TowerRentRecord.class)
-                .select(TowerProject::getProjectName)
-                .select(Company::getCompanyName)
-                .selectAs(TowerEquipment::getName, TowerEquipment::getEquipmentName)
-                .selectAs(TowerEquipment::getModel, TowerEquipment::getEquipmentModel)
-                .select(TowerEquipment::getEquipmentNo)
-                .select(TowerEquipment::getFactoryNo)
-                .select(TowerEquipment::getFilingNo)
-                .leftJoin(TowerProject.class, TowerProject::getProjectId, TowerRentRecord::getProjectId)
-                .leftJoin(Company.class, Company::getCompanyId, TowerRentRecord::getCompanyId)
-                .leftJoin(TowerEquipment.class, TowerEquipment::getEquipmentId, TowerRentRecord::getEquipmentId);
-        PageParam<TowerRentRecord, TowerRentRecordParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerRentRecordService.page(page, wrapper));
-        // 使用关联查询
-        //return success(towerRentRecordService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerRentRecord:list')")
-    @OperationLog
-    @ApiOperation("查询全部租单记录")
-    @GetMapping()
-    public ApiResult<List<TowerRentRecord>> list(TowerRentRecordParam param) {
-        PageParam<TowerRentRecord, TowerRentRecordParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerRentRecordService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerRentRecordService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerRentRecord:list')")
-    @OperationLog
-    @ApiOperation("根据id查询租单记录")
-    @GetMapping("/{id}")
-    public ApiResult<TowerRentRecord> get(@PathVariable("id") Integer id) {
-        return success(towerRentRecordService.getById(id));
-        // 使用关联查询
-        //return success(towerRentRecordService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerRentRecord:save')")
-    @OperationLog
-    @ApiOperation("添加租单记录")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerRentRecord towerRentRecord) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerRentRecord.setUserId(loginUser.getUserId());
-        }
-        if (towerRentRecordService.save(towerRentRecord)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerRentRecord:update')")
-    @OperationLog
-    @ApiOperation("修改租单记录")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerRentRecord towerRentRecord) {
-        if (towerRentRecordService.updateById(towerRentRecord)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerRentRecord:remove')")
-    @OperationLog
-    @ApiOperation("删除租单记录")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerRentRecordService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerRentRecord:save')")
-    @OperationLog
-    @ApiOperation("批量添加租单记录")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerRentRecord> list) {
-        if (towerRentRecordService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerRentRecord:update')")
-    @OperationLog
-    @ApiOperation("批量修改租单记录")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerRentRecord> batchParam) {
-        if (batchParam.update(towerRentRecordService, "rent_record_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerRentRecord:remove')")
-    @OperationLog
-    @ApiOperation("批量删除租单记录")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerRentRecordService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerSecurityController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerSecurityController.java
deleted file mode 100644
index db80ee4..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerSecurityController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.gxwebsoft.tower.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.common.system.entity.User;
-import com.gxwebsoft.tower.entity.TowerProject;
-import com.gxwebsoft.tower.service.TowerProjectService;
-import com.gxwebsoft.tower.service.TowerSecurityService;
-import com.gxwebsoft.tower.entity.TowerSecurity;
-import com.gxwebsoft.tower.param.TowerSecurityParam;
-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.apache.poi.ss.formula.functions.T;
-import org.springframework.scheduling.annotation.Scheduled;
-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.Date;
-import java.util.List;
-
-/**
- * 安全检查控制器
- *
- * @author 科技小王子
- * @since 2024-02-22 13:44:23
- */
-@Api(tags = "安全检查管理")
-@RestController
-@RequestMapping("/api/tower/tower-security")
-public class TowerSecurityController extends BaseController {
-    @Resource
-    private TowerSecurityService towerSecurityService;
-    @Resource
-    private TowerProjectService towerProjectService;
-
-    @PreAuthorize("hasAuthority('tower:towerSecurity:list')")
-    @OperationLog
-    @ApiOperation("分页查询安全检查")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerSecurity>> page(TowerSecurityParam param) {
-//        PageParam<TowerSecurity, TowerSecurityParam> page = new PageParam<>(param);
-//        page.setDefaultOrder("create_time desc");
-//        return success(towerSecurityService.page(page, page.getWrapper()));
-        // 使用关联查询
-        return success(towerSecurityService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSecurity:list')")
-    @OperationLog
-    @ApiOperation("查询全部安全检查")
-    @GetMapping()
-    public ApiResult<List<TowerSecurity>> list(TowerSecurityParam param) {
-        // 使用关联查询
-        return success(towerSecurityService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSecurity:list')")
-    @OperationLog
-    @ApiOperation("根据id查询安全检查")
-    @GetMapping("/{id}")
-    public ApiResult<TowerSecurity> get(@PathVariable("id") Integer id) {
-        return success(towerSecurityService.getById(id));
-        // 使用关联查询
-        //return success(towerSecurityService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSecurity:save')")
-    @OperationLog
-    @ApiOperation("添加安全检查")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerSecurity towerSecurity) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerSecurity.setUserId(loginUser.getUserId());
-        }
-        // 生成编号
-        DateTime date = DateUtil.date();
-        final String code = DateUtil.format(date, "yyyyMMddHH");
-        towerSecurity.setSecurityCode(code.concat(towerSecurity.getProjectId().toString()));
-        if (towerSecurityService.save(towerSecurity)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSecurity:update')")
-    @OperationLog
-    @ApiOperation("修改安全检查")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerSecurity towerSecurity) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerSecurity.setUserId(loginUser.getUserId());
-        }
-        if (towerSecurityService.updateById(towerSecurity)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSecurity:remove')")
-    @OperationLog
-    @ApiOperation("删除安全检查")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerSecurityService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSecurity:save')")
-    @OperationLog
-    @ApiOperation("批量添加安全检查")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerSecurity> list) {
-        if (towerSecurityService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSecurity:update')")
-    @OperationLog
-    @ApiOperation("批量修改安全检查")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerSecurity> batchParam) {
-        if (batchParam.update(towerSecurityService, "security_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSecurity:remove')")
-    @OperationLog
-    @ApiOperation("批量删除安全检查")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerSecurityService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-//  @Scheduled(cron = "0 0 0 1 * ?")
-  @Scheduled(fixedDelay = 5000, initialDelay = 5000)
-  @Transactional(rollbackFor = {Exception.class})
-  public void wxAccountTask() {
-    System.out.println("任务：在建项目每月1号生产保养计划 = ");
-    final DateTime currentDate = DateUtil.date();
-    int currentMonth = DateUtil.month(currentDate) + 1;
-    final List<TowerProject> list = towerProjectService.list(new LambdaQueryWrapper<TowerProject>().eq(TowerProject::getProjectStatus, "建设中").ne(TowerProject::getPlanMonth,currentMonth));
-    System.out.println("list = " + list.size());
-    if (!CollectionUtils.isEmpty(list)) {
-      list.forEach(d -> {
-        // 生成保养计划
-        TowerSecurity towerSecurity = new TowerSecurity();
-        towerSecurity.setProjectId(d.getProjectId());
-        towerSecurity.setProjectName(d.getProjectName());
-        towerSecurity.setAddress(d.getProjectAddress());
-        towerSecurity.setTenantId(10049);
-        DateTime date = DateUtil.date();
-        final String code = DateUtil.format(date, "yyyyMMdd");
-        towerSecurity.setSecurityCode(code.concat(d.getProjectId().toString()));
-        d.setPlanMonth(currentMonth);
-        towerProjectService.updateById(d);
-        towerSecurityService.save(towerSecurity);
-      });
-    }
-  }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerSecurityPlantController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerSecurityPlantController.java
deleted file mode 100644
index 9c52136..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerSecurityPlantController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.service.TowerSecurityPlantService;
-import com.gxwebsoft.tower.entity.TowerSecurityPlant;
-import com.gxwebsoft.tower.param.TowerSecurityPlantParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 保养记录控制器
- *
- * @author 科技小王子
- * @since 2024-02-25 19:03:48
- */
-@Api(tags = "保养记录管理")
-@RestController
-@RequestMapping("/api/tower/tower-security-plant")
-public class TowerSecurityPlantController extends BaseController {
-    @Resource
-    private TowerSecurityPlantService towerSecurityPlantService;
-
-    @PreAuthorize("hasAuthority('tower:towerSecurityPlant:list')")
-    @OperationLog
-    @ApiOperation("分页查询保养记录")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerSecurityPlant>> page(TowerSecurityPlantParam param) {
-        // 使用关联查询
-        return success(towerSecurityPlantService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSecurityPlant:list')")
-    @OperationLog
-    @ApiOperation("查询全部保养记录")
-    @GetMapping()
-    public ApiResult<List<TowerSecurityPlant>> list(TowerSecurityPlantParam param) {
-        PageParam<TowerSecurityPlant, TowerSecurityPlantParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerSecurityPlantService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerSecurityPlantService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSecurityPlant:list')")
-    @OperationLog
-    @ApiOperation("根据id查询保养记录")
-    @GetMapping("/{id}")
-    public ApiResult<TowerSecurityPlant> get(@PathVariable("id") Integer id) {
-        return success(towerSecurityPlantService.getById(id));
-        // 使用关联查询
-        //return success(towerSecurityPlantService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSecurityPlant:save')")
-    @OperationLog
-    @ApiOperation("添加保养记录")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerSecurityPlant towerSecurityPlant) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerSecurityPlant.setUserId(loginUser.getUserId());
-        }
-        if (towerSecurityPlantService.save(towerSecurityPlant)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSecurityPlant:update')")
-    @OperationLog
-    @ApiOperation("修改保养记录")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerSecurityPlant towerSecurityPlant) {
-        if (towerSecurityPlantService.updateById(towerSecurityPlant)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSecurityPlant:remove')")
-    @OperationLog
-    @ApiOperation("删除保养记录")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerSecurityPlantService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSecurityPlant:save')")
-    @OperationLog
-    @ApiOperation("批量添加保养记录")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerSecurityPlant> list) {
-        if (towerSecurityPlantService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSecurityPlant:update')")
-    @OperationLog
-    @ApiOperation("批量修改保养记录")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerSecurityPlant> batchParam) {
-        if (batchParam.update(towerSecurityPlantService, "security_record_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSecurityPlant:remove')")
-    @OperationLog
-    @ApiOperation("批量删除保养记录")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerSecurityPlantService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerSecurityRecordController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerSecurityRecordController.java
deleted file mode 100644
index 7e9d360..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerSecurityRecordController.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.service.TowerSecurityRecordService;
-import com.gxwebsoft.tower.entity.TowerSecurityRecord;
-import com.gxwebsoft.tower.param.TowerSecurityRecordParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 保养记录控制器
- *
- * @author 科技小王子
- * @since 2024-02-27 15:00:15
- */
-@Api(tags = "保养记录管理")
-@RestController
-@RequestMapping("/api/tower/tower-security-record")
-public class TowerSecurityRecordController extends BaseController {
-    @Resource
-    private TowerSecurityRecordService towerSecurityRecordService;
-
-    @PreAuthorize("hasAuthority('tower:towerSecurityRecord:list')")
-    @OperationLog
-    @ApiOperation("分页查询保养记录")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerSecurityRecord>> page(TowerSecurityRecordParam param) {
-        // 使用关联查询
-        return success(towerSecurityRecordService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSecurityRecord:list')")
-    @OperationLog
-    @ApiOperation("查询全部保养记录")
-    @GetMapping()
-    public ApiResult<List<TowerSecurityRecord>> list(TowerSecurityRecordParam param) {
-        PageParam<TowerSecurityRecord, TowerSecurityRecordParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerSecurityRecordService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerSecurityRecordService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSecurityRecord:list')")
-    @OperationLog
-    @ApiOperation("根据id查询保养记录")
-    @GetMapping("/{id}")
-    public ApiResult<TowerSecurityRecord> get(@PathVariable("id") Integer id) {
-        return success(towerSecurityRecordService.getById(id));
-        // 使用关联查询
-        //return success(towerSecurityRecordService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSecurityRecord:save')")
-    @OperationLog
-    @ApiOperation("添加保养记录")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerSecurityRecord towerSecurityRecord) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerSecurityRecord.setUserId(loginUser.getUserId());
-        }
-        // 生成编号
-        DateTime date = DateUtil.date();
-        final String code = DateUtil.format(date, "yyyyMMddHHmm");
-        towerSecurityRecord.setSecurityCode(code);
-        if (towerSecurityRecordService.save(towerSecurityRecord)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSecurityRecord:update')")
-    @OperationLog
-    @ApiOperation("修改保养记录")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerSecurityRecord towerSecurityRecord) {
-        if (towerSecurityRecordService.updateById(towerSecurityRecord)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSecurityRecord:remove')")
-    @OperationLog
-    @ApiOperation("删除保养记录")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerSecurityRecordService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSecurityRecord:save')")
-    @OperationLog
-    @ApiOperation("批量添加保养记录")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerSecurityRecord> list) {
-        if (towerSecurityRecordService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSecurityRecord:update')")
-    @OperationLog
-    @ApiOperation("批量修改保养记录")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerSecurityRecord> batchParam) {
-        if (batchParam.update(towerSecurityRecordService, "security_record_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSecurityRecord:remove')")
-    @OperationLog
-    @ApiOperation("批量删除保养记录")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerSecurityRecordService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerSettleController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerSettleController.java
deleted file mode 100644
index 8880795..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerSettleController.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.Company;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.*;
-import com.gxwebsoft.tower.service.TowerSettleDetailService;
-import com.gxwebsoft.tower.service.TowerSettleService;
-import com.gxwebsoft.tower.param.TowerSettleParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 结算管理控制器
- *
- * @author 科技小王子
- * @since 2023-06-11 19:19:10
- */
-@Api(tags = "结算管理管理")
-@RestController
-@RequestMapping("/api/tower/tower-settle")
-public class TowerSettleController extends BaseController {
-    @Resource
-    private TowerSettleService towerSettleService;
-    private TowerSettleDetailService towerSettleDetailService;
-
-    @PreAuthorize("hasAuthority('tower:towerSettle:list')")
-    @OperationLog
-    @ApiOperation("分页查询结算管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerSettle>> page(TowerSettleParam param) {
-        MPJLambdaWrapper<TowerSettle> wrapper = new MPJLambdaWrapper<>();
-        wrapper.selectAll(TowerSettle.class)
-                .select(TowerProject::getProjectName)
-                .select(TowerContract::getContactNumber)
-                .leftJoin(TowerContract.class, TowerContract::getContractId, TowerSettle::getContractId)
-                .leftJoin(TowerProject.class, TowerProject::getProjectId, TowerContract::getProjectId);
-
-        PageParam<TowerSettle, TowerSettleParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerSettleService.page(page, wrapper));
-        // 使用关联查询
-        //return success(towerSettleService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSettle:list')")
-    @OperationLog
-    @ApiOperation("查询全部结算管理")
-    @GetMapping()
-    public ApiResult<List<TowerSettle>> list(TowerSettleParam param) {
-        PageParam<TowerSettle, TowerSettleParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerSettleService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerSettleService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSettle:list')")
-    @OperationLog
-    @ApiOperation("根据id查询结算管理")
-    @GetMapping("/{id}")
-    public ApiResult<TowerSettle> get(@PathVariable("id") Integer id) {
-        return success(towerSettleService.getById(id));
-        // 使用关联查询
-        //return success(towerSettleService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSettle:save')")
-    @OperationLog
-    @ApiOperation("添加结算管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerSettle towerSettle) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-            towerSettle.setUserId(loginUser.getUserId());
-        }
-        if (towerSettleService.save(towerSettle)) {
-            return success(towerSettle.getSettleId());
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSettle:update')")
-    @OperationLog
-    @ApiOperation("修改结算管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerSettle towerSettle) {
-        if (towerSettleService.updateById(towerSettle)) {
-            return success(towerSettle.getSettleId());
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSettle:remove')")
-    @OperationLog
-    @ApiOperation("删除结算管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerSettleService.removeById(id)) {
-            QueryWrapper<TowerSettleDetail> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("settle_id", id);
-            towerSettleDetailService.remove(queryWrapper);
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSettle:save')")
-    @OperationLog
-    @ApiOperation("批量添加结算管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerSettle> list) {
-        if (towerSettleService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSettle:update')")
-    @OperationLog
-    @ApiOperation("批量修改结算管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerSettle> batchParam) {
-        if (batchParam.update(towerSettleService, "settle_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSettle:remove')")
-    @OperationLog
-    @ApiOperation("批量删除结算管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerSettleService.removeByIds(ids)) {
-            QueryWrapper<TowerSettleDetail> queryWrapper = new QueryWrapper<>();
-            queryWrapper.in("settle_id", ids);
-            towerSettleDetailService.remove(queryWrapper);
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerSettleDetailController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerSettleDetailController.java
deleted file mode 100644
index cc1ed64..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerSettleDetailController.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.alipay.api.domain.AlipayCommerceLogisticsWaybillIstddetailQueryModel;
-import com.alipay.api.domain.Contract;
-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.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.TowerContract;
-import com.gxwebsoft.tower.entity.TowerSettle;
-import com.gxwebsoft.tower.service.TowerContractService;
-import com.gxwebsoft.tower.service.TowerContractSettleEquipmentService;
-import com.gxwebsoft.tower.service.TowerSettleDetailService;
-import com.gxwebsoft.tower.entity.TowerSettleDetail;
-import com.gxwebsoft.tower.param.TowerSettleDetailParam;
-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.tower.service.TowerSettleService;
-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.math.RoundingMode;
-import java.util.List;
-
-/**
- * 合同结算详情控制器
- *
- * @author 科技小王子
- * @since 2023-06-11 19:13:12
- */
-@Api(tags = "合同结算详情管理")
-@RestController
-@RequestMapping("/api/tower/tower-settle-detail")
-public class TowerSettleDetailController extends BaseController {
-    @Resource
-    private TowerSettleDetailService towerSettleDetailService;
-    @Resource
-    private TowerContractService towerContractService;
-    @Resource
-    private TowerSettleService towerSettleService;
-
-    @PreAuthorize("hasAuthority('tower:towerSettle:list')")
-    @OperationLog
-    @ApiOperation("分页查询合同结算详情")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerSettleDetail>> page(TowerSettleDetailParam param) {
-        PageParam<TowerSettleDetail, TowerSettleDetailParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerSettleDetailService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(towerSettleDetailService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSettle:list')")
-    @OperationLog
-    @ApiOperation("查询全部合同结算详情")
-    @GetMapping()
-    public ApiResult<List<TowerSettleDetail>> list(TowerSettleDetailParam param) {
-        PageParam<TowerSettleDetail, TowerSettleDetailParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerSettleDetailService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerSettleDetailService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSettle:list')")
-    @OperationLog
-    @ApiOperation("根据id查询合同结算详情")
-    @GetMapping("/{id}")
-    public ApiResult<TowerSettleDetail> get(@PathVariable("id") Integer id) {
-        return success(towerSettleDetailService.getById(id));
-        // 使用关联查询
-        //return success(towerSettleDetailService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSettle:save')")
-    @OperationLog
-    @ApiOperation("添加合同结算详情")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerSettleDetail towerSettleDetail) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-            towerSettleDetail.setUserId(loginUser.getUserId());
-        }
-        if (towerSettleDetailService.save(towerSettleDetail)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSettle:update')")
-    @OperationLog
-    @ApiOperation("修改合同结算详情")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerSettleDetail towerSettleDetail) {
-        if (towerSettleDetailService.updateById(towerSettleDetail)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSettle:remove')")
-    @OperationLog
-    @ApiOperation("删除合同结算详情")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerSettleDetailService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSettle:save')")
-    @OperationLog
-    @ApiOperation("批量添加合同结算详情")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerSettleDetail> list) {
-        Integer settleId = list.get(0).getSettleId();
-        LambdaUpdateWrapper<TowerSettleDetail> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
-        lambdaUpdateWrapper.eq(TowerSettleDetail::getSettleId, settleId)
-                .set(TowerSettleDetail::getDeleted, 1);
-        towerSettleDetailService.update(lambdaUpdateWrapper);
-        if (towerSettleDetailService.saveBatch(list)) {
-            setSettleAmount(settleId);
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSettle:update')")
-    @OperationLog
-    @ApiOperation("批量修改合同结算详情")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerSettleDetail> batchParam) {
-        if (batchParam.update(towerSettleDetailService, "settle_detail_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    private void setSettleAmount(Integer settleId) {
-        List<TowerSettleDetail> list = towerSettleDetailService.list(
-                new LambdaQueryWrapper<TowerSettleDetail>().eq(TowerSettleDetail::getSettleId, settleId)
-        );
-        BigDecimal totalSettleAmount = BigDecimal.valueOf(0);
-        for (TowerSettleDetail towerSettleDetail : list) {
-            if (towerSettleDetail.getType().equals(0) || towerSettleDetail.getType().equals(2)) {
-                BigDecimal monthAmount = towerSettleDetail.getMonthAmount().multiply(BigDecimal.valueOf(towerSettleDetail.getMonth()));
-                BigDecimal dayAmount = towerSettleDetail.getDailyAmount().multiply(BigDecimal.valueOf(towerSettleDetail.getDay()));
-                totalSettleAmount = totalSettleAmount.add(monthAmount).add(dayAmount).multiply(towerSettleDetail.getPayRate().divide(BigDecimal.valueOf(100), RoundingMode.FLOOR));
-            } else if (towerSettleDetail.getType().equals(1) || towerSettleDetail.getType().equals(3)) {
-                BigDecimal amount = towerSettleDetail.getSingleAmount().multiply(BigDecimal.valueOf(towerSettleDetail.getNum()));
-                totalSettleAmount = totalSettleAmount.add(amount).divide(BigDecimal.valueOf(100), RoundingMode.FLOOR);
-            } else if (towerSettleDetail.getType().equals(4)) {
-                BigDecimal amount = towerSettleDetail.getSingleAmount().multiply(BigDecimal.valueOf(towerSettleDetail.getNum()));
-                totalSettleAmount = totalSettleAmount.subtract(amount).divide(BigDecimal.valueOf(100), RoundingMode.FLOOR);
-            }
-        }
-        TowerSettle towerSettle = towerSettleService.getByIdRel(list.get(0).getSettleId());
-        TowerContract contract = towerContractService.getById(towerSettle.getContractId());
-        contract.setTotalSettleAmount(totalSettleAmount);
-        System.out.println("totalSettleAmount: " + totalSettleAmount);
-        towerContractService.updateById(contract);
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerSettle:remove')")
-    @OperationLog
-    @ApiOperation("批量删除合同结算详情")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerSettleDetailService.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
deleted file mode 100644
index c2db02b..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerWarehouseController.java
+++ /dev/null
@@ -1,132 +0,0 @@
-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<PageResult<TowerWarehouse>> page(TowerWarehouseParam param) {
-        // 使用关联查询
-        return success(towerWarehouseService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWarehouse:list')")
-    @OperationLog
-    @ApiOperation("查询全部仓库管理")
-    @GetMapping()
-    public ApiResult<List<TowerWarehouse>> list(TowerWarehouseParam param) {
-        // 使用关联查询
-        return success(towerWarehouseService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWarehouse:list')")
-    @OperationLog
-    @ApiOperation("根据id查询仓库管理")
-    @GetMapping("/{id}")
-    public ApiResult<TowerWarehouse> 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<TowerWarehouse> list) {
-        if (towerWarehouseService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWarehouse:update')")
-    @OperationLog
-    @ApiOperation("批量修改仓库管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerWarehouse> 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<Integer> ids) {
-        if (towerWarehouseService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetAuditController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetAuditController.java
deleted file mode 100644
index b6cd61c..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetAuditController.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.service.TowerWorksheetAuditService;
-import com.gxwebsoft.tower.entity.TowerWorksheetAudit;
-import com.gxwebsoft.tower.param.TowerWorksheetAuditParam;
-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-21 00:46:43
- */
-@Api(tags = "派单审核管理")
-@RestController
-@RequestMapping("/api/tower/tower-worksheet-audit")
-public class TowerWorksheetAuditController extends BaseController {
-    @Resource
-    private TowerWorksheetAuditService towerWorksheetAuditService;
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetAudit:list')")
-    @OperationLog
-    @ApiOperation("分页查询派单审核")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerWorksheetAudit>> page(TowerWorksheetAuditParam param) {
-        PageParam<TowerWorksheetAudit, TowerWorksheetAuditParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerWorksheetAuditService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(towerWorksheetAuditService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetAudit:list')")
-    @OperationLog
-    @ApiOperation("查询全部派单审核")
-    @GetMapping()
-    public ApiResult<List<TowerWorksheetAudit>> list(TowerWorksheetAuditParam param) {
-        PageParam<TowerWorksheetAudit, TowerWorksheetAuditParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerWorksheetAuditService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerWorksheetAuditService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetAudit:list')")
-    @OperationLog
-    @ApiOperation("根据id查询派单审核")
-    @GetMapping("/{id}")
-    public ApiResult<TowerWorksheetAudit> get(@PathVariable("id") Integer id) {
-        return success(towerWorksheetAuditService.getById(id));
-        // 使用关联查询
-        //return success(towerWorksheetAuditService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetAudit:save')")
-    @OperationLog
-    @ApiOperation("添加派单审核")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerWorksheetAudit towerWorksheetAudit) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerWorksheetAudit.setUserId(loginUser.getUserId());
-        }
-        if (towerWorksheetAuditService.save(towerWorksheetAudit)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetAudit:update')")
-    @OperationLog
-    @ApiOperation("修改派单审核")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerWorksheetAudit towerWorksheetAudit) {
-        if (towerWorksheetAuditService.updateById(towerWorksheetAudit)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetAudit:remove')")
-    @OperationLog
-    @ApiOperation("删除派单审核")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerWorksheetAuditService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetAudit:save')")
-    @OperationLog
-    @ApiOperation("批量添加派单审核")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerWorksheetAudit> list) {
-        if (towerWorksheetAuditService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetAudit:update')")
-    @OperationLog
-    @ApiOperation("批量修改派单审核")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerWorksheetAudit> batchParam) {
-        if (batchParam.update(towerWorksheetAuditService, "worksheet_audit_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetAudit:remove')")
-    @OperationLog
-    @ApiOperation("批量删除派单审核")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerWorksheetAuditService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetCarDispatchController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetCarDispatchController.java
deleted file mode 100644
index d65438b..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetCarDispatchController.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.service.TowerWorksheetCarDispatchService;
-import com.gxwebsoft.tower.entity.TowerWorksheetCarDispatch;
-import com.gxwebsoft.tower.param.TowerWorksheetCarDispatchParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 车辆调度控制器
- *
- * @author 科技小王子
- * @since 2023-10-31 12:05:49
- */
-@Api(tags = "车辆调度管理")
-@RestController
-@RequestMapping("/api/tower/tower-worksheet-car-dispatch")
-public class TowerWorksheetCarDispatchController extends BaseController {
-    @Resource
-    private TowerWorksheetCarDispatchService towerWorksheetCarDispatchService;
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetCarDispatch:list')")
-    @OperationLog
-    @ApiOperation("分页查询车辆调度")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerWorksheetCarDispatch>> page(TowerWorksheetCarDispatchParam param) {
-        PageParam<TowerWorksheetCarDispatch, TowerWorksheetCarDispatchParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerWorksheetCarDispatchService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(towerWorksheetCarDispatchService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetCarDispatch:list')")
-    @OperationLog
-    @ApiOperation("查询全部车辆调度")
-    @GetMapping()
-    public ApiResult<List<TowerWorksheetCarDispatch>> list(TowerWorksheetCarDispatchParam param) {
-        PageParam<TowerWorksheetCarDispatch, TowerWorksheetCarDispatchParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerWorksheetCarDispatchService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerWorksheetCarDispatchService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetCarDispatch:list')")
-    @OperationLog
-    @ApiOperation("根据id查询车辆调度")
-    @GetMapping("/{id}")
-    public ApiResult<TowerWorksheetCarDispatch> get(@PathVariable("id") Integer id) {
-        return success(towerWorksheetCarDispatchService.getById(id));
-        // 使用关联查询
-        //return success(towerWorksheetCarDispatchService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetCarDispatch:save')")
-    @OperationLog
-    @ApiOperation("添加车辆调度")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerWorksheetCarDispatch towerWorksheetCarDispatch) {
-        if (towerWorksheetCarDispatchService.save(towerWorksheetCarDispatch)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetCarDispatch:update')")
-    @OperationLog
-    @ApiOperation("修改车辆调度")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerWorksheetCarDispatch towerWorksheetCarDispatch) {
-        if (towerWorksheetCarDispatchService.updateById(towerWorksheetCarDispatch)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetCarDispatch:remove')")
-    @OperationLog
-    @ApiOperation("删除车辆调度")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerWorksheetCarDispatchService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetCarDispatch:save')")
-    @OperationLog
-    @ApiOperation("批量添加车辆调度")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerWorksheetCarDispatch> list) {
-        if (towerWorksheetCarDispatchService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetCarDispatch:update')")
-    @OperationLog
-    @ApiOperation("批量修改车辆调度")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerWorksheetCarDispatch> batchParam) {
-        if (batchParam.update(towerWorksheetCarDispatchService, "car_dispatch_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetCarDispatch:remove')")
-    @OperationLog
-    @ApiOperation("批量删除车辆调度")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerWorksheetCarDispatchService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetCheckController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetCheckController.java
deleted file mode 100644
index 6de4d1c..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetCheckController.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.service.TowerWorksheetCheckService;
-import com.gxwebsoft.tower.entity.TowerWorksheetCheck;
-import com.gxwebsoft.tower.param.TowerWorksheetCheckParam;
-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-04 01:24:45
- */
-@Api(tags = "派单现场核验管理")
-@RestController
-@RequestMapping("/api/tower/tower-worksheet-check")
-public class TowerWorksheetCheckController extends BaseController {
-    @Resource
-    private TowerWorksheetCheckService towerWorksheetCheckService;
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetCheck:list')")
-    @OperationLog
-    @ApiOperation("分页查询派单现场核验")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerWorksheetCheck>> page(TowerWorksheetCheckParam param) {
-        PageParam<TowerWorksheetCheck, TowerWorksheetCheckParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerWorksheetCheckService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(towerWorksheetCheckService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetCheck:list')")
-    @OperationLog
-    @ApiOperation("查询全部派单现场核验")
-    @GetMapping()
-    public ApiResult<List<TowerWorksheetCheck>> list(TowerWorksheetCheckParam param) {
-        PageParam<TowerWorksheetCheck, TowerWorksheetCheckParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerWorksheetCheckService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerWorksheetCheckService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetCheck:list')")
-    @OperationLog
-    @ApiOperation("根据id查询派单现场核验")
-    @GetMapping("/{id}")
-    public ApiResult<TowerWorksheetCheck> get(@PathVariable("id") Integer id) {
-        return success(towerWorksheetCheckService.getById(id));
-        // 使用关联查询
-        //return success(towerWorksheetCheckService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetCheck:save')")
-    @OperationLog
-    @ApiOperation("添加派单现场核验")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerWorksheetCheck towerWorksheetCheck) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerWorksheetCheck.setUserId(loginUser.getUserId());
-        }
-        if (towerWorksheetCheckService.save(towerWorksheetCheck)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetCheck:update')")
-    @OperationLog
-    @ApiOperation("修改派单现场核验")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerWorksheetCheck towerWorksheetCheck) {
-        if (towerWorksheetCheckService.updateById(towerWorksheetCheck)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetCheck:remove')")
-    @OperationLog
-    @ApiOperation("删除派单现场核验")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerWorksheetCheckService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetCheck:save')")
-    @OperationLog
-    @ApiOperation("批量添加派单现场核验")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerWorksheetCheck> list) {
-        if (towerWorksheetCheckService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetCheck:update')")
-    @OperationLog
-    @ApiOperation("批量修改派单现场核验")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerWorksheetCheck> batchParam) {
-        if (batchParam.update(towerWorksheetCheckService, "check_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetCheck:remove')")
-    @OperationLog
-    @ApiOperation("批量删除派单现场核验")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerWorksheetCheckService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetController.java
deleted file mode 100644
index 473346d..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetController.java
+++ /dev/null
@@ -1,317 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.yulichang.query.MPJLambdaQueryWrapper;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.tower.entity.*;
-import com.gxwebsoft.tower.service.*;
-import com.gxwebsoft.tower.param.TowerWorksheetParam;
-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-02 16:15:31
- */
-@Api(tags = "派单管理管理")
-@RestController
-@RequestMapping("/api/tower/tower-worksheet")
-public class TowerWorksheetController extends BaseController {
-    @Resource
-    private TowerWorksheetService towerWorksheetService;
-    @Resource
-    private UserService userService;
-    @Resource
-    private TowerWorksheetDetailService towerWorksheetDetailService;
-    @Resource
-    private TowerWorksheetSetUpService towerWorksheetSetUpService;
-    @Resource
-    private TowerWorksheetCheckService towerWorksheetCheckService;
-    @Resource
-    private TowerWorksheetPartsService towerWorksheetPartsService;
-    @Resource
-    private TowerEquipmentService towerEquipmentService;
-    @Resource
-    private TowerWorksheetCarDispatchService  towerWorksheetCarDispatchService;
-    @Resource
-    private TowerWorksheetAuditService towerWorksheetAuditService;
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheet:list')")
-    @OperationLog
-    @ApiOperation("分页查询派单管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerWorksheet>> page(TowerWorksheetParam param) {
-        PageParam<TowerWorksheet, TowerWorksheetParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        MPJLambdaWrapper<TowerWorksheet> queryWrapper = new MPJLambdaWrapper<>();
-        queryWrapper.selectAll(TowerWorksheet.class)
-                .select(TowerProject::getProjectName)
-                .leftJoin(TowerProject.class, TowerProject::getProjectId, TowerWorksheet::getProjectId)
-                .groupBy(TowerProject::getProjectId);
-        IPage<TowerWorksheet> pageRes = towerWorksheetService.page(page, queryWrapper);
-        for (TowerWorksheet towerWorksheet : pageRes.getRecords()) {
-            if (towerWorksheet.getProductionMangerUid() != null) {
-                towerWorksheet.setProductionMangerUser(userService.getById(towerWorksheet.getProductionMangerUid()));
-            }
-            if (towerWorksheet.getDocumentUid() != null) {
-                towerWorksheet.setDocumentUser(userService.getById(towerWorksheet.getDocumentUid()));
-            }
-            if (towerWorksheet.getClassManager() != null) {
-                towerWorksheet.setClassManagerUser(userService.getById(towerWorksheet.getClassManager()));
-            }
-            towerWorksheet.setStartUser(userService.getById(towerWorksheet.getStartUid()));
-        }
-        return success(pageRes);
-        // 使用关联查询
-        //return success(towerWorksheetService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheet:list')")
-    @OperationLog
-    @ApiOperation("查询全部派单管理")
-    @GetMapping()
-    public ApiResult<List<TowerWorksheet>> list(TowerWorksheetParam param) {
-        PageParam<TowerWorksheet, TowerWorksheetParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerWorksheetService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerWorksheetService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheet:list')")
-    @OperationLog
-    @ApiOperation("根据id查询派单管理")
-    @GetMapping("/{id}")
-    public ApiResult<TowerWorksheet> get(@PathVariable("id") Integer id) {
-        MPJLambdaWrapper<TowerWorksheet> mpjLambdaWrapper = new MPJLambdaWrapper<>();
-        mpjLambdaWrapper.eq(TowerWorksheet::getWorksheetId, id)
-                .selectAll(TowerWorksheet.class)
-                .select(TowerProject::getProjectName)
-                .select(TowerProject::getProjectAddress)
-                .select(TowerProject::getProjectRegion)
-                .leftJoin(TowerProject.class, TowerProject::getProjectId, TowerWorksheet::getProjectId);
-        TowerWorksheet towerWorksheet = towerWorksheetService.getOne(mpjLambdaWrapper);
-
-        MPJLambdaWrapper<TowerWorksheetDetail> queryWrapperDetail = new MPJLambdaWrapper<>();
-        queryWrapperDetail.eq(TowerWorksheetDetail::getWorksheetId, towerWorksheet.getWorksheetId())
-                .selectAll(TowerWorksheetDetail.class)
-                .select(TowerEquipment::getEquipmentNo)
-                .select(TowerEquipment::getFactoryNo)
-                .selectAs(TowerEquipment::getName, TowerEquipment::getEquipmentName)
-                .select(TowerEquipment::getModel)
-                .leftJoin(TowerEquipment.class, TowerEquipment::getEquipmentId, TowerWorksheetDetail::getEquipmentId);
-        TowerWorksheetDetail towerWorksheetDetail = towerWorksheetDetailService.getOne(queryWrapperDetail);
-        towerWorksheet.setDetail(towerWorksheetDetail);
-
-        towerWorksheet.setSetUp(towerWorksheetSetUpService
-                .getOne(new LambdaQueryWrapper<TowerWorksheetSetUp>()
-                        .eq(TowerWorksheetSetUp::getWorksheetId, towerWorksheet.getWorksheetId())));
-        towerWorksheet.setCheck(towerWorksheetCheckService
-                .getOne(new LambdaQueryWrapper<TowerWorksheetCheck>()
-                        .eq(TowerWorksheetCheck::getWorksheetId, towerWorksheet.getWorksheetId())));
-        List<TowerWorksheetParts> towerWorksheetParts = towerWorksheetPartsService.list(
-                new MPJLambdaWrapper<TowerWorksheetParts>()
-                        .selectAll(TowerWorksheetParts.class)
-                        .select("parent.title as parent_parts_title")
-                        .select("parts.title as parts_title")
-                        .leftJoin("shop_category parent on parent.category_id = t.parent_id")
-                        .leftJoin("shop_category parts on parts.category_id = t.cate_id")
-                        .eq(TowerWorksheetParts::getWorksheetId, towerWorksheet.getWorksheetId()));
-        towerWorksheet.setParts(towerWorksheetParts);
-        if (towerWorksheet.getProductionMangerUid() != null) {
-            towerWorksheet.setProductionMangerUser(userService.getById(towerWorksheet.getProductionMangerUid()));
-        }
-        if (towerWorksheet.getDocumentUid() != null) {
-            towerWorksheet.setDocumentUser(userService.getById(towerWorksheet.getDocumentUid()));
-        }
-        if (towerWorksheet.getClassManager() != null) {
-            towerWorksheet.setClassManagerUser(userService.getById(towerWorksheet.getClassManager()));
-        }
-        towerWorksheet.setStartUser(userService.getById(towerWorksheet.getStartUid()));
-        TowerWorksheetSetUp towerWorksheetSetUp = towerWorksheetSetUpService.getOne(
-                new LambdaQueryWrapper<TowerWorksheetSetUp>()
-                        .eq(TowerWorksheetSetUp::getWorksheetId, towerWorksheet.getWorksheetId()));
-        towerWorksheet.setSetUp(towerWorksheetSetUp);
-        return success(towerWorksheet);
-        // 使用关联查询
-        //return success(towerWorksheetService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheet:list')")
-    @OperationLog
-    @ApiOperation("根据id查询派单管理")
-    @PostMapping("/by-work-type")
-    public ApiResult<?> infoByWorkType(@RequestBody TowerWorksheet towerWorksheetParam) {
-        MPJLambdaWrapper<TowerWorksheetDetail> queryWrapperDetail = new MPJLambdaWrapper<>();
-        queryWrapperDetail.eq(TowerWorksheetDetail::getProjectId, towerWorksheetParam.getProjectId())
-                .eq(TowerWorksheetDetail::getWorkType, towerWorksheetParam.getWorkType())
-                .selectAll(TowerWorksheetDetail.class)
-                .select(TowerEquipment::getEquipmentNo)
-                .select(TowerEquipment::getFactoryNo)
-                .selectAs(TowerEquipment::getName, TowerEquipment::getEquipmentName)
-                .select(TowerEquipment::getModel)
-                .leftJoin(TowerEquipment.class, TowerEquipment::getEquipmentId, TowerWorksheetDetail::getEquipmentId);
-        List<TowerWorksheetDetail> towerWorksheetDetailList = towerWorksheetDetailService.list(queryWrapperDetail);
-
-        if (towerWorksheetDetailList != null && !towerWorksheetDetailList.isEmpty()) {
-            List<TowerWorksheet> worksheetList = new ArrayList<>();
-            for (TowerWorksheetDetail towerWorksheetDetail : towerWorksheetDetailList) {
-                MPJLambdaWrapper<TowerWorksheet> mpjLambdaWrapper = new MPJLambdaWrapper<>();
-                mpjLambdaWrapper.eq(TowerWorksheet::getWorksheetId, towerWorksheetDetail.getWorksheetId())
-                        .selectAll(TowerWorksheet.class)
-                        .select(TowerProject::getProjectName)
-                        .select(TowerProject::getProjectAddress)
-                        .select(TowerProject::getProjectRegion)
-                        .leftJoin(TowerProject.class, TowerProject::getProjectId, TowerWorksheet::getProjectId);
-                TowerWorksheet towerWorksheet = towerWorksheetService.getOne(mpjLambdaWrapper);
-                towerWorksheetDetail.setEquipment(towerEquipmentService.getById(towerWorksheetDetail.getEquipmentId()));
-                towerWorksheet.setDetail(towerWorksheetDetail);
-
-
-                towerWorksheet.setSetUp(towerWorksheetSetUpService
-                        .getOne(new LambdaQueryWrapper<TowerWorksheetSetUp>()
-                                .eq(TowerWorksheetSetUp::getWorksheetId, towerWorksheet.getWorksheetId())));
-                TowerWorksheetCheck towerWorksheetCheck = towerWorksheetCheckService
-                        .getOne(new LambdaQueryWrapper<TowerWorksheetCheck>()
-                                .eq(TowerWorksheetCheck::getWorksheetId, towerWorksheet.getWorksheetId()));
-                if (towerWorksheetCheck != null) towerWorksheetCheck.setNickname(userService.getById(towerWorksheetCheck.getUserId()).getNickname());
-                towerWorksheet.setCheck(towerWorksheetCheck);
-                List<TowerWorksheetParts> towerWorksheetParts = towerWorksheetPartsService.list(
-                        new MPJLambdaWrapper<TowerWorksheetParts>()
-                                .selectAll(TowerWorksheetParts.class)
-                                .select("parent.title as parent_parts_title")
-                                .select("parts.title as parts_title")
-                                .leftJoin("shop_category parent on parent.category_id = t.parent_id")
-                                .leftJoin("shop_category parts on parts.category_id = t.cate_id")
-                                .eq(TowerWorksheetParts::getWorksheetId, towerWorksheet.getWorksheetId()));
-                towerWorksheet.setParts(towerWorksheetParts);
-                if (towerWorksheet.getProductionMangerUid() != null) {
-                    towerWorksheet.setProductionMangerUser(userService.getById(towerWorksheet.getProductionMangerUid()));
-                }
-                if (towerWorksheet.getDocumentUid() != null) {
-                    towerWorksheet.setDocumentUser(userService.getById(towerWorksheet.getDocumentUid()));
-                }
-                if (towerWorksheet.getAssetUid() != null) {
-                    towerWorksheet.setAssetUser(userService.getById(towerWorksheet.getAssetUid()));
-                }
-                if (towerWorksheet.getCarDispatchUid() != null) {
-                    towerWorksheet.setCarDispatchUser(userService.getById(towerWorksheet.getCarDispatchUid()));
-                }
-                if (towerWorksheet.getClassManager() != null) {
-                    towerWorksheet.setClassManagerUser(userService.getById(towerWorksheet.getClassManager()));
-                }
-                if (towerWorksheet.getFixUid() != null) {
-                    towerWorksheet.setFixUser(userService.getById(towerWorksheet.getFixUid()));
-                }
-                towerWorksheet.setStartUser(userService.getById(towerWorksheet.getStartUid()));
-                TowerWorksheetSetUp towerWorksheetSetUp = towerWorksheetSetUpService.getOne(
-                        new LambdaQueryWrapper<TowerWorksheetSetUp>()
-                                .eq(TowerWorksheetSetUp::getWorksheetId, towerWorksheet.getWorksheetId()));
-                towerWorksheet.setSetUp(towerWorksheetSetUp);
-                if (!towerWorksheet.getAuditStatus().equals(0)) {
-                    List<TowerWorksheetAudit> towerWorksheetAuditList = towerWorksheetAuditService.list(
-                            new LambdaQueryWrapper<TowerWorksheetAudit>().eq(TowerWorksheetAudit::getWorksheetId, towerWorksheet.getWorksheetId())
-                    );
-                    List<User> auditUserList = userService.listByIds(towerWorksheetAuditList.stream().map(TowerWorksheetAudit::getUserId).collect(Collectors.toList()));
-                    for (User user : auditUserList) {
-                        user.setAuditStatus(towerWorksheetAuditList.stream().filter(audit -> audit.getUserId().equals(user.getUserId())).findFirst().get().getStatus());
-                    }
-                    towerWorksheet.setAuditList(auditUserList);
-                }
-                towerWorksheet.setCarDispatchList(towerWorksheetCarDispatchService.list(
-                        new LambdaQueryWrapper<TowerWorksheetCarDispatch>().eq(TowerWorksheetCarDispatch::getWorksheetId, towerWorksheet.getWorksheetId())
-                ));
-                worksheetList.add(towerWorksheet);
-            }
-            return success(worksheetList);
-        }else return fail("数据异常");
-        // 使用关联查询
-        //return success(towerWorksheetService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheet:save')")
-    @OperationLog
-    @ApiOperation("添加派单管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerWorksheet towerWorksheet) {
-        if (towerWorksheetService.save(towerWorksheet)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheet:update')")
-    @OperationLog
-    @ApiOperation("修改派单管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerWorksheet towerWorksheet) {
-        if (towerWorksheetService.updateById(towerWorksheet)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheet:remove')")
-    @OperationLog
-    @ApiOperation("删除派单管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerWorksheetService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheet:save')")
-    @OperationLog
-    @ApiOperation("批量添加派单管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerWorksheet> list) {
-        if (towerWorksheetService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheet:update')")
-    @OperationLog
-    @ApiOperation("批量修改派单管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerWorksheet> batchParam) {
-        if (batchParam.update(towerWorksheetService, "worksheet_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheet:remove')")
-    @OperationLog
-    @ApiOperation("批量删除派单管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerWorksheetService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetDetailController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetDetailController.java
deleted file mode 100644
index 55c5817..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetDetailController.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.service.TowerWorksheetDetailService;
-import com.gxwebsoft.tower.entity.TowerWorksheetDetail;
-import com.gxwebsoft.tower.param.TowerWorksheetDetailParam;
-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-03 10:56:04
- */
-@Api(tags = "派单详情管理")
-@RestController
-@RequestMapping("/api/tower/tower-worksheet-detail")
-public class TowerWorksheetDetailController extends BaseController {
-    @Resource
-    private TowerWorksheetDetailService towerWorksheetDetailService;
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetDetail:list')")
-    @OperationLog
-    @ApiOperation("分页查询派单详情")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerWorksheetDetail>> page(TowerWorksheetDetailParam param) {
-        PageParam<TowerWorksheetDetail, TowerWorksheetDetailParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerWorksheetDetailService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(towerWorksheetDetailService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetDetail:list')")
-    @OperationLog
-    @ApiOperation("查询全部派单详情")
-    @GetMapping()
-    public ApiResult<List<TowerWorksheetDetail>> list(TowerWorksheetDetailParam param) {
-        PageParam<TowerWorksheetDetail, TowerWorksheetDetailParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerWorksheetDetailService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerWorksheetDetailService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetDetail:list')")
-    @OperationLog
-    @ApiOperation("根据id查询派单详情")
-    @GetMapping("/{id}")
-    public ApiResult<TowerWorksheetDetail> get(@PathVariable("id") Integer id) {
-        return success(towerWorksheetDetailService.getById(id));
-        // 使用关联查询
-        //return success(towerWorksheetDetailService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetDetail:save')")
-    @OperationLog
-    @ApiOperation("添加派单详情")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerWorksheetDetail towerWorksheetDetail) {
-        if (towerWorksheetDetailService.save(towerWorksheetDetail)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetDetail:update')")
-    @OperationLog
-    @ApiOperation("修改派单详情")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerWorksheetDetail towerWorksheetDetail) {
-        if (towerWorksheetDetailService.updateById(towerWorksheetDetail)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetDetail:remove')")
-    @OperationLog
-    @ApiOperation("删除派单详情")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerWorksheetDetailService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetDetail:save')")
-    @OperationLog
-    @ApiOperation("批量添加派单详情")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerWorksheetDetail> list) {
-        if (towerWorksheetDetailService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetDetail:update')")
-    @OperationLog
-    @ApiOperation("批量修改派单详情")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerWorksheetDetail> batchParam) {
-        if (batchParam.update(towerWorksheetDetailService, "detail_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetDetail:remove')")
-    @OperationLog
-    @ApiOperation("批量删除派单详情")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerWorksheetDetailService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetPartsController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetPartsController.java
deleted file mode 100644
index aa7bf06..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetPartsController.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.service.TowerWorksheetPartsService;
-import com.gxwebsoft.tower.entity.TowerWorksheetParts;
-import com.gxwebsoft.tower.param.TowerWorksheetPartsParam;
-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-03 10:18:57
- */
-@Api(tags = "派单配件管理")
-@RestController
-@RequestMapping("/api/tower/tower-worksheet-parts")
-public class TowerWorksheetPartsController extends BaseController {
-    @Resource
-    private TowerWorksheetPartsService towerWorksheetPartsService;
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetParts:list')")
-    @OperationLog
-    @ApiOperation("分页查询派单配件")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerWorksheetParts>> page(TowerWorksheetPartsParam param) {
-        PageParam<TowerWorksheetParts, TowerWorksheetPartsParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerWorksheetPartsService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(towerWorksheetPartsService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetParts:list')")
-    @OperationLog
-    @ApiOperation("查询全部派单配件")
-    @GetMapping()
-    public ApiResult<List<TowerWorksheetParts>> list(TowerWorksheetPartsParam param) {
-        PageParam<TowerWorksheetParts, TowerWorksheetPartsParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerWorksheetPartsService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerWorksheetPartsService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetParts:list')")
-    @OperationLog
-    @ApiOperation("根据id查询派单配件")
-    @GetMapping("/{id}")
-    public ApiResult<TowerWorksheetParts> get(@PathVariable("id") Integer id) {
-        return success(towerWorksheetPartsService.getById(id));
-        // 使用关联查询
-        //return success(towerWorksheetPartsService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetParts:save')")
-    @OperationLog
-    @ApiOperation("添加派单配件")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerWorksheetParts towerWorksheetParts) {
-        if (towerWorksheetPartsService.save(towerWorksheetParts)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetParts:update')")
-    @OperationLog
-    @ApiOperation("修改派单配件")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerWorksheetParts towerWorksheetParts) {
-        if (towerWorksheetPartsService.updateById(towerWorksheetParts)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetParts:remove')")
-    @OperationLog
-    @ApiOperation("删除派单配件")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerWorksheetPartsService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetParts:save')")
-    @OperationLog
-    @ApiOperation("批量添加派单配件")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerWorksheetParts> list) {
-        if (towerWorksheetPartsService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetParts:update')")
-    @OperationLog
-    @ApiOperation("批量修改派单配件")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerWorksheetParts> batchParam) {
-        if (batchParam.update(towerWorksheetPartsService, "parts_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetParts:remove')")
-    @OperationLog
-    @ApiOperation("批量删除派单配件")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerWorksheetPartsService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetSetUpController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetSetUpController.java
deleted file mode 100644
index d566d61..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerWorksheetSetUpController.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.service.TowerWorksheetSetUpService;
-import com.gxwebsoft.tower.entity.TowerWorksheetSetUp;
-import com.gxwebsoft.tower.param.TowerWorksheetSetUpParam;
-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-03 10:18:57
- */
-@Api(tags = "派单安装信息管理")
-@RestController
-@RequestMapping("/api/tower/tower-worksheet-set-up")
-public class TowerWorksheetSetUpController extends BaseController {
-    @Resource
-    private TowerWorksheetSetUpService towerWorksheetSetUpService;
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetSetUp:list')")
-    @OperationLog
-    @ApiOperation("分页查询派单安装信息")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerWorksheetSetUp>> page(TowerWorksheetSetUpParam param) {
-        PageParam<TowerWorksheetSetUp, TowerWorksheetSetUpParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerWorksheetSetUpService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(towerWorksheetSetUpService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetSetUp:list')")
-    @OperationLog
-    @ApiOperation("查询全部派单安装信息")
-    @GetMapping()
-    public ApiResult<List<TowerWorksheetSetUp>> list(TowerWorksheetSetUpParam param) {
-        PageParam<TowerWorksheetSetUp, TowerWorksheetSetUpParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerWorksheetSetUpService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerWorksheetSetUpService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetSetUp:list')")
-    @OperationLog
-    @ApiOperation("根据id查询派单安装信息")
-    @GetMapping("/{id}")
-    public ApiResult<TowerWorksheetSetUp> get(@PathVariable("id") Integer id) {
-        return success(towerWorksheetSetUpService.getById(id));
-        // 使用关联查询
-        //return success(towerWorksheetSetUpService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetSetUp:save')")
-    @OperationLog
-    @ApiOperation("添加派单安装信息")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerWorksheetSetUp towerWorksheetSetUp) {
-        if (towerWorksheetSetUpService.save(towerWorksheetSetUp)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetSetUp:update')")
-    @OperationLog
-    @ApiOperation("修改派单安装信息")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerWorksheetSetUp towerWorksheetSetUp) {
-        if (towerWorksheetSetUpService.updateById(towerWorksheetSetUp)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetSetUp:remove')")
-    @OperationLog
-    @ApiOperation("删除派单安装信息")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerWorksheetSetUpService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetSetUp:save')")
-    @OperationLog
-    @ApiOperation("批量添加派单安装信息")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerWorksheetSetUp> list) {
-        if (towerWorksheetSetUpService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetSetUp:update')")
-    @OperationLog
-    @ApiOperation("批量修改派单安装信息")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerWorksheetSetUp> batchParam) {
-        if (batchParam.update(towerWorksheetSetUpService, "set_up_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWorksheetSetUp:remove')")
-    @OperationLog
-    @ApiOperation("批量删除派单安装信息")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerWorksheetSetUpService.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
deleted file mode 100644
index 9bab0c6..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerAccessory.java
+++ /dev/null
@@ -1,117 +0,0 @@
-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 accessoryNum;
-
-    @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 buyDate;
-
-    @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/TowerContract.java b/src/main/java/com/gxwebsoft/tower/entity/TowerContract.java
deleted file mode 100644
index 529ef48..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerContract.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.time.LocalDateTime;
-
-import com.baomidou.mybatisplus.annotation.TableLogic;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 合同存档
- *
- * @author 科技小王子
- * @since 2023-06-08 22:36:47
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerContract对象", description = "合同存档")
-public class TowerContract implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "contract_id", type = IdType.AUTO)
-    private Integer contractId;
-
-    @ApiModelProperty(value = "项目ID")
-    private Integer projectId;
-
-    @ApiModelProperty(value = "出租单位")
-    private Integer companyId;
-
-    @ApiModelProperty(value = "承租单位")
-    private Integer customerId;
-
-    @ApiModelProperty(value = "业务负责人")
-    private String customerContact;
-
-    @ApiModelProperty(value = "备案编号")
-    private String filingNo;
-
-    @ApiModelProperty(value = "合同编号")
-    private String contactNumber;
-
-    @ApiModelProperty(value = "合同编号")
-    @TableField(exist = false)
-    private String contractNumber;
-
-    @ApiModelProperty(value = "签订日期")
-    private String signDate;
-
-    @ApiModelProperty(value = "开始日期")
-    private String startDate;
-
-    @ApiModelProperty(value = "截止日期")
-    private String endDate;
-
-    @ApiModelProperty(value = "合同金额")
-    private BigDecimal contractAmount;
-
-    @ApiModelProperty(value = "合同约定金额")
-    private BigDecimal contactAgreeAmount;
-
-    @ApiModelProperty(value = "合同存档0未存档,1已存档")
-    private Boolean isInStock;
-
-    @ApiModelProperty(value = "是否自动结算")
-    private Boolean autoSettle;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "已生成结算次数")
-    private Integer settleNum;
-
-    @ApiModelProperty(value = "结算方式")
-    private Integer settleMethod;
-
-    @ApiModelProperty(value = "跨月结算日期")
-    private Integer extendMonthDate;
-
-    @ApiModelProperty(value = "累计开票金额")
-    private BigDecimal totalInvoicingAmount;
-
-    @ApiModelProperty(value = "累计收款金额")
-    private BigDecimal totalIncomeAmount;
-
-    @ApiModelProperty(value = "累计结算金额")
-    private BigDecimal totalSettleAmount;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private String remark;
-
-    @ApiModelProperty(value = "文件列表")
-    private String fileList;
-
-    @ApiModelProperty(value = "支付比例")
-    private BigDecimal payRate;
-
-    @TableField(exist = false)
-    private String projectName;
-
-    @TableField(exist = false)
-    private String companyName;
-
-    @TableField(exist = false)
-    private String customerName;
-
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerContractEquipment.java b/src/main/java/com/gxwebsoft/tower/entity/TowerContractEquipment.java
deleted file mode 100644
index 393b9f8..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerContractEquipment.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 合同设备清单
- *
- * @author 科技小王子
- * @since 2023-06-09 13:42:20
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerContractEquipment对象", description = "合同设备清单")
-public class TowerContractEquipment implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "contract_equipment_id", type = IdType.AUTO)
-    private Integer contractEquipmentId;
-
-    @ApiModelProperty(value = "合同ID")
-    private Integer contractId;
-
-    @ApiModelProperty(value = "设备ID")
-    private Integer equipmentId;
-
-    @ApiModelProperty(value = "设备")
-    @TableField(exist = false)
-    private String equipmentName;
-
-    @ApiModelProperty(value = "出厂编号")
-    @TableField(exist = false)
-    private String factoryNo;
-
-    @ApiModelProperty(value = "设备编号")
-    @TableField(exist = false)
-    private String equipmentNo;
-
-    @ApiModelProperty(value = "备案编号")
-    @TableField(exist = false)
-    private String filingNo;
-
-    @ApiModelProperty(value = "型号")
-    private String equipmentModel;
-
-    @ApiModelProperty(value = "签订数量")
-    private Integer num;
-
-    @ApiModelProperty(value = "计划租期(月)")
-    private Integer planRentMonth;
-
-    @ApiModelProperty(value = "租金")
-    private BigDecimal rentAmount;
-
-    @ApiModelProperty(value = "进退场费")
-    private BigDecimal inOutAmount;
-
-    @ApiModelProperty(value = "劳务费")
-    private BigDecimal workerAmount;
-
-    @ApiModelProperty(value = "其他费用")
-    private BigDecimal otherAmount;
-
-    @ApiModelProperty(value = "预埋费")
-    private BigDecimal preBuryAmount;
-
-    private String remark;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerContractFile.java b/src/main/java/com/gxwebsoft/tower/entity/TowerContractFile.java
deleted file mode 100644
index fa949d1..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerContractFile.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.time.LocalDateTime;
-
-import com.baomidou.mybatisplus.annotation.TableLogic;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 合同附件
- *
- * @author 科技小王子
- * @since 2023-06-09 13:42:20
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerContractFile对象", description = "合同附件")
-public class TowerContractFile implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "contract_file_id", type = IdType.AUTO)
-    private Integer contractFileId;
-
-    @ApiModelProperty(value = "合同id")
-    private Integer contractId;
-
-    @ApiModelProperty(value = "文件路径")
-    private String path;
-
-    @ApiModelProperty(value = "文件类型")
-    private String type;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerContractFinalSettle.java b/src/main/java/com/gxwebsoft/tower/entity/TowerContractFinalSettle.java
deleted file mode 100644
index 0889fe0..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerContractFinalSettle.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 项目结算书
- *
- * @author 科技小王子
- * @since 2023-06-17 22:34:32
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerContractFinalSettle对象", description = "项目结算书")
-public class TowerContractFinalSettle implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "contract_final_settle_id", type = IdType.AUTO)
-    private Integer contractFinalSettleId;
-
-    @ApiModelProperty(value = "合同ID")
-    private Integer contractId;
-
-    @ApiModelProperty(value = "结算单位")
-    private Integer settleCompanyId;
-
-    @ApiModelProperty(value = "登记人员")
-    private String signName;
-
-    @ApiModelProperty(value = "登记日期")
-    private String signDate;
-
-    private String remark;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "合同编号")
-    @TableField(exist = false)
-    private String contactNumber;
-
-    @ApiModelProperty(value = "开票金额")
-    @TableField(exist = false)
-    private String totalInvoicingAmount;
-
-    @ApiModelProperty(value = "收入金额")
-    @TableField(exist = false)
-    private String totalIncomeAmount;
-
-    @ApiModelProperty(value = "结算公司")
-    @TableField(exist = false)
-    private String companyName;
-
-    @ApiModelProperty(value = "结算日期")
-    @TableField(exist = false)
-    private String endDate;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerContractFinalSettleLost.java b/src/main/java/com/gxwebsoft/tower/entity/TowerContractFinalSettleLost.java
deleted file mode 100644
index c063d05..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerContractFinalSettleLost.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 结算书缺失物品
- *
- * @author 科技小王子
- * @since 2023-06-18 00:52:41
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerContractFinalSettleLost对象", description = "结算书缺失物品")
-public class TowerContractFinalSettleLost implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "final_settle_lost_id", type = IdType.AUTO)
-    private Integer finalSettleLostId;
-
-    @ApiModelProperty(value = "结算书ID")
-    private Integer finalSettleId;
-
-    @ApiModelProperty(value = "配机ID")
-    private Integer itemId;
-
-    @ApiModelProperty(value = "赔偿金额")
-    private BigDecimal amount;
-
-    @ApiModelProperty(value = "赔偿数量")
-    private Integer num;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerContractSettleEquipment.java b/src/main/java/com/gxwebsoft/tower/entity/TowerContractSettleEquipment.java
deleted file mode 100644
index 124b3dd..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerContractSettleEquipment.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 合同结算设备
- *
- * @author 科技小王子
- * @since 2023-06-10 16:52:12
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerContractSettleEquipment对象", description = "合同结算设备")
-public class TowerContractSettleEquipment implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "contract_settle_id", type = IdType.AUTO)
-    private Integer contractSettleId;
-
-    private Integer contractId;
-
-    @ApiModelProperty(value = "设备ID")
-    private Integer equipmentId;
-
-    @ApiModelProperty(value = "设备")
-    private String equipmentName;
-
-    @ApiModelProperty(value = "型号")
-    private String equipmentModel;
-
-    @ApiModelProperty(value = "出厂编号")
-    private String factoryNo;
-
-    @ApiModelProperty(value = "设备编号")
-    private String equipmentNo;
-
-    @ApiModelProperty(value = "计划租期(月)")
-    private Integer rentMonth;
-
-    @ApiModelProperty(value = "租金(元)")
-    private BigDecimal rentAmount;
-
-    @ApiModelProperty(value = "进退场费")
-    private BigDecimal inOutAmount;
-
-    @ApiModelProperty(value = "劳务费")
-    private BigDecimal workerAmount;
-
-    @ApiModelProperty(value = "其他费用")
-    private BigDecimal otherAmount;
-
-    @ApiModelProperty(value = "其他费用计算模式(0每月1一次性)")
-    private Integer otherAmountCalMode;
-
-    @ApiModelProperty(value = "预埋费")
-    private BigDecimal preBuryAmount;
-
-    private String remark;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "累计应收金额/预计产值")
-    @TableField(exist = false)
-    private BigDecimal totalReceivableAmount;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerContractSettleRule.java b/src/main/java/com/gxwebsoft/tower/entity/TowerContractSettleRule.java
deleted file mode 100644
index 8046bdf..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerContractSettleRule.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 合同结算规则
- *
- * @author 科技小王子
- * @since 2023-06-11 13:48:41
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerContractSettleRule对象", description = "合同结算规则")
-public class TowerContractSettleRule implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "contract_settle_rule_id", type = IdType.AUTO)
-    private Integer contractSettleRuleId;
-
-    @ApiModelProperty(value = "合同ID")
-    private Integer contractId;
-
-    @ApiModelProperty(value = "结算开始日期")
-    private String startDate;
-
-    @ApiModelProperty(value = "结算结束日期")
-    private String endDate;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerCustomer.java b/src/main/java/com/gxwebsoft/tower/entity/TowerCustomer.java
deleted file mode 100644
index 09d0397..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerCustomer.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 客户管理
- *
- * @author 科技小王子
- * @since 2023-06-08 21:04:27
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerCustomer对象", description = "客户管理")
-public class TowerCustomer implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "customer_id", type = IdType.AUTO)
-    private Integer customerId;
-
-    @ApiModelProperty(value = "客户名称")
-    private String name;
-
-    @ApiModelProperty(value = "客户名称")
-    @TableField(exist = false)
-    private String customerName;
-
-    @ApiModelProperty(value = "全称")
-    private String fullName;
-
-    @ApiModelProperty(value = "客户标识")
-    private String creditCode;
-
-    @ApiModelProperty(value = "地址")
-    private String address;
-
-    @ApiModelProperty(value = "联系人")
-    private String contact;
-
-    @ApiModelProperty(value = "座机")
-    private String phone;
-
-    @ApiModelProperty(value = "手机")
-    private String telPhone;
-
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "头像")
-    private String avatar;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Boolean deleted;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerEquipment.java b/src/main/java/com/gxwebsoft/tower/entity/TowerEquipment.java
deleted file mode 100644
index d64d02a..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerEquipment.java
+++ /dev/null
@@ -1,185 +0,0 @@
-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;
-import java.util.List;
-
-/**
- * 塔吊设备管理
- *
- * @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 = "设备名称")
-    @TableField(exist = false)
-    private String equipmentName;
-
-    @ApiModelProperty(value = "设备型号")
-    private String model;
-
-    @ApiModelProperty(value = "设备型号")
-    @TableField(exist = false)
-    private String equipmentModel;
-
-    @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;
-
-    @ApiModelProperty(value = "历史所在项目列表")
-    @TableField(exist = false)
-    private List<TowerProject> projectList;
-
-    @ApiModelProperty(value = "所在项目名")
-    @TableField(exist = false)
-    private String projectName;
-
-    @ApiModelProperty(value = "定检状态")
-    @TableField(exist = false)
-    private String securityStatus;
-
-    @ApiModelProperty(value = "主管部门")
-    @TableField(exist = false)
-    private String competentDepartment;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerFall.java b/src/main/java/com/gxwebsoft/tower/entity/TowerFall.java
deleted file mode 100644
index 00ebe00..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerFall.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-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-06-05 22:40:54
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerFall对象", description = "项目管理")
-public class TowerFall implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "防坠器编号")
-    private String code;
-
-    @ApiModelProperty(value = "防坠器型号")
-    private String model;
-
-    @ApiModelProperty(value = "制造厂家")
-    private String factory;
-
-    @ApiModelProperty(value = "产权单位")
-    private Integer companyId;
-
-    @ApiModelProperty(value = "产权单位名称")
-//    @TableField(exist = false)
-    private String companyName;
-
-    @ApiModelProperty(value = "出厂日期")
-    private Date factoryDate;
-
-    @ApiModelProperty(value = "报废日期")
-    private Date discardDate;
-
-    @ApiModelProperty(value = "检测日期")
-    private String checkDate;
-
-    @ApiModelProperty(value = "出厂检测报告")
-    private String file1;
-
-    @ApiModelProperty(value = "合格证")
-    private String file2;
-
-    @ApiModelProperty(value = "出厂铭牌")
-    private String file3;
-
-    @ApiModelProperty(value = "发票")
-    private String file4;
-
-    @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/TowerHistorySettle.java b/src/main/java/com/gxwebsoft/tower/entity/TowerHistorySettle.java
deleted file mode 100644
index c297a6e..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerHistorySettle.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 
- *
- * @author 科技小王子
- * @since 2023-06-12 16:40:25
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerHistorySettle对象", description = "")
-public class TowerHistorySettle implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "history_settle_id", type = IdType.AUTO)
-    private Integer historySettleId;
-
-    @ApiModelProperty(value = "项目ID")
-    private Integer projectId;
-
-    @ApiModelProperty(value = "合同编号")
-    private String contractNo;
-
-    @ApiModelProperty(value = "设备")
-    private Integer equipmentId;
-
-    @ApiModelProperty(value = "设备结算租金含税金额")
-    private BigDecimal amountWithTax;
-
-    @ApiModelProperty(value = "设备结算租金税率")
-    private BigDecimal taxAmount;
-
-    @ApiModelProperty(value = "进出场费含税金额")
-    private BigDecimal inOutWithTax;
-
-    @ApiModelProperty(value = "进出场费税率")
-    private BigDecimal inOutTax;
-
-    @ApiModelProperty(value = "劳务费含税金额")
-    private BigDecimal workerAmountWithTax;
-
-    @ApiModelProperty(value = "劳务费税率")
-    private BigDecimal workerTax;
-
-    @ApiModelProperty(value = "其他费用含税金额")
-    private BigDecimal otherAmountWithTax;
-
-    @ApiModelProperty(value = "其他费用税率")
-    private BigDecimal otherTax;
-
-    @ApiModelProperty(value = "开始日期")
-    private String startDate;
-
-    @ApiModelProperty(value = "结束日期")
-    private String endDate;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "项目名称")
-    @TableField(exist = false)
-    private String projectName;
-
-    @ApiModelProperty(value = "设备名称")
-    @TableField(exist = false)
-    private String equipmentName;
-
-    @ApiModelProperty(value = "设备型号")
-    @TableField(exist = false)
-    private String equipmentModel;
-
-    @ApiModelProperty(value = "出厂编号")
-    @TableField(exist = false)
-    private String factoryNo;
-
-    @ApiModelProperty(value = "备案编号")
-    @TableField(exist = false)
-    private String filingNo;
-
-    @ApiModelProperty(value = "自编号")
-    @TableField(exist = false)
-    private String equipmentNo;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerIncome.java b/src/main/java/com/gxwebsoft/tower/entity/TowerIncome.java
deleted file mode 100644
index 532c5fc..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerIncome.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.time.LocalDateTime;
-
-import com.baomidou.mybatisplus.annotation.TableLogic;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 收款管理
- *
- * @author 科技小王子
- * @since 2023-06-17 16:56:17
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerIncome对象", description = "收款管理")
-public class TowerIncome implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "income_id", type = IdType.AUTO)
-    private Integer incomeId;
-
-    @ApiModelProperty(value = "合同ID")
-    private Integer contractId;
-
-    @ApiModelProperty(value = "收款单号")
-    private String incomeNo;
-
-    @ApiModelProperty(value = "收款日期")
-    private String incomeDate;
-
-    @ApiModelProperty(value = "收款单位")
-    private Integer incomeCompanyId;
-
-    @ApiModelProperty(value = "付款单位")
-    private Integer payCompanyId;
-
-    @ApiModelProperty(value = "收款金额")
-    private BigDecimal amount;
-
-    @ApiModelProperty(value = "总计收款金额")
-    @TableField(exist = false)
-    private BigDecimal totalIncomeAmount;
-
-    @ApiModelProperty(value = "总计开票金额")
-    @TableField(exist = false)
-    private BigDecimal totalInvoicingAmount;
-
-    @ApiModelProperty(value = "收款类型")
-    private String incomeType;
-
-    @ApiModelProperty(value = "预计收款日期")
-    private String expectIncomeDate;
-
-    @ApiModelProperty(value = "预计收款金额")
-    private BigDecimal expectIncomeAmount;
-
-    @ApiModelProperty(value = "收款方式")
-    private String incomeMethod;
-
-    @ApiModelProperty(value = "发票号")
-    private String invoicingNo;
-
-    @ApiModelProperty(value = "登记人")
-    private String signName;
-
-    @ApiModelProperty(value = "附件")
-    private String fileList;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "收款状态(0已收款1已作废)")
-    private Integer status;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "合同编号")
-    @TableField(exist = false)
-    private String contractNumber;
-
-    @ApiModelProperty(value = "合同编号")
-    @TableField(exist = false)
-    private String contactNumber;
-
-    @ApiModelProperty(value = "项目名称")
-    @TableField(exist = false)
-    private String projectName;
-
-    @ApiModelProperty(value = "签订日期")
-    @TableField(exist = false)
-    private String signDate;
-
-    @ApiModelProperty(value = "租赁单位")
-    @TableField(exist = false)
-    private String companyName;
-
-    @ApiModelProperty(value = "承租单位")
-    @TableField(exist = false)
-    private String customerName;
-
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerIncomeEquipment.java b/src/main/java/com/gxwebsoft/tower/entity/TowerIncomeEquipment.java
deleted file mode 100644
index 04388dd..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerIncomeEquipment.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 收款设备费用分摊
- *
- * @author 科技小王子
- * @since 2023-06-17 17:06:39
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerIncomeEquipment对象", description = "收款设备费用分摊")
-public class TowerIncomeEquipment implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "income_equipment_id", type = IdType.AUTO)
-    private Integer incomeEquipmentId;
-
-    @ApiModelProperty(value = "收款ID")
-    private Integer incomeId;
-
-    @ApiModelProperty(value = "设备ID")
-    private Integer equipmentId;
-
-    @ApiModelProperty(value = "分摊费用")
-    private BigDecimal shareAmount;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerInvoicing.java b/src/main/java/com/gxwebsoft/tower/entity/TowerInvoicing.java
deleted file mode 100644
index cae51e4..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerInvoicing.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import java.math.BigDecimal;
-
-import cn.hutool.core.date.DateTime;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.math.BigInteger;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.apache.poi.hpsf.Decimal;
-
-/**
- * 开票管理
- *
- * @author 科技小王子
- * @since 2023-06-17 12:47:08
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerInvoicing对象", description = "开票管理")
-public class TowerInvoicing implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "invoicing_id", type = IdType.AUTO)
-    private Integer invoicingId;
-
-    @ApiModelProperty(value = "合同ID")
-    private Integer contractId;
-
-    @ApiModelProperty(value = "开票日期")
-    private String invoicingDate;
-
-    @ApiModelProperty(value = "开票单位")
-    private String invoicingCompany;
-
-    @ApiModelProperty(value = "申请人")
-    private String requestName;
-
-    @ApiModelProperty(value = "开票金额")
-    private BigDecimal invoicingAmount;
-
-    @ApiModelProperty(value = "开票号")
-    private String invoicingNo;
-
-    @ApiModelProperty(value = "登记人")
-    private String signName;
-
-    @ApiModelProperty(value = "附件")
-    private String fileList;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "开票状态(0已开票1已作废)")
-    private Integer status;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "合同编号")
-    @TableField(exist = false)
-    private String contractNumber;
-
-    @ApiModelProperty(value = "合同编号")
-    @TableField(exist = false)
-    private String contactNumber;
-
-    @ApiModelProperty(value = "项目名称")
-    @TableField(exist = false)
-    private String projectName;
-
-    @ApiModelProperty(value = "签订日期")
-    @TableField(exist = false)
-    private String signDate;
-
-    @ApiModelProperty(value = "租赁单位")
-    @TableField(exist = false)
-    private String companyName;
-
-    @ApiModelProperty(value = "承租单位")
-    @TableField(exist = false)
-    private String customerName;
-
-    @ApiModelProperty(value = "累计开票金额")
-    @TableField(exist = false)
-    private BigDecimal totalInvoicingAmount;
-
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerInvoicingSettle.java b/src/main/java/com/gxwebsoft/tower/entity/TowerInvoicingSettle.java
deleted file mode 100644
index 26fda53..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerInvoicingSettle.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 开票结算单分摊
- *
- * @author 科技小王子
- * @since 2023-06-17 12:47:08
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerInvoicingSettle对象", description = "开票结算单分摊")
-public class TowerInvoicingSettle implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "invoicing_settle_id", type = IdType.AUTO)
-    private Integer invoicingSettleId;
-
-    @ApiModelProperty(value = "开票ID")
-    private Integer invoicingId;
-
-    @ApiModelProperty(value = "结算ID")
-    private Integer settleId;
-
-    @ApiModelProperty(value = "分摊金额")
-    private BigDecimal shareAmount;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerLending.java b/src/main/java/com/gxwebsoft/tower/entity/TowerLending.java
deleted file mode 100644
index 510a89d..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerLending.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 拆借管理
- *
- * @author 科技小王子
- * @since 2023-06-15 10:29:54
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerLending对象", description = "拆借管理")
-public class TowerLending implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "lending_id", type = IdType.AUTO)
-    private Integer lendingId;
-
-    @ApiModelProperty(value = "合同ID")
-    private Integer contractId;
-
-    @ApiModelProperty(value = "产权单位")
-    private String propertyCompany;
-
-    @ApiModelProperty(value = "结算日期")
-    private String settleDate;
-
-    @ApiModelProperty(value = "本期结算金额")
-    private BigDecimal settleAmount;
-
-    @ApiModelProperty(value = "附件")
-    private String fileList;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "合同编号")
-    @TableField(exist = false)
-    private String contactNumber;
-
-    @ApiModelProperty(value = "签订时间")
-    @TableField(exist = false)
-    private LocalDateTime signDate;
-
-    @ApiModelProperty(value = "项目名称")
-    @TableField(exist = false)
-    private String projectName;
-
-    @ApiModelProperty(value = "承租方")
-    @TableField(exist = false)
-    private String customerName;
-
-    @ApiModelProperty(value = "租赁方")
-    @TableField(exist = false)
-    private String companyName;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerLendingSettleList.java b/src/main/java/com/gxwebsoft/tower/entity/TowerLendingSettleList.java
deleted file mode 100644
index 6e69e00..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerLendingSettleList.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.time.LocalDateTime;
-
-import com.baomidou.mybatisplus.annotation.TableLogic;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 拆借结算清单
- *
- * @author 科技小王子
- * @since 2023-06-15 10:29:54
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerLendingSettleList对象", description = "拆借结算清单")
-public class TowerLendingSettleList implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "lending_settle_list_id", type = IdType.AUTO)
-    private Integer lendingSettleListId;
-
-    @ApiModelProperty(value = "拆借主单id")
-    private Integer lendingId;
-
-    @ApiModelProperty(value = "设备")
-    private Integer equipmentId;
-
-    @ApiModelProperty(value = "拆借路线")
-    private String lendingPath;
-
-    @ApiModelProperty(value = "合作方式")
-    private String coopWay;
-
-    @ApiModelProperty(value = "结算开始日期")
-    private String startDate;
-
-    @ApiModelProperty(value = "结算截止日期")
-    private String stopDate;
-
-    @ApiModelProperty(value = "计费天数")
-    private Integer calDay;
-
-    @ApiModelProperty(value = "整月")
-    private Boolean isFullMonth;
-
-    @ApiModelProperty(value = "月计费天数")
-    private Integer daysInMonth;
-
-    @ApiModelProperty(value = "月租金")
-    private BigDecimal monthRentAmount;
-
-    @ApiModelProperty(value = "应付租金")
-    private BigDecimal shouldPayRentAmount;
-
-    @ApiModelProperty(value = "日租金")
-    private BigDecimal dailyRentAmount;
-
-    @ApiModelProperty(value = "应补租金")
-    private BigDecimal shouldSupplementAmount;
-
-    @ApiModelProperty(value = "应扣租金")
-    private BigDecimal shouldDeductionAmount;
-
-    @ApiModelProperty(value = "实付金额")
-    private BigDecimal paidAmount;
-
-    @ApiModelProperty(value = "税率")
-    private BigDecimal taxRate;
-
-    @ApiModelProperty(value = "税金")
-    private BigDecimal taxAmount;
-
-    @ApiModelProperty(value = "税价合计")
-    private BigDecimal totalAmountWithTax;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "设备名称")
-    @TableField(exist = false)
-    private String equipmentName;
-
-    @ApiModelProperty(value = "出厂编号")
-    @TableField(exist = false)
-    private String factoryNo;
-
-    @ApiModelProperty(value = "备案编号")
-    @TableField(exist = false)
-    private String filingNo;
-
-    @ApiModelProperty(value = "设备编号")
-    @TableField(exist = false)
-    private String equipmentNo;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerModel.java b/src/main/java/com/gxwebsoft/tower/entity/TowerModel.java
deleted file mode 100644
index 6db1559..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerModel.java
+++ /dev/null
@@ -1,70 +0,0 @@
-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/TowerPart.java b/src/main/java/com/gxwebsoft/tower/entity/TowerPart.java
deleted file mode 100644
index 29e09b8..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerPart.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 安全检查
- *
- * @author 科技小王子
- * @since 2024-02-27 18:40:31
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerPart对象", description = "安全检查")
-public class TowerPart implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "part_id", type = IdType.AUTO)
-    private Integer partId;
-
-    @ApiModelProperty(value = "配件编码")
-    private String partCode;
-
-    @ApiModelProperty(value = "类别")
-    private String category;
-
-    @ApiModelProperty(value = "规格")
-    private String specs;
-
-    @ApiModelProperty(value = "位置")
-    private String position;
-
-    @ApiModelProperty(value = "库存数量")
-    private Integer stock;
-
-    @ApiModelProperty(value = "库存金额")
-    private BigDecimal stockMoney;
-
-    @ApiModelProperty(value = "进货价格")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "最低库存")
-    private Integer stockMin;
-
-    @ApiModelProperty(value = "是否低于最低库存")
-    private Integer stockLower;
-
-    @ApiModelProperty(value = "状态, 0正常, 1待修,2异常已修，3异常未修")
-    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/TowerPartGoods.java b/src/main/java/com/gxwebsoft/tower/entity/TowerPartGoods.java
deleted file mode 100644
index 48e4b6e..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerPartGoods.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 安全检查
- *
- * @author 科技小王子
- * @since 2024-02-27 19:41:23
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerPartGoods对象", description = "安全检查")
-public class TowerPartGoods 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 goodsCode;
-
-    @ApiModelProperty(value = "类别")
-    private String category;
-
-    @ApiModelProperty(value = "产品名称")
-    private String goodsName;
-
-    @ApiModelProperty(value = "规格")
-    private String specs;
-
-    @ApiModelProperty(value = "货架")
-    private String position;
-
-    @ApiModelProperty(value = "进货价格")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "销售价格")
-    private BigDecimal salePrice;
-
-    @ApiModelProperty(value = "状态, 0正常, 1待修,2异常已修，3异常未修")
-    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 String nickname;
-
-    @ApiModelProperty(value = "手机号码")
-    @TableField(exist = false)
-    private String phone;
-
-    @ApiModelProperty(value = "头像")
-    @TableField(exist = false)
-    private String avatar;
-
-    @ApiModelProperty(value = "库存数量")
-    @TableField(exist = false)
-    private String stock;
-
-    @ApiModelProperty(value = "库存金额")
-    @TableField(exist = false)
-    private BigDecimal stockMoney;
-
-    @ApiModelProperty(value = "最低库存")
-    @TableField(exist = false)
-    private Integer stockMin;
-
-    @ApiModelProperty(value = "是否低于最低库存")
-    @TableField(exist = false)
-    private Integer stockLower;
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerPartStock.java b/src/main/java/com/gxwebsoft/tower/entity/TowerPartStock.java
deleted file mode 100644
index 27db3ca..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerPartStock.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import java.math.BigDecimal;
-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 java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 产品库存
- *
- * @author 科技小王子
- * @since 2024-02-27 19:41:23
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerPartStock对象", description = "产品库存")
-public class TowerPartStock implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "part_id", type = IdType.AUTO)
-    private Integer partId;
-
-    @ApiModelProperty(value = "产品ID")
-    private Integer goodsId;
-
-    @ApiModelProperty(value = "配件编码")
-    private String partCode;
-
-    @ApiModelProperty(value = "类别")
-    private String category;
-
-    @ApiModelProperty(value = "规格")
-    private String specs;
-
-    @ApiModelProperty(value = "位置")
-    private String position;
-
-    @ApiModelProperty(value = "库存数量")
-    private Integer stock;
-
-    @ApiModelProperty(value = "库存金额")
-    private BigDecimal stockMoney;
-
-    @ApiModelProperty(value = "进货价格")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "最低库存")
-    private Integer stockMin;
-
-    @ApiModelProperty(value = "是否低于最低库存")
-    private Integer stockLower;
-
-    @ApiModelProperty(value = "状态, 0正常, 1待修,2异常已修，3异常未修")
-    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 String nickname;
-
-    @ApiModelProperty(value = "手机号码")
-    @TableField(exist = false)
-    private String phone;
-
-    @ApiModelProperty(value = "头像")
-    @TableField(exist = false)
-    private String avatar;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerPlace.java b/src/main/java/com/gxwebsoft/tower/entity/TowerPlace.java
deleted file mode 100644
index f73da0b..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerPlace.java
+++ /dev/null
@@ -1,85 +0,0 @@
-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<TowerPlaceStandard> 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
deleted file mode 100644
index 770406a..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerPlaceSafety.java
+++ /dev/null
@@ -1,82 +0,0 @@
-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
deleted file mode 100644
index cca3230..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerPlaceStandard.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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
deleted file mode 100644
index 7bde47b..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerProject.java
+++ /dev/null
@@ -1,169 +0,0 @@
-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.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.Map;
-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 Integer companyId;
-
-    @ApiModelProperty(value = "承租单位")
-    private String customerName;
-
-    @ApiModelProperty(value = "承租单位")
-    private Integer customerId;
-
-    @ApiModelProperty(value = "项目地址")
-    private String projectRegion;
-
-    @ApiModelProperty(value = "项目所在地")
-    private String projectCity;
-
-    @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;
-
-    @TableField(exist = false)
-    private User directorUser;
-
-    @ApiModelProperty(value = "项目经理")
-    private String projectDirector;
-
-    @ApiModelProperty(value = "项目状态")
-    private String projectStatus;
-
-    @ApiModelProperty(value = "业务员")
-    private String salesman;
-
-    @ApiModelProperty(value = "标地列表")
-    private String  placeList;
-
-    @ApiModelProperty(value = "最后生成保养计划的月份")
-    private Integer planMonth;
-
-    @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<TowerProjectUser> users;
-
-    @ApiModelProperty(value = "合同预定设备清单")
-    @TableField(exist = false)
-    private Set<TowerProjectOrder> orders;
-
-    @ApiModelProperty(value = "检查部位配置")
-    @TableField(exist = false)
-    private Set<TowerProjectPlace> places1;
-
-    @ApiModelProperty(value = "保养部位配置")
-    @TableField(exist = false)
-    private Set<TowerProjectPlace> places2;
-
-    @ApiModelProperty(value = "是否已有安装单派单")
-    @TableField(exist = false)
-    private boolean hasSetUpWorksheet;
-
-    @ApiModelProperty(value = "派单类型")
-    @TableField(exist = false)
-    private Integer worksheetType;
-
-    @ApiModelProperty(value = "派单设备类型")
-    @TableField(exist = false)
-    private Integer worksheetEquipType;
-
-    @ApiModelProperty(value = "各派单类型数量")
-    @TableField(exist = false)
-    private Map<Integer, Integer> worksheetWorkTypeNumList;
-
-    @ApiModelProperty(value = "关联设备数")
-    @TableField(exist = false)
-    private Integer equipmentNum;
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerProjectOrder.java b/src/main/java/com/gxwebsoft/tower/entity/TowerProjectOrder.java
deleted file mode 100644
index f870b19..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerProjectOrder.java
+++ /dev/null
@@ -1,109 +0,0 @@
-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 = "设备Id")
-    private Integer equipmentId;
-
-    @ApiModelProperty(value = "设备名称")
-    private String equipmentName;
-
-    @ApiModelProperty(value = "规格型号")
-    private String equipmentModel;
-
-    @ApiModelProperty(value = "备案编号")
-    private String filingNo;
-
-    @ApiModelProperty(value = "出厂编号")
-    private String factoryNo;
-
-    @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;
-
-    @ApiModelProperty(value = "定检状态")
-    private String securityStatus;
-
-
-    @ApiModelProperty(value = "制造厂商")
-    @TableField(exist = false)
-    private String manufactor;
-
-    @ApiModelProperty(value = "报废日期")
-    @TableField(exist = false)
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date scrapDate;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerProjectPlace.java b/src/main/java/com/gxwebsoft/tower/entity/TowerProjectPlace.java
deleted file mode 100644
index c79412f..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerProjectPlace.java
+++ /dev/null
@@ -1,60 +0,0 @@
-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
deleted file mode 100644
index 6035f2a..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerProjectUser.java
+++ /dev/null
@@ -1,78 +0,0 @@
-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.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-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;
-
-    @TableField(exist = false)
-    private User user;
-
-
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerPurchase.java b/src/main/java/com/gxwebsoft/tower/entity/TowerPurchase.java
deleted file mode 100644
index 88ceefe..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerPurchase.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 采购入库表
- *
- * @author 科技小王子
- * @since 2024-02-05 20:53:31
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerPurchase对象", description = "采购入库表")
-public class TowerPurchase implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "ID")
-    @TableId(value = "purchase_id", type = IdType.AUTO)
-    private Integer purchaseId;
-
-    @ApiModelProperty(value = "部位名称")
-    private String name;
-
-    @ApiModelProperty(value = "部件编码")
-    private String purchaseCode;
-
-    @ApiModelProperty(value = "部件类型")
-    private String purchaseType;
-
-    @ApiModelProperty(value = "价格")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "企业ID")
-    private Integer companyId;
-
-    @ApiModelProperty(value = "企业名称")
-    private String companyName;
-
-    @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/TowerRent.java b/src/main/java/com/gxwebsoft/tower/entity/TowerRent.java
deleted file mode 100644
index 7a770d1..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerRent.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 标准节租金
- *
- * @author 科技小王子
- * @since 2024-02-05 15:04:19
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerRent对象", description = "标准节租金")
-public class TowerRent implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "租单记录id")
-    @TableId(value = "rent_id", type = IdType.AUTO)
-    private Integer rentId;
-
-    @ApiModelProperty(value = "名称")
-    private String name;
-
-    @ApiModelProperty(value = "租金")
-    private BigDecimal rent;
-
-    @ApiModelProperty(value = "每个月租金")
-    private BigDecimal month;
-
-    @ApiModelProperty(value = "月数")
-    private Integer num;
-
-    @ApiModelProperty(value = "获取的租金")
-    private BigDecimal totalRent;
-
-    @ApiModelProperty(value = "项目ID")
-    private Integer projectId;
-
-    @ApiModelProperty(value = "合同编号")
-    private String contractNo;
-
-    @ApiModelProperty(value = "设备ID")
-    private Integer equipmentId;
-
-    @ApiModelProperty(value = "起租日期")
-    private String startDate;
-
-    @ApiModelProperty(value = "停租日期")
-    private String stopDate;
-
-    @ApiModelProperty(value = "检测日期")
-    private String checkDate;
-
-    @ApiModelProperty(value = "报停日期")
-    private String reportStopDate;
-
-    @ApiModelProperty(value = "报停类型")
-    private String reportStopType;
-
-    @ApiModelProperty(value = "复工日期")
-    private String restoreDate;
-
-    @ApiModelProperty(value = "报监编号")
-    private String reportMonitorNo;
-
-    @ApiModelProperty(value = "承租单位")
-    private Integer companyId;
-
-    @ApiModelProperty(value = "企业名称")
-    private String companyName;
-
-    @ApiModelProperty(value = "状态(0未起租1起租2中途报停3报停复工4拆卸停租)")
-    private Boolean status;
-
-    @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/TowerRentRecord.java b/src/main/java/com/gxwebsoft/tower/entity/TowerRentRecord.java
deleted file mode 100644
index 3db8b02..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerRentRecord.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.time.LocalDateTime;
-
-import com.baomidou.mybatisplus.annotation.TableLogic;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 租单记录
- *
- * @author 科技小王子
- * @since 2023-06-13 00:42:42
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerRentRecord对象", description = "租单记录")
-public class TowerRentRecord implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "租单记录id")
-    @TableId(value = "rent_record_id", type = IdType.AUTO)
-    private Integer rentRecordId;
-
-    @ApiModelProperty(value = "项目ID")
-    private Integer projectId;
-
-    @ApiModelProperty(value = "合同编号")
-    private String contractNo;
-
-    @ApiModelProperty(value = "设备ID")
-    private Integer equipmentId;
-
-    @ApiModelProperty(value = "起租日期")
-    private String startDate;
-
-    @ApiModelProperty(value = "停租日期")
-    private String stopDate;
-
-    @ApiModelProperty(value = "检测日期")
-    private String checkDate;
-
-    @ApiModelProperty(value = "报停日期")
-    private String reportStopDate;
-
-    @ApiModelProperty(value = "报停类型")
-    private String reportStopType;
-
-    @ApiModelProperty(value = "复工日期")
-    private String restoreDate;
-
-    @ApiModelProperty(value = "报监编号")
-    private String reportMonitorNo;
-
-    @ApiModelProperty(value = "承租单位")
-    private Integer companyId;
-
-    @ApiModelProperty(value = "状态(0未起租1起租2中途报停3报停复工4拆卸停租)")
-    private Integer status;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "项目名称")
-    @TableField(exist = false)
-    private String projectName;
-
-    @ApiModelProperty(value = "承租单位")
-    @TableField(exist = false)
-    private String companyName;
-
-    @ApiModelProperty(value = "设备名称")
-    @TableField(exist = false)
-    private String equipmentName;
-
-    @ApiModelProperty(value = "设备型号")
-    @TableField(exist = false)
-    private String equipmentModel;
-
-    @ApiModelProperty(value = "备案号")
-    @TableField(exist = false)
-    private String filingNo;
-
-    @ApiModelProperty(value = "自编号")
-    @TableField(exist = false)
-    private String equipmentNo;
-
-    @ApiModelProperty(value = "出厂编号")
-    @TableField(exist = false)
-    private String factoryNo;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerSecurity.java b/src/main/java/com/gxwebsoft/tower/entity/TowerSecurity.java
deleted file mode 100644
index dff1c56..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerSecurity.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 安全检查
- *
- * @author 科技小王子
- * @since 2024-02-22 13:44:23
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerSecurity对象", description = "安全检查")
-public class TowerSecurity implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "security_id", type = IdType.AUTO)
-    private Integer securityId;
-
-    @ApiModelProperty(value = "类型")
-    private Integer type;
-
-    @ApiModelProperty(value = "项目名称")
-    private String projectName;
-
-    @ApiModelProperty(value = "项目ID")
-    private Integer projectId;
-
-    @ApiModelProperty(value = "保养编号")
-    private String securityCode;
-
-    @ApiModelProperty(value = "所在地")
-    private String address;
-
-    @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 regionName;
-
-    @ApiModelProperty(value = "状态, 0正常, 1待修,2异常已修，3异常未修")
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "问题描述")
-    private String problem;
-
-    @ApiModelProperty(value = "处理方法")
-    private String processingMethod;
-
-    @ApiModelProperty(value = "图片附件")
-    private String files;
-
-    @ApiModelProperty(value = "是否更换配件")
-    private Boolean replaceAccessories;
-
-    @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 String nickname;
-
-    @ApiModelProperty(value = "手机号码")
-    @TableField(exist = false)
-    private String phone;
-
-    @ApiModelProperty(value = "头像")
-    @TableField(exist = false)
-    private String avatar;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerSecurityPlant.java b/src/main/java/com/gxwebsoft/tower/entity/TowerSecurityPlant.java
deleted file mode 100644
index f56d4c6..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerSecurityPlant.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 保养记录
- *
- * @author 科技小王子
- * @since 2024-02-25 19:03:48
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerSecurityPlant对象", description = "保养记录")
-public class TowerSecurityPlant implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "security_record_id", type = IdType.AUTO)
-    private Integer securityRecordId;
-
-    @ApiModelProperty(value = "保养计划ID")
-    private Integer securityId;
-
-    @ApiModelProperty(value = "保养编号")
-    private String securityCode;
-
-    @ApiModelProperty(value = "现场图片")
-    private String images;
-
-    @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 regionName;
-
-    @ApiModelProperty(value = "状态, 0待确认, 1已确认")
-    private Integer status;
-
-    @ApiModelProperty(value = "确认状态, 0待确认, 1已确认")
-    private Integer confirmStatus;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "排序号")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer confirmId;
-
-    @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 phone;
-
-    @ApiModelProperty(value = "头像")
-    @TableField(exist = false)
-    private String avatar;
-
-    @ApiModelProperty(value = "配件名称")
-    @TableField(exist = false)
-    private String accessoryName;
-
-    @ApiModelProperty(value = "配件编号")
-    @TableField(exist = false)
-    private String accessoryNo;
-
-    @ApiModelProperty(value = "配件分类")
-    @TableField(exist = false)
-    private String accessoryCategory;
-
-    @ApiModelProperty(value = "配件规格")
-    @TableField(exist = false)
-    private String accessorySpecs;
-
-    @ApiModelProperty(value = "适用设备型号")
-    @TableField(exist = false)
-    private String accessoryModel;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerSecurityRecord.java b/src/main/java/com/gxwebsoft/tower/entity/TowerSecurityRecord.java
deleted file mode 100644
index 743c68b..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerSecurityRecord.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 保养记录
- *
- * @author 科技小王子
- * @since 2024-02-27 15:00:15
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerSecurityRecord对象", description = "保养记录")
-public class TowerSecurityRecord implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "security_record_id", type = IdType.AUTO)
-    private Integer securityRecordId;
-
-    @ApiModelProperty(value = "保养计划ID")
-    private Integer securityId;
-
-    @ApiModelProperty(value = "保养编号")
-    private String securityCode;
-
-    @ApiModelProperty(value = "现场图片")
-    private String images;
-
-    @ApiModelProperty(value = "基础节(保养前)")
-    private String before1;
-
-    @ApiModelProperty(value = "第一节架(保养前)")
-    private String before2;
-
-    @ApiModelProperty(value = "顶升内套架(保养前)")
-    private String before3;
-
-    @ApiModelProperty(value = "顶升外套架(保养前)")
-    private String before4;
-
-    @ApiModelProperty(value = "过渡节(保养前)")
-    private String before5;
-
-    @ApiModelProperty(value = "回转(保养前)")
-    private String before6;
-
-    @ApiModelProperty(value = "塔帽(保养前)")
-    private String before7;
-
-    @ApiModelProperty(value = "平衡臂(保养前)")
-    private String before8;
-
-    @ApiModelProperty(value = "起重臂(保养前)")
-    private String before9;
-
-    @ApiModelProperty(value = "变幅小车(保养前)")
-    private String before10;
-
-    @ApiModelProperty(value = "大钩(保养前)")
-    private String before11;
-
-    @ApiModelProperty(value = "顶升引进小车(保养前)")
-    private String before12;
-
-    @ApiModelProperty(value = "驾驶室(保养前)")
-    private String before13;
-
-    @ApiModelProperty(value = "基础节(保养后)")
-    private String after1;
-
-    @ApiModelProperty(value = "第一节架(保养后)")
-    private String after2;
-
-    @ApiModelProperty(value = "顶升内套架(保养后)")
-    private String after3;
-
-    @ApiModelProperty(value = "顶升外套架(保养后)")
-    private String after4;
-
-    @ApiModelProperty(value = "过渡节(保养后)")
-    private String after5;
-
-    @ApiModelProperty(value = "回转(保养后)")
-    private String after6;
-
-    @ApiModelProperty(value = "塔帽(保养后)")
-    private String after7;
-
-    @ApiModelProperty(value = "平衡臂(保养后)")
-    private String after8;
-
-    @ApiModelProperty(value = "起重臂(保养后)")
-    private String after9;
-
-    @ApiModelProperty(value = "变幅小车(保养后)")
-    private String after10;
-
-    @ApiModelProperty(value = "大钩(保养后)")
-    private String after11;
-
-    @ApiModelProperty(value = "顶升引进小车(保养后)")
-    private String after12;
-
-    @ApiModelProperty(value = "驾驶室(保养后)")
-    private String after13;
-
-    @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 regionName;
-
-    @ApiModelProperty(value = "状态, 0正常, 1待修,2异常已修，3异常未修")
-    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 String nickname;
-
-    @ApiModelProperty(value = "手机号码")
-    @TableField(exist = false)
-    private String phone;
-
-    @ApiModelProperty(value = "头像")
-    @TableField(exist = false)
-    private String avatar;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerSettle.java b/src/main/java/com/gxwebsoft/tower/entity/TowerSettle.java
deleted file mode 100644
index e007168..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerSettle.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 结算管理
- *
- * @author 科技小王子
- * @since 2023-06-11 19:19:10
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerSettle对象", description = "结算管理")
-public class TowerSettle implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "settle_id", type = IdType.AUTO)
-    private Integer settleId;
-
-    @ApiModelProperty(value = "结算单号")
-    private String settleNo;
-
-    @ApiModelProperty(value = "合同id")
-    private Integer contractId;
-
-    @ApiModelProperty(value = "本期开始日期")
-    private String startDate;
-
-    @ApiModelProperty(value = "本期结束日期")
-    private String endDate;
-
-    @ApiModelProperty(value = "结算方式(0跨月;1自然月;2按日;3系数结算-跨月;4系数结算-自然月")
-    private Integer settleMethod;
-
-    @ApiModelProperty(value = "跨月结算日期")
-    private Integer extendMonthDate;
-
-    @ApiModelProperty(value = "结算状态(0未认证;1已认证;2已失效;)")
-    private Integer status;
-
-    @ApiModelProperty(value = "总额")
-    private Integer totalAmount;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "项目名称")
-    @TableField(exist = false)
-    private String projectName;
-
-    @ApiModelProperty(value = "合同编号")
-    @TableField(exist = false)
-    private String contactNumber;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerSettleDetail.java b/src/main/java/com/gxwebsoft/tower/entity/TowerSettleDetail.java
deleted file mode 100644
index fcb6b7b..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerSettleDetail.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 合同结算详情
- *
- * @author 科技小王子
- * @since 2023-06-11 19:13:12
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerSettleDetail对象", description = "合同结算详情")
-public class TowerSettleDetail implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "settle_detail_id", type = IdType.AUTO)
-    private Integer settleDetailId;
-
-    @ApiModelProperty(value = "结算id")
-    private Integer settleId;
-
-    @ApiModelProperty(value = "结算类型:0租金结算;1进退场费结算;2操作人员工资结算;3其他费用;4扣除项")
-    private Integer type;
-
-    @ApiModelProperty(value = "费用类型")
-    private String settleCostType;
-
-    @ApiModelProperty(value = "设备")
-    private String equipmentName;
-
-    @ApiModelProperty(value = "型号")
-    private String equipmentModel;
-
-    @ApiModelProperty(value = "出厂编号")
-    private String factoryNo;
-
-    @ApiModelProperty(value = "结算开始日期")
-    private String startDate;
-
-    @ApiModelProperty(value = "结算结束日期")
-    private String endDate;
-
-    @ApiModelProperty(value = "月租金/月工资")
-    private BigDecimal monthAmount;
-
-    @ApiModelProperty(value = "日租金")
-    private BigDecimal dailyAmount;
-
-    @ApiModelProperty(value = "多少月")
-    private Integer month;
-
-    @ApiModelProperty(value = "多少日")
-    private Integer day;
-
-    @ApiModelProperty(value = "税率")
-    private BigDecimal taxRate;
-
-    @ApiModelProperty(value = "进退场单价/单次费用")
-    private BigDecimal singleAmount;
-
-    @ApiModelProperty(value = "进退场次数/次数")
-    private Integer num;
-
-    @ApiModelProperty(value = "单位")
-    private String unit;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "支付比例")
-    private BigDecimal payRate;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "进场时间")
-    private LocalDateTime inDate;
-
-    @ApiModelProperty(value = "退场时间")
-    private LocalDateTime outDate;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerWarehouse.java b/src/main/java/com/gxwebsoft/tower/entity/TowerWarehouse.java
deleted file mode 100644
index b4a15ca..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerWarehouse.java
+++ /dev/null
@@ -1,88 +0,0 @@
-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/entity/TowerWorksheet.java b/src/main/java/com/gxwebsoft/tower/entity/TowerWorksheet.java
deleted file mode 100644
index 8931d36..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerWorksheet.java
+++ /dev/null
@@ -1,204 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-import com.baomidou.mybatisplus.annotation.TableLogic;
-
-import java.io.Serializable;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-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-07-02 16:15:31
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerWorksheet对象", description = "派单管理")
-public class TowerWorksheet implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "worksheet_id", type = IdType.AUTO)
-    private Integer worksheetId;
-
-    @ApiModelProperty(value = "派单类型:0安拆1质检2仓储3维保")
-    private Integer type;
-
-    private Integer parentWorksheetId;
-
-    @ApiModelProperty(value = "经营人员ID")
-    private Integer startUid;
-
-    @ApiModelProperty(value = "项目ID")
-    private Integer projectId;
-
-    @ApiModelProperty(value = "计划进场时间(经营人员填)")
-    private String planInDateInit;
-
-    @ApiModelProperty(value = "计划进场时间")
-    private String planInDate;
-
-    @ApiModelProperty(value = "到货时间")
-    private String receiveDate;
-
-    @ApiModelProperty(value = "生产主管ID")
-    private Integer productionMangerUid;
-
-    @ApiModelProperty(value = "资料员")
-    private Integer documentUid;
-
-    @ApiModelProperty(value = "资产员")
-    private Integer assetUid;
-
-    @ApiModelProperty(value = "车辆调度员")
-    private Integer carDispatchUid;
-
-    @ApiModelProperty(value = "维保人员")
-    private Integer fixUid;
-
-    @ApiModelProperty(value = "班组组长")
-    private Integer classManager;
-
-    @ApiModelProperty(value = "设备类型:(0塔式起重机;1施工升降机;2物料提升机)")
-    private Integer equipmentType;
-
-    @ApiModelProperty(value = "工作类型(0安装1加高2拆卸)")
-    private Integer workType;
-
-    @ApiModelProperty(value = "0已取消1待派单2待到场3待确认4已完成")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "资产员已完成")
-    private Integer assetHasDone;
-
-    @ApiModelProperty(value = "资料员已完成")
-    private Integer documentHasDone;
-
-    @ApiModelProperty(value = "维保人员已完成")
-    private Integer fixHasDone;
-
-    @ApiModelProperty(value = "资产员完成时间")
-    private LocalDateTime assetDoneTime;
-
-    @ApiModelProperty(value = "资料员完成时间")
-    private LocalDateTime documentDoneTime;
-
-    @ApiModelProperty(value = "维保人员完成时间")
-    private LocalDateTime fixDoneTime;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "拒绝原因")
-    private String refuseReason;
-
-    @ApiModelProperty(value = "项目联系人电话")
-    private String contactPhone;
-
-    @ApiModelProperty(value = "审核状态0没有审核1待审核2已通过3未通过")
-    private Integer auditStatus;
-
-    @ApiModelProperty(value = "详情")
-    @TableField(exist = false)
-    private TowerWorksheetDetail detail;
-
-    @ApiModelProperty(value = "安装单详情")
-    @TableField(exist = false)
-    private TowerWorksheetDetail detailType0;
-
-    @ApiModelProperty(value = "安装信息")
-    @TableField(exist = false)
-    private TowerWorksheetSetUp setUp;
-
-    @ApiModelProperty(value = "配件")
-    @TableField(exist = false)
-    private List<TowerWorksheetParts> parts;
-
-    @ApiModelProperty(value = "核验")
-    @TableField(exist = false)
-    private TowerWorksheetCheck check;
-
-    @ApiModelProperty(value = "项目名称")
-    @TableField(exist = false)
-    private String projectName;
-
-    @ApiModelProperty(value = "经营人员")
-    @TableField(exist = false)
-    private User startUser;
-
-    @ApiModelProperty(value = "生产主管")
-    @TableField(exist = false)
-    private User productionMangerUser;
-
-    @ApiModelProperty(value = "标地")
-    private String address;
-
-    @ApiModelProperty(value = "项目地址")
-    @TableField(exist = false)
-    private String projectAddress;
-
-    @ApiModelProperty(value = "项目区域")
-    @TableField(exist = false)
-    private String projectRegion;
-
-    @ApiModelProperty(value = "资料员")
-    @TableField(exist = false)
-    private User documentUser;
-
-    @ApiModelProperty(value = "资产员")
-    @TableField(exist = false)
-    private User assetUser;
-
-    @ApiModelProperty(value = "资产员")
-    @TableField(exist = false)
-    private User carDispatchUser;
-
-    @ApiModelProperty(value = "班组组长")
-    @TableField(exist = false)
-    private User classManagerUser;
-
-    @ApiModelProperty(value = "维保人员")
-    @TableField(exist = false)
-    private User fixUser;
-
-    @ApiModelProperty(value = "该用户是否需要审核")
-    @TableField(exist = false)
-    private Boolean needAudit;
-
-    @ApiModelProperty(value = "审核人列表")
-    @TableField(exist = false)
-    private List<User> auditList;
-
-    @ApiModelProperty(value = "车辆列表")
-    @TableField(exist = false)
-    private List<TowerWorksheetCarDispatch> carDispatchList;
-
-    @ApiModelProperty(value = "车辆数量")
-    @TableField(exist = false)
-    private Boolean hasCarDispatch;
-
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerWorksheetAudit.java b/src/main/java/com/gxwebsoft/tower/entity/TowerWorksheetAudit.java
deleted file mode 100644
index bd021cd..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerWorksheetAudit.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-
-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-08-21 00:46:43
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerWorksheetAudit对象", description = "派单审核")
-public class TowerWorksheetAudit implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "worksheet_audit_id", type = IdType.AUTO)
-    private Integer worksheetAuditId;
-
-    private Integer worksheetId;
-
-    private Integer userId;
-
-    @TableField(exist = false)
-    private User user;
-
-    @ApiModelProperty(value = "0待审核1已通过2已拒绝")
-    private Integer status;
-
-    @ApiModelProperty(value = "拒绝原因")
-    private String refuseReason;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerWorksheetCarDispatch.java b/src/main/java/com/gxwebsoft/tower/entity/TowerWorksheetCarDispatch.java
deleted file mode 100644
index 5924357..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerWorksheetCarDispatch.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 车辆调度
- *
- * @author 科技小王子
- * @since 2023-10-31 12:05:49
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerWorksheetCarDispatch对象", description = "车辆调度")
-public class TowerWorksheetCarDispatch implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "car_dispatch_id", type = IdType.AUTO)
-    private Integer carDispatchId;
-
-    private String name;
-
-    private String carPlate;
-
-    private String phone;
-
-    private Integer worksheetId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerWorksheetDetail.java b/src/main/java/com/gxwebsoft/tower/entity/TowerWorksheetDetail.java
deleted file mode 100644
index 5c6b3e7..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerWorksheetDetail.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 派单详情
- *
- * @author 科技小王子
- * @since 2023-07-03 10:56:04
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerWorksheetDetail对象", description = "派单详情")
-public class TowerWorksheetDetail implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "detail_id", type = IdType.AUTO)
-    private Integer detailId;
-
-    private Integer worksheetId;
-
-    private Integer projectId;
-
-    @ApiModelProperty(value = "工作类型(0安装1加高2拆卸)")
-    private Integer workType;
-
-    @ApiModelProperty(value = "设备ID")
-    private Integer equipmentId;
-
-    @ApiModelProperty(value = "安装臂长(m)")
-    private BigDecimal setupLength;
-
-    @ApiModelProperty(value = "年份要求")
-    private Integer yearRequest;
-
-    @ApiModelProperty(value = "初始安装高度")
-    private BigDecimal setupHeight;
-
-    @ApiModelProperty(value = "最终安装高度")
-    private BigDecimal finalSetupHeight;
-
-    @ApiModelProperty(value = "是否要油漆")
-    private Integer needPaint;
-
-    @ApiModelProperty(value = "附着方式(0预埋1钻孔)")
-    private Integer clingMethod;
-
-    @ApiModelProperty(value = "道路通畅")
-    private Integer confirmRoad;
-
-    @ApiModelProperty(value = "电箱到位")
-    private Integer confirmElectric;
-
-    @ApiModelProperty(value = "基础预埋时间满足")
-    private Integer confirmHasTime;
-
-    @ApiModelProperty(value = "安装资料完善")
-    private Integer confirmProfile;
-
-    @ApiModelProperty(value = "加高第几道附着")
-    private Integer clingNum;
-
-    @ApiModelProperty(value = "附着数量")
-    private Integer clingCountNum;
-
-    @ApiModelProperty(value = "标准节数量")
-    private Integer standardSectionNum;
-
-    @ApiModelProperty(value = "标节是否需要发货")
-    private Integer sectionNeedExpress;
-
-    @ApiModelProperty(value = "标节数量")
-    private Integer sectionNum;
-
-    @ApiModelProperty(value = "标节是否需要油漆")
-    private Integer sectionNeedPaint;
-
-    @ApiModelProperty(value = "拆卸高度")
-    private BigDecimal removeHeight;
-
-    @ApiModelProperty(value = "派单说明")
-    private String intro;
-
-    @ApiModelProperty(value = "系统内的作业人员")
-    private String sysWorkerList;
-
-    @ApiModelProperty(value = "外调的作业人员")
-    private String outComeWorkerList;
-
-    @ApiModelProperty(value = "人员类型(0自有1外派)")
-    private Integer workerType;
-
-    @ApiModelProperty(value = "班组负责人")
-    private Integer classManager;
-
-    @ApiModelProperty(value = "现场负责人")
-    private String localeManager;
-
-    @ApiModelProperty(value = "司机")
-    private String driver;
-
-    @ApiModelProperty(value = "车牌")
-    private String carPlate;
-
-    private String photos;
-
-    private String remark;
-
-    @ApiModelProperty(value = "拉杆组合")
-    private String rieRodGroup;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "设备名称")
-    @TableField(exist = false)
-    private String equipmentName;
-
-    @ApiModelProperty(value = "型号")
-    @TableField(exist = false)
-    private String model;
-
-    @ApiModelProperty(value = "出厂编号")
-    @TableField(exist = false)
-    private String factoryNo;
-
-    @ApiModelProperty(value = "自编号")
-    @TableField(exist = false)
-    private String equipmentNo;
-
-    @ApiModelProperty(value = "设备")
-    @TableField(exist = false)
-    private TowerEquipment equipment;
-
-    @ApiModelProperty(value = "累计加高高度")
-    @TableField(exist = false)
-    private BigDecimal totalAddHeight;
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerWorksheetParts.java b/src/main/java/com/gxwebsoft/tower/entity/TowerWorksheetParts.java
deleted file mode 100644
index b512ea8..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerWorksheetParts.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 派单配件
- *
- * @author 科技小王子
- * @since 2023-07-03 10:18:57
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerWorksheetParts对象", description = "派单配件")
-public class TowerWorksheetParts implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "parts_id", type = IdType.AUTO)
-    private Integer partsId;
-
-    private Integer worksheetId;
-
-    @ApiModelProperty(value = "父级分类ID")
-    private Integer parentId;
-
-    @ApiModelProperty(value = "配件ID,对应category表ID")
-    private Integer cateId;
-
-    private Integer num;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "配件名称")
-    @TableField(exist = false)
-    private String partsTitle;
-
-
-    @ApiModelProperty(value = "父类配件名称")
-    @TableField(exist = false)
-    private String parentPartsTitle;
-
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerWorksheetSetUp.java b/src/main/java/com/gxwebsoft/tower/entity/TowerWorksheetSetUp.java
deleted file mode 100644
index e2ce443..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerWorksheetSetUp.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 派单安装信息
- *
- * @author 科技小王子
- * @since 2023-07-03 10:18:57
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerWorksheetSetUp对象", description = "派单安装信息")
-public class TowerWorksheetSetUp implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "set_up_id", type = IdType.AUTO)
-    private Integer setUpId;
-
-    private Integer worksheetId;
-
-    @ApiModelProperty(value = "最大安装高度")
-    private BigDecimal maxSetUpHeight;
-
-    @ApiModelProperty(value = "安装高度")
-    private BigDecimal setUpHeight;
-
-    @ApiModelProperty(value = "附着高度")
-    private BigDecimal clingHeight;
-
-    @ApiModelProperty(value = "大臂长度")
-    private BigDecimal bigArmLength;
-
-    @ApiModelProperty(value = "平衡长度")
-    private BigDecimal balanceLength;
-
-    @ApiModelProperty(value = "计划安装附着")
-    private BigDecimal planSetUpCling;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerAccessoryMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerAccessoryMapper.java
deleted file mode 100644
index b57c669..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerAccessoryMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<TowerAccessory> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerAccessory>
-     */
-    List<TowerAccessory> selectPageRel(@Param("page") IPage<TowerAccessory> page,
-                             @Param("param") TowerAccessoryParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerAccessory> selectListRel(@Param("param") TowerAccessoryParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerContractEquipmentMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerContractEquipmentMapper.java
deleted file mode 100644
index e8e08cc..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerContractEquipmentMapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.gxwebsoft.tower.entity.TowerContractEquipment;
-import com.gxwebsoft.tower.param.TowerContractEquipmentParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 合同设备清单Mapper
- *
- * @author 科技小王子
- * @since 2023-06-09 13:42:20
- */
-public interface TowerContractEquipmentMapper extends MPJBaseMapper<TowerContractEquipment> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerContractEquipment>
-     */
-    List<TowerContractEquipment> selectPageRel(@Param("page") IPage<TowerContractEquipment> page,
-                             @Param("param") TowerContractEquipmentParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerContractEquipment> selectListRel(@Param("param") TowerContractEquipmentParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerContractFileMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerContractFileMapper.java
deleted file mode 100644
index bd8b79a..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerContractFileMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerContractFile;
-import com.gxwebsoft.tower.param.TowerContractFileParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 合同附件Mapper
- *
- * @author 科技小王子
- * @since 2023-06-09 13:42:20
- */
-public interface TowerContractFileMapper extends BaseMapper<TowerContractFile> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerContractFile>
-     */
-    List<TowerContractFile> selectPageRel(@Param("page") IPage<TowerContractFile> page,
-                             @Param("param") TowerContractFileParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerContractFile> selectListRel(@Param("param") TowerContractFileParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerContractFinalSettleLostMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerContractFinalSettleLostMapper.java
deleted file mode 100644
index 7c4cdc2..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerContractFinalSettleLostMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerContractFinalSettleLost;
-import com.gxwebsoft.tower.param.TowerContractFinalSettleLostParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 结算书缺失物品Mapper
- *
- * @author 科技小王子
- * @since 2023-06-18 00:52:41
- */
-public interface TowerContractFinalSettleLostMapper extends BaseMapper<TowerContractFinalSettleLost> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerContractFinalSettleLost>
-     */
-    List<TowerContractFinalSettleLost> selectPageRel(@Param("page") IPage<TowerContractFinalSettleLost> page,
-                             @Param("param") TowerContractFinalSettleLostParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerContractFinalSettleLost> selectListRel(@Param("param") TowerContractFinalSettleLostParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerContractFinalSettleMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerContractFinalSettleMapper.java
deleted file mode 100644
index ed0fc15..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerContractFinalSettleMapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.gxwebsoft.tower.entity.TowerContractFinalSettle;
-import com.gxwebsoft.tower.param.TowerContractFinalSettleParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 项目结算书Mapper
- *
- * @author 科技小王子
- * @since 2023-06-17 22:34:32
- */
-public interface TowerContractFinalSettleMapper extends MPJBaseMapper<TowerContractFinalSettle> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerContractFinalSettle>
-     */
-    List<TowerContractFinalSettle> selectPageRel(@Param("page") IPage<TowerContractFinalSettle> page,
-                             @Param("param") TowerContractFinalSettleParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerContractFinalSettle> selectListRel(@Param("param") TowerContractFinalSettleParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerContractMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerContractMapper.java
deleted file mode 100644
index d48e5be..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerContractMapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.gxwebsoft.tower.entity.TowerContract;
-import com.gxwebsoft.tower.param.TowerContractParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 合同存档Mapper
- *
- * @author 科技小王子
- * @since 2023-06-08 22:36:47
- */
-public interface TowerContractMapper extends MPJBaseMapper<TowerContract> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerContract>
-     */
-    List<TowerContract> selectPageRel(@Param("page") IPage<TowerContract> page,
-                             @Param("param") TowerContractParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerContract> selectListRel(@Param("param") TowerContractParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerContractSettleEquipmentMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerContractSettleEquipmentMapper.java
deleted file mode 100644
index 882242f..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerContractSettleEquipmentMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerContractSettleEquipment;
-import com.gxwebsoft.tower.param.TowerContractSettleEquipmentParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 合同结算设备Mapper
- *
- * @author 科技小王子
- * @since 2023-06-10 16:52:12
- */
-public interface TowerContractSettleEquipmentMapper extends BaseMapper<TowerContractSettleEquipment> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerContractSettleEquipment>
-     */
-    List<TowerContractSettleEquipment> selectPageRel(@Param("page") IPage<TowerContractSettleEquipment> page,
-                             @Param("param") TowerContractSettleEquipmentParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerContractSettleEquipment> selectListRel(@Param("param") TowerContractSettleEquipmentParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerContractSettleRuleMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerContractSettleRuleMapper.java
deleted file mode 100644
index 6c4db99..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerContractSettleRuleMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerContractSettleRule;
-import com.gxwebsoft.tower.param.TowerContractSettleRuleParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 合同结算规则Mapper
- *
- * @author 科技小王子
- * @since 2023-06-11 13:48:41
- */
-public interface TowerContractSettleRuleMapper extends BaseMapper<TowerContractSettleRule> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerContractSettleRule>
-     */
-    List<TowerContractSettleRule> selectPageRel(@Param("page") IPage<TowerContractSettleRule> page,
-                             @Param("param") TowerContractSettleRuleParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerContractSettleRule> selectListRel(@Param("param") TowerContractSettleRuleParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerCustomerMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerCustomerMapper.java
deleted file mode 100644
index fd74ed1..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerCustomerMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerCustomer;
-import com.gxwebsoft.tower.param.TowerCustomerParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 客户管理Mapper
- *
- * @author 科技小王子
- * @since 2023-06-08 21:04:27
- */
-public interface TowerCustomerMapper extends BaseMapper<TowerCustomer> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerCustomer>
-     */
-    List<TowerCustomer> selectPageRel(@Param("page") IPage<TowerCustomer> page,
-                             @Param("param") TowerCustomerParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerCustomer> selectListRel(@Param("param") TowerCustomerParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerEquipmentMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerEquipmentMapper.java
deleted file mode 100644
index 5e29a69..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerEquipmentMapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.yulichang.base.MPJBaseMapper;
-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 MPJBaseMapper<TowerEquipment> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerEquipment>
-     */
-    List<TowerEquipment> selectPageRel(@Param("page") IPage<TowerEquipment> page,
-                             @Param("param") TowerEquipmentParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerEquipment> selectListRel(@Param("param") TowerEquipmentParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerFallMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerFallMapper.java
deleted file mode 100644
index dc55fca..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerFallMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerFall;
-import com.gxwebsoft.tower.param.TowerFallParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 项目管理Mapper
- *
- * @author 科技小王子
- * @since 2023-06-05 22:40:54
- */
-public interface TowerFallMapper extends BaseMapper<TowerFall> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerFall>
-     */
-    List<TowerFall> selectPageRel(@Param("page") IPage<TowerFall> page,
-                             @Param("param") TowerFallParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerFall> selectListRel(@Param("param") TowerFallParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerHistorySettleMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerHistorySettleMapper.java
deleted file mode 100644
index 4d50cd9..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerHistorySettleMapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.gxwebsoft.tower.entity.TowerHistorySettle;
-import com.gxwebsoft.tower.param.TowerHistorySettleParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * Mapper
- *
- * @author 科技小王子
- * @since 2023-06-12 16:40:25
- */
-public interface TowerHistorySettleMapper extends MPJBaseMapper<TowerHistorySettle> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerHistorySettle>
-     */
-    List<TowerHistorySettle> selectPageRel(@Param("page") IPage<TowerHistorySettle> page,
-                             @Param("param") TowerHistorySettleParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerHistorySettle> selectListRel(@Param("param") TowerHistorySettleParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerIncomeEquipmentMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerIncomeEquipmentMapper.java
deleted file mode 100644
index 621b732..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerIncomeEquipmentMapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.gxwebsoft.tower.entity.TowerIncomeEquipment;
-import com.gxwebsoft.tower.param.TowerIncomeEquipmentParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 收款设备费用分摊Mapper
- *
- * @author 科技小王子
- * @since 2023-06-17 17:06:39
- */
-public interface TowerIncomeEquipmentMapper extends MPJBaseMapper<TowerIncomeEquipment> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerIncomeEquipment>
-     */
-    List<TowerIncomeEquipment> selectPageRel(@Param("page") IPage<TowerIncomeEquipment> page,
-                             @Param("param") TowerIncomeEquipmentParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerIncomeEquipment> selectListRel(@Param("param") TowerIncomeEquipmentParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerIncomeMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerIncomeMapper.java
deleted file mode 100644
index cd19b56..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerIncomeMapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.gxwebsoft.tower.entity.TowerIncome;
-import com.gxwebsoft.tower.param.TowerIncomeParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 收款管理Mapper
- *
- * @author 科技小王子
- * @since 2023-06-17 17:06:39
- */
-public interface TowerIncomeMapper extends MPJBaseMapper<TowerIncome> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerIncome>
-     */
-    List<TowerIncome> selectPageRel(@Param("page") IPage<TowerIncome> page,
-                             @Param("param") TowerIncomeParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerIncome> selectListRel(@Param("param") TowerIncomeParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerInvoicingMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerInvoicingMapper.java
deleted file mode 100644
index 0eed099..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerInvoicingMapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.gxwebsoft.tower.entity.TowerInvoicing;
-import com.gxwebsoft.tower.param.TowerInvoicingParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 开票管理Mapper
- *
- * @author 科技小王子
- * @since 2023-06-17 12:47:08
- */
-public interface TowerInvoicingMapper extends MPJBaseMapper<TowerInvoicing> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerInvoicing>
-     */
-    List<TowerInvoicing> selectPageRel(@Param("page") IPage<TowerInvoicing> page,
-                             @Param("param") TowerInvoicingParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerInvoicing> selectListRel(@Param("param") TowerInvoicingParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerInvoicingSettleMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerInvoicingSettleMapper.java
deleted file mode 100644
index 3b2c16c..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerInvoicingSettleMapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.gxwebsoft.tower.entity.TowerInvoicingSettle;
-import com.gxwebsoft.tower.param.TowerInvoicingSettleParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 开票结算单分摊Mapper
- *
- * @author 科技小王子
- * @since 2023-06-17 12:47:08
- */
-public interface TowerInvoicingSettleMapper extends MPJBaseMapper<TowerInvoicingSettle> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerInvoicingSettle>
-     */
-    List<TowerInvoicingSettle> selectPageRel(@Param("page") IPage<TowerInvoicingSettle> page,
-                             @Param("param") TowerInvoicingSettleParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerInvoicingSettle> selectListRel(@Param("param") TowerInvoicingSettleParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerLendingMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerLendingMapper.java
deleted file mode 100644
index 0621d89..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerLendingMapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.gxwebsoft.tower.entity.TowerLending;
-import com.gxwebsoft.tower.param.TowerLendingParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 拆借管理Mapper
- *
- * @author 科技小王子
- * @since 2023-06-15 10:29:54
- */
-public interface TowerLendingMapper extends MPJBaseMapper<TowerLending> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerLending>
-     */
-    List<TowerLending> selectPageRel(@Param("page") IPage<TowerLending> page,
-                             @Param("param") TowerLendingParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerLending> selectListRel(@Param("param") TowerLendingParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerLendingSettleListMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerLendingSettleListMapper.java
deleted file mode 100644
index ee9cb0f..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerLendingSettleListMapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.gxwebsoft.tower.entity.TowerLendingSettleList;
-import com.gxwebsoft.tower.param.TowerLendingSettleListParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 拆借结算清单Mapper
- *
- * @author 科技小王子
- * @since 2023-06-15 10:29:54
- */
-public interface TowerLendingSettleListMapper extends MPJBaseMapper<TowerLendingSettleList> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerLendingSettleList>
-     */
-    List<TowerLendingSettleList> selectPageRel(@Param("page") IPage<TowerLendingSettleList> page,
-                             @Param("param") TowerLendingSettleListParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerLendingSettleList> selectListRel(@Param("param") TowerLendingSettleListParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerModelMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerModelMapper.java
deleted file mode 100644
index d483b6c..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerModelMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<TowerModel> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerModel>
-     */
-    List<TowerModel> selectPageRel(@Param("page") IPage<TowerModel> page,
-                             @Param("param") TowerModelParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerModel> selectListRel(@Param("param") TowerModelParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerPartGoodsMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerPartGoodsMapper.java
deleted file mode 100644
index 2880849..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerPartGoodsMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerPartGoods;
-import com.gxwebsoft.tower.param.TowerPartGoodsParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 安全检查Mapper
- *
- * @author 科技小王子
- * @since 2024-02-27 19:41:23
- */
-public interface TowerPartGoodsMapper extends BaseMapper<TowerPartGoods> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerPartGoods>
-     */
-    List<TowerPartGoods> selectPageRel(@Param("page") IPage<TowerPartGoods> page,
-                             @Param("param") TowerPartGoodsParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerPartGoods> selectListRel(@Param("param") TowerPartGoodsParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerPartMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerPartMapper.java
deleted file mode 100644
index e560c09..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerPartMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerPart;
-import com.gxwebsoft.tower.param.TowerPartParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 安全检查Mapper
- *
- * @author 科技小王子
- * @since 2024-02-27 18:40:31
- */
-public interface TowerPartMapper extends BaseMapper<TowerPart> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerPart>
-     */
-    List<TowerPart> selectPageRel(@Param("page") IPage<TowerPart> page,
-                             @Param("param") TowerPartParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerPart> selectListRel(@Param("param") TowerPartParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerPartStockMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerPartStockMapper.java
deleted file mode 100644
index 03c0327..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerPartStockMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerPartStock;
-import com.gxwebsoft.tower.param.TowerPartStockParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 产品库存Mapper
- *
- * @author 科技小王子
- * @since 2024-02-27 19:41:23
- */
-public interface TowerPartStockMapper extends BaseMapper<TowerPartStock> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerPartStock>
-     */
-    List<TowerPartStock> selectPageRel(@Param("page") IPage<TowerPartStock> page,
-                             @Param("param") TowerPartStockParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerPartStock> selectListRel(@Param("param") TowerPartStockParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceMapper.java
deleted file mode 100644
index df44d63..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<TowerPlace> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerPlace>
-     */
-    List<TowerPlace> selectPageRel(@Param("page") IPage<TowerPlace> page,
-                             @Param("param") TowerPlaceParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerPlace> 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
deleted file mode 100644
index bd1fd3c..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceSafetyMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<TowerPlaceSafety> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerPlaceSafety>
-     */
-    List<TowerPlaceSafety> selectPageRel(@Param("page") IPage<TowerPlaceSafety> page,
-                             @Param("param") TowerPlaceSafetyParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerPlaceSafety> 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
deleted file mode 100644
index df9460f..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceStandardMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<TowerPlaceStandard> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerPlaceStandard>
-     */
-    List<TowerPlaceStandard> selectPageRel(@Param("page") IPage<TowerPlaceStandard> page,
-                             @Param("param") TowerPlaceStandardParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerPlaceStandard> selectListRel(@Param("param") TowerPlaceStandardParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectBuildingMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectBuildingMapper.java
deleted file mode 100644
index eab1362..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectBuildingMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerProjectBuilding;
-import com.gxwebsoft.tower.param.TowerProjectBuildingParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 项目标地Mapper
- *
- * @author 科技小王子
- * @since 2024-01-05 22:01:16
- */
-public interface TowerProjectBuildingMapper extends BaseMapper<TowerProjectBuilding> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerProjectBuilding>
-     */
-    List<TowerProjectBuilding> selectPageRel(@Param("page") IPage<TowerProjectBuilding> page,
-                             @Param("param") TowerProjectBuildingParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerProjectBuilding> selectListRel(@Param("param") TowerProjectBuildingParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectMapper.java
deleted file mode 100644
index b1002e6..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<TowerProject> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerProject>
-     */
-    List<TowerProject> selectPageRel(@Param("page") IPage<TowerProject> page,
-                             @Param("param") TowerProjectParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerProject> 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
deleted file mode 100644
index c942a9a..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectOrderMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<TowerProjectOrder> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerProjectOrder>
-     */
-    List<TowerProjectOrder> selectPageRel(@Param("page") IPage<TowerProjectOrder> page,
-                             @Param("param") TowerProjectOrderParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerProjectOrder> 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
deleted file mode 100644
index 6cd19d0..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectPlaceMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<TowerProjectPlace> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerProjectPlace>
-     */
-    List<TowerProjectPlace> selectPageRel(@Param("page") IPage<TowerProjectPlace> page,
-                             @Param("param") TowerProjectPlaceParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerProjectPlace> 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
deleted file mode 100644
index 1adb753..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectUserMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<TowerProjectUser> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerProjectUser>
-     */
-    List<TowerProjectUser> selectPageRel(@Param("page") IPage<TowerProjectUser> page,
-                             @Param("param") TowerProjectUserParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerProjectUser> selectListRel(@Param("param") TowerProjectUserParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerPurchaseMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerPurchaseMapper.java
deleted file mode 100644
index 9b7a114..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerPurchaseMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerPurchase;
-import com.gxwebsoft.tower.param.TowerPurchaseParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 采购入库表Mapper
- *
- * @author 科技小王子
- * @since 2024-02-05 20:53:31
- */
-public interface TowerPurchaseMapper extends BaseMapper<TowerPurchase> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerPurchase>
-     */
-    List<TowerPurchase> selectPageRel(@Param("page") IPage<TowerPurchase> page,
-                             @Param("param") TowerPurchaseParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerPurchase> selectListRel(@Param("param") TowerPurchaseParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerRentMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerRentMapper.java
deleted file mode 100644
index 84e8286..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerRentMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerRent;
-import com.gxwebsoft.tower.param.TowerRentParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 标准节租金Mapper
- *
- * @author 科技小王子
- * @since 2024-02-05 15:04:19
- */
-public interface TowerRentMapper extends BaseMapper<TowerRent> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerRent>
-     */
-    List<TowerRent> selectPageRel(@Param("page") IPage<TowerRent> page,
-                             @Param("param") TowerRentParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerRent> selectListRel(@Param("param") TowerRentParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerRentRecordMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerRentRecordMapper.java
deleted file mode 100644
index 9baaa04..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerRentRecordMapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.gxwebsoft.tower.entity.TowerRentRecord;
-import com.gxwebsoft.tower.param.TowerRentRecordParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 租单记录Mapper
- *
- * @author 科技小王子
- * @since 2023-06-13 00:42:42
- */
-public interface TowerRentRecordMapper extends MPJBaseMapper<TowerRentRecord> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerRentRecord>
-     */
-    List<TowerRentRecord> selectPageRel(@Param("page") IPage<TowerRentRecord> page,
-                             @Param("param") TowerRentRecordParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerRentRecord> selectListRel(@Param("param") TowerRentRecordParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerSecurityMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerSecurityMapper.java
deleted file mode 100644
index 1c489bf..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerSecurityMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerSecurity;
-import com.gxwebsoft.tower.param.TowerSecurityParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 安全检查Mapper
- *
- * @author 科技小王子
- * @since 2024-02-22 13:44:23
- */
-public interface TowerSecurityMapper extends BaseMapper<TowerSecurity> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerSecurity>
-     */
-    List<TowerSecurity> selectPageRel(@Param("page") IPage<TowerSecurity> page,
-                             @Param("param") TowerSecurityParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerSecurity> selectListRel(@Param("param") TowerSecurityParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerSecurityPlantMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerSecurityPlantMapper.java
deleted file mode 100644
index 08c3568..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerSecurityPlantMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerSecurityPlant;
-import com.gxwebsoft.tower.param.TowerSecurityPlantParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 保养记录Mapper
- *
- * @author 科技小王子
- * @since 2024-02-25 19:03:48
- */
-public interface TowerSecurityPlantMapper extends BaseMapper<TowerSecurityPlant> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerSecurityPlant>
-     */
-    List<TowerSecurityPlant> selectPageRel(@Param("page") IPage<TowerSecurityPlant> page,
-                             @Param("param") TowerSecurityPlantParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerSecurityPlant> selectListRel(@Param("param") TowerSecurityPlantParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerSecurityRecordMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerSecurityRecordMapper.java
deleted file mode 100644
index 46e14e2..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerSecurityRecordMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerSecurityRecord;
-import com.gxwebsoft.tower.param.TowerSecurityRecordParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 保养记录Mapper
- *
- * @author 科技小王子
- * @since 2024-02-27 15:00:15
- */
-public interface TowerSecurityRecordMapper extends BaseMapper<TowerSecurityRecord> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerSecurityRecord>
-     */
-    List<TowerSecurityRecord> selectPageRel(@Param("page") IPage<TowerSecurityRecord> page,
-                             @Param("param") TowerSecurityRecordParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerSecurityRecord> selectListRel(@Param("param") TowerSecurityRecordParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerSettleDetailMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerSettleDetailMapper.java
deleted file mode 100644
index 8cd3e32..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerSettleDetailMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerSettleDetail;
-import com.gxwebsoft.tower.param.TowerSettleDetailParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 合同结算详情Mapper
- *
- * @author 科技小王子
- * @since 2023-06-11 19:13:12
- */
-public interface TowerSettleDetailMapper extends BaseMapper<TowerSettleDetail> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerSettleDetail>
-     */
-    List<TowerSettleDetail> selectPageRel(@Param("page") IPage<TowerSettleDetail> page,
-                             @Param("param") TowerSettleDetailParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerSettleDetail> selectListRel(@Param("param") TowerSettleDetailParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerSettleMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerSettleMapper.java
deleted file mode 100644
index 4f49d87..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerSettleMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerSettle;
-import com.gxwebsoft.tower.param.TowerSettleParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 结算管理Mapper
- *
- * @author 科技小王子
- * @since 2023-06-11 19:19:10
- */
-public interface TowerSettleMapper extends BaseMapper<TowerSettle> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerSettle>
-     */
-    List<TowerSettle> selectPageRel(@Param("page") IPage<TowerSettle> page,
-                             @Param("param") TowerSettleParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerSettle> selectListRel(@Param("param") TowerSettleParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerWarehouseMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerWarehouseMapper.java
deleted file mode 100644
index 6a92b52..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerWarehouseMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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<TowerWarehouse> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerWarehouse>
-     */
-    List<TowerWarehouse> selectPageRel(@Param("page") IPage<TowerWarehouse> page,
-                             @Param("param") TowerWarehouseParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerWarehouse> selectListRel(@Param("param") TowerWarehouseParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetAuditMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetAuditMapper.java
deleted file mode 100644
index 25ca9c6..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetAuditMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerWorksheetAudit;
-import com.gxwebsoft.tower.param.TowerWorksheetAuditParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 派单审核Mapper
- *
- * @author 科技小王子
- * @since 2023-08-21 00:46:43
- */
-public interface TowerWorksheetAuditMapper extends BaseMapper<TowerWorksheetAudit> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerWorksheetAudit>
-     */
-    List<TowerWorksheetAudit> selectPageRel(@Param("page") IPage<TowerWorksheetAudit> page,
-                             @Param("param") TowerWorksheetAuditParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerWorksheetAudit> selectListRel(@Param("param") TowerWorksheetAuditParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetCarDispatchMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetCarDispatchMapper.java
deleted file mode 100644
index 0709d64..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetCarDispatchMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerWorksheetCarDispatch;
-import com.gxwebsoft.tower.param.TowerWorksheetCarDispatchParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 车辆调度Mapper
- *
- * @author 科技小王子
- * @since 2023-10-31 12:05:49
- */
-public interface TowerWorksheetCarDispatchMapper extends BaseMapper<TowerWorksheetCarDispatch> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerWorksheetCarDispatch>
-     */
-    List<TowerWorksheetCarDispatch> selectPageRel(@Param("page") IPage<TowerWorksheetCarDispatch> page,
-                             @Param("param") TowerWorksheetCarDispatchParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerWorksheetCarDispatch> selectListRel(@Param("param") TowerWorksheetCarDispatchParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetCheckMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetCheckMapper.java
deleted file mode 100644
index 1e12b7a..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetCheckMapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.gxwebsoft.tower.entity.TowerWorksheetCheck;
-import com.gxwebsoft.tower.param.TowerWorksheetCheckParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 派单现场核验Mapper
- *
- * @author 科技小王子
- * @since 2023-07-04 01:24:45
- */
-public interface TowerWorksheetCheckMapper extends MPJBaseMapper<TowerWorksheetCheck> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerWorksheetCheck>
-     */
-    List<TowerWorksheetCheck> selectPageRel(@Param("page") IPage<TowerWorksheetCheck> page,
-                             @Param("param") TowerWorksheetCheckParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerWorksheetCheck> selectListRel(@Param("param") TowerWorksheetCheckParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetDetailMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetDetailMapper.java
deleted file mode 100644
index d639d77..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetDetailMapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.gxwebsoft.tower.entity.TowerWorksheetDetail;
-import com.gxwebsoft.tower.param.TowerWorksheetDetailParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 派单详情Mapper
- *
- * @author 科技小王子
- * @since 2023-07-03 10:56:04
- */
-public interface TowerWorksheetDetailMapper extends MPJBaseMapper<TowerWorksheetDetail> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerWorksheetDetail>
-     */
-    List<TowerWorksheetDetail> selectPageRel(@Param("page") IPage<TowerWorksheetDetail> page,
-                             @Param("param") TowerWorksheetDetailParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerWorksheetDetail> selectListRel(@Param("param") TowerWorksheetDetailParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetMapper.java
deleted file mode 100644
index 05e8c43..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetMapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.gxwebsoft.tower.entity.TowerWorksheet;
-import com.gxwebsoft.tower.param.TowerWorksheetParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 派单管理Mapper
- *
- * @author 科技小王子
- * @since 2023-07-02 16:15:31
- */
-public interface TowerWorksheetMapper extends MPJBaseMapper<TowerWorksheet> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerWorksheet>
-     */
-    List<TowerWorksheet> selectPageRel(@Param("page") IPage<TowerWorksheet> page,
-                             @Param("param") TowerWorksheetParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerWorksheet> selectListRel(@Param("param") TowerWorksheetParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetPartsMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetPartsMapper.java
deleted file mode 100644
index 8f1f21d..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetPartsMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerWorksheetParts;
-import com.gxwebsoft.tower.param.TowerWorksheetPartsParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 派单配件Mapper
- *
- * @author 科技小王子
- * @since 2023-07-03 10:18:57
- */
-public interface TowerWorksheetPartsMapper extends BaseMapper<TowerWorksheetParts> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerWorksheetParts>
-     */
-    List<TowerWorksheetParts> selectPageRel(@Param("page") IPage<TowerWorksheetParts> page,
-                             @Param("param") TowerWorksheetPartsParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerWorksheetParts> selectListRel(@Param("param") TowerWorksheetPartsParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetSetUpMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetSetUpMapper.java
deleted file mode 100644
index d334b5a..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerWorksheetSetUpMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerWorksheetSetUp;
-import com.gxwebsoft.tower.param.TowerWorksheetSetUpParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 派单安装信息Mapper
- *
- * @author 科技小王子
- * @since 2023-07-03 10:18:57
- */
-public interface TowerWorksheetSetUpMapper extends BaseMapper<TowerWorksheetSetUp> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerWorksheetSetUp>
-     */
-    List<TowerWorksheetSetUp> selectPageRel(@Param("page") IPage<TowerWorksheetSetUp> page,
-                             @Param("param") TowerWorksheetSetUpParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerWorksheetSetUp> selectListRel(@Param("param") TowerWorksheetSetUpParam 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
deleted file mode 100644
index 6c49f5e..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerAccessoryMapper.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerAccessoryMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_accessory a
-        <where>
-            <if test="param.accessoryId != null">
-                AND a.accessory_id = #{param.accessoryId}
-            </if>
-            <if test="param.accessoryName != null">
-                AND a.accessory_name LIKE CONCAT('%', #{param.accessoryName}, '%')
-            </if>
-            <if test="param.accessoryCategory != null">
-                AND a.accessory_category LIKE CONCAT('%', #{param.accessoryCategory}, '%')
-            </if>
-            <if test="param.accessoryModel != null">
-                AND a.accessory_model LIKE CONCAT('%', #{param.accessoryModel}, '%')
-            </if>
-            <if test="param.accessorySpecs != null">
-                AND a.accessory_specs LIKE CONCAT('%', #{param.accessorySpecs}, '%')
-            </if>
-            <if test="param.accessoryPrice != null">
-                AND a.accessory_price = #{param.accessoryPrice}
-            </if>
-            <if test="param.accessoryUnit != null">
-                AND a.accessory_unit LIKE CONCAT('%', #{param.accessoryUnit}, '%')
-            </if>
-            <if test="param.accessoryStock != null">
-                AND a.accessory_stock LIKE CONCAT('%', #{param.accessoryStock}, '%')
-            </if>
-            <if test="param.companyName != null">
-                AND a.company_name LIKE CONCAT('%', #{param.companyName}, '%')
-            </if>
-            <if test="param.manufactor != null">
-                AND a.manufactor LIKE CONCAT('%', #{param.manufactor}, '%')
-            </if>
-            <if test="param.manufactorNo != null">
-                AND a.manufactor_no LIKE CONCAT('%', #{param.manufactorNo}, '%')
-            </if>
-            <if test="param.lifeYear != null">
-                AND a.life_year LIKE CONCAT('%', #{param.lifeYear}, '%')
-            </if>
-            <if test="param.factoryDate != null">
-                AND a.factory_date LIKE CONCAT('%', #{param.factoryDate}, '%')
-            </if>
-            <if test="param.scrapDate != null">
-                AND a.scrap_date LIKE CONCAT('%', #{param.scrapDate}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-          <if test="param.keywords != null">
-            AND (
-            a.accessory_name LIKE CONCAT('%', #{param.keywords}, '%')
-            OR a.accessory_no LIKE CONCAT('%', #{param.keywords}, '%')
-            OR a.company_name LIKE CONCAT('%', #{param.keywords}, '%')
-            )
-          </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerAccessory">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerAccessory">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractEquipmentMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractEquipmentMapper.xml
deleted file mode 100644
index 232f7b9..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractEquipmentMapper.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerContractEquipmentMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_contract_equipment a
-        <where>
-            <if test="param.contractEquipmentId != null">
-                AND a.contract_equipment_id = #{param.contractEquipmentId}
-            </if>
-            <if test="param.contractId != null">
-                AND a.contract_id = #{param.contractId}
-            </if>
-            <if test="param.equipmentName != null">
-                AND a.equipment_name LIKE CONCAT('%', #{param.equipmentName}, '%')
-            </if>
-            <if test="param.equipmentModel != null">
-                AND a.equipment_model LIKE CONCAT('%', #{param.equipmentModel}, '%')
-            </if>
-            <if test="param.num != null">
-                AND a.num = #{param.num}
-            </if>
-            <if test="param.planRentMonth != null">
-                AND a.plan_rent_month = #{param.planRentMonth}
-            </if>
-            <if test="param.rentAmount != null">
-                AND a.rent_amount = #{param.rentAmount}
-            </if>
-            <if test="param.inOutAmount != null">
-                AND a.in_out_amount = #{param.inOutAmount}
-            </if>
-            <if test="param.workerAmount != null">
-                AND a.worker_amount = #{param.workerAmount}
-            </if>
-            <if test="param.otherAmount != null">
-                AND a.other_amount = #{param.otherAmount}
-            </if>
-            <if test="param.preBuryAmount != null">
-                AND a.pre_bury_amount = #{param.preBuryAmount}
-            </if>
-            <if test="param.remark != null">
-                AND a.remark LIKE CONCAT('%', #{param.remark}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerContractEquipment">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerContractEquipment">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractFinalSettleLostMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractFinalSettleLostMapper.xml
deleted file mode 100644
index c3eca07..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractFinalSettleLostMapper.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerContractFinalSettleLostMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_contract_final_settle_lost a
-        <where>
-            <if test="param.finalSettleLostId != null">
-                AND a.final_settle_lost_id = #{param.finalSettleLostId}
-            </if>
-            <if test="param.finalSettleId != null">
-                AND a.final_settle_id = #{param.finalSettleId}
-            </if>
-            <if test="param.itemId != null">
-                AND a.item_id = #{param.itemId}
-            </if>
-            <if test="param.amount != null">
-                AND a.amount = #{param.amount}
-            </if>
-            <if test="param.num != null">
-                AND a.num = #{param.num}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerContractFinalSettleLost">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerContractFinalSettleLost">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractFinalSettleMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractFinalSettleMapper.xml
deleted file mode 100644
index b6ce2f8..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractFinalSettleMapper.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerContractFinalSettleMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_contract_final_settle a
-        <where>
-            <if test="param.contractFinalSettleId != null">
-                AND a.contract_final_settle_id = #{param.contractFinalSettleId}
-            </if>
-            <if test="param.contractId != null">
-                AND a.contract_id = #{param.contractId}
-            </if>
-            <if test="param.settleCompanyId != null">
-                AND a.settle_company_id = #{param.settleCompanyId}
-            </if>
-            <if test="param.signName != null">
-                AND a.sign_name LIKE CONCAT('%', #{param.signName}, '%')
-            </if>
-            <if test="param.signDate != null">
-                AND a.sign_date LIKE CONCAT('%', #{param.signDate}, '%')
-            </if>
-            <if test="param.remark != null">
-                AND a.remark LIKE CONCAT('%', #{param.remark}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerContractFinalSettle">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerContractFinalSettle">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractMapper.xml
deleted file mode 100644
index 01877dc..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractMapper.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerContractMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-               b.project_name,
-               c.name AS customer_name,
-               d.company_name
-        FROM tower_contract a
-        LEFT JOIN tower_project b ON a.project_id = b.project_id
-        LEFT JOIN tower_customer c ON a.customer_id = c.customer_id
-        LEFT JOIN sys_company d ON a.company_id = d.company_id
-        <where>
-            <if test="param.contractId != null">
-                AND a.contract_id = #{param.contractId}
-            </if>
-            <if test="param.projectId != null">
-                AND a.project_id = #{param.projectId}
-            </if>
-            <if test="param.companyId != null">
-                AND a.company_id = #{param.companyId}
-            </if>
-            <if test="param.customerId != null">
-                AND a.customer_id = #{param.customerId}
-            </if>
-            <if test="param.keywords != null">
-                AND (a.contact_number LIKE CONCAT('%', #{param.keywords}, '%')  OR b.project_name LIKE CONCAT('%', #{param.keywords}, '%'))
-            </if>
-            <if test="param.customerContact != null">
-                AND a.customer_contact LIKE CONCAT('%', #{param.customerContact}, '%')
-            </if>
-            <if test="param.contactNumber != null">
-                AND a.contact_number LIKE CONCAT('%', #{param.contactNumber}, '%')
-            </if>
-            <if test="param.signDate != null">
-                AND a.sign_date LIKE CONCAT('%', #{param.signDate}, '%')
-            </if>
-            <if test="param.startDate != null">
-                AND a.start_date LIKE CONCAT('%', #{param.startDate}, '%')
-            </if>
-            <if test="param.endDate != null">
-                AND a.end_date LIKE CONCAT('%', #{param.endDate}, '%')
-            </if>
-            <if test="param.contractAmount != null">
-                AND a.contract_amount = #{param.contractAmount}
-            </if>
-            <if test="param.contactAgreeAmount != null">
-                AND a.contact_agree_amount = #{param.contactAgreeAmount}
-            </if>
-            <if test="param.isInStock != null">
-                AND a.is_in_stock = #{param.isInStock}
-            </if>
-            <if test="param.autoSettle != null">
-                AND a.auto_settle = #{param.autoSettle}
-            </if>
-            <if test="param.settleMethod != null">
-                AND a.settle_method = #{param.settleMethod}
-            </if>
-            <if test="param.extendMonthDate != null">
-                AND a.extend_month_date = #{param.extendMonthDate}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerContract">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerContract">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractSettleEquipmentMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractSettleEquipmentMapper.xml
deleted file mode 100644
index 579945e..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractSettleEquipmentMapper.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerContractSettleEquipmentMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_contract_settle_equipment a
-        <where>
-            <if test="param.contractSettleId != null">
-                AND a.contract_settle_id = #{param.contractSettleId}
-            </if>
-            <if test="param.contractId != null">
-                AND a.contract_id = #{param.contractId}
-            </if>
-            <if test="param.equipmentName != null">
-                AND a.equipment_name LIKE CONCAT('%', #{param.equipmentName}, '%')
-            </if>
-            <if test="param.equipmentModel != null">
-                AND a.equipment_model LIKE CONCAT('%', #{param.equipmentModel}, '%')
-            </if>
-            <if test="param.factoryNo != null">
-                AND a.factory_no LIKE CONCAT('%', #{param.factoryNo}, '%')
-            </if>
-            <if test="param.equipmentNo != null">
-                AND a.equipment_no LIKE CONCAT('%', #{param.equipmentNo}, '%')
-            </if>
-            <if test="param.rentMonth != null">
-                AND a.rent_month = #{param.rentMonth}
-            </if>
-            <if test="param.rentAmount != null">
-                AND a.rent_amount = #{param.rentAmount}
-            </if>
-            <if test="param.inOutAmount != null">
-                AND a.in_out_amount = #{param.inOutAmount}
-            </if>
-            <if test="param.workerAmount != null">
-                AND a.worker_amount = #{param.workerAmount}
-            </if>
-            <if test="param.otherAmount != null">
-                AND a.other_amount = #{param.otherAmount}
-            </if>
-            <if test="param.remark != null">
-                AND a.remark LIKE CONCAT('%', #{param.remark}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerContractSettleEquipment">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerContractSettleEquipment">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractSettleRuleMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractSettleRuleMapper.xml
deleted file mode 100644
index 78ad8c4..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractSettleRuleMapper.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerContractSettleRuleMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_contract_settle_rule a
-        <where>
-            <if test="param.contractSettleRuleId != null">
-                AND a.contract_settle_rule_id = #{param.contractSettleRuleId}
-            </if>
-            <if test="param.contractId != null">
-                AND a.contract_id = #{param.contractId}
-            </if>
-            <if test="param.startDate != null">
-                AND a.start_date LIKE CONCAT('%', #{param.startDate}, '%')
-            </if>
-            <if test="param.endDate != null">
-                AND a.end_date LIKE CONCAT('%', #{param.endDate}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerContractSettleRule">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerContractSettleRule">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerCustomerMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerCustomerMapper.xml
deleted file mode 100644
index cceb1aa..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerCustomerMapper.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerCustomerMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_customer a
-        <where>
-            <if test="param.customerId != null">
-                AND a.customer_id = #{param.customerId}
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.fullName != null">
-                AND a.full_name LIKE CONCAT('%', #{param.fullName}, '%')
-            </if>
-            <if test="param.creditCode != null">
-                AND a.credit_code LIKE CONCAT('%', #{param.creditCode}, '%')
-            </if>
-            <if test="param.address != null">
-                AND a.address LIKE CONCAT('%', #{param.address}, '%')
-            </if>
-            <if test="param.contact != null">
-                AND a.contact LIKE CONCAT('%', #{param.contact}, '%')
-            </if>
-            <if test="param.phone != null">
-                AND a.phone LIKE CONCAT('%', #{param.phone}, '%')
-            </if>
-            <if test="param.telPhone != null">
-                AND a.tel_phone LIKE CONCAT('%', #{param.telPhone}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.avatar != null">
-                AND a.avatar LIKE CONCAT('%', #{param.avatar}, '%')
-            </if>
-            <if test="param.remark != null">
-                AND a.remark LIKE CONCAT('%', #{param.remark}, '%')
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.keywords != null">
-                AND (
-                a.name LIKE CONCAT('%', #{param.keywords}, '%')
-                OR a.full_name LIKE CONCAT('%', #{param.keywords}, '%')
-                OR a.credit_code LIKE CONCAT('%', #{param.keywords}, '%')
-                OR a.address LIKE CONCAT('%', #{param.keywords}, '%')
-                OR a.contact LIKE CONCAT('%', #{param.keywords}, '%')
-                )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerCustomer">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerCustomer">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerEquipmentMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerEquipmentMapper.xml
deleted file mode 100644
index 9a68cac..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerEquipmentMapper.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerEquipmentMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_equipment a
-        <where>
-            <if test="param.equipmentId != null">
-                AND a.equipment_id = #{param.equipmentId}
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.model != null">
-                AND a.model LIKE CONCAT('%', #{param.model}, '%')
-            </if>
-            <if test="param.equipmentNo != null">
-                AND a.equipment_no LIKE CONCAT('%', #{param.equipmentNo}, '%')
-            </if>
-            <if test="param.factoryNo != null">
-                AND a.factory_no LIKE CONCAT('%', #{param.factoryNo}, '%')
-            </if>
-            <if test="param.factoryDate != null">
-                AND a.factory_date LIKE CONCAT('%', #{param.factoryDate}, '%')
-            </if>
-            <if test="param.manufactor != null">
-                AND a.manufactor LIKE CONCAT('%', #{param.manufactor}, '%')
-            </if>
-            <if test="param.lifeYear != null">
-                AND a.life_year LIKE CONCAT('%', #{param.lifeYear}, '%')
-            </if>
-            <if test="param.scrapDate != null">
-                AND a.scrap_date LIKE CONCAT('%', #{param.scrapDate}, '%')
-            </if>
-            <if test="param.licenceNo != null">
-                AND a.licence_no LIKE CONCAT('%', #{param.licenceNo}, '%')
-            </if>
-            <if test="param.company != null">
-                AND a.company = #{param.company}
-            </if>
-            <if test="param.organization != null">
-                AND a.organization = #{param.organization}
-            </if>
-            <if test="param.warehouse != null">
-                AND a.warehouse = #{param.warehouse}
-            </if>
-            <if test="param.source != null">
-                AND a.source LIKE CONCAT('%', #{param.source}, '%')
-            </if>
-            <if test="param.buyDate != null">
-                AND a.buy_date LIKE CONCAT('%', #{param.buyDate}, '%')
-            </if>
-            <if test="param.currentLocation != null">
-                AND a.current_location LIKE CONCAT('%', #{param.currentLocation}, '%')
-            </if>
-            <if test="param.designHeight != null">
-                AND a.design_height LIKE CONCAT('%', #{param.designHeight}, '%')
-            </if>
-            <if test="param.height != null">
-                AND a.height LIKE CONCAT('%', #{param.height}, '%')
-            </if>
-            <if test="param.ratedLoad != null">
-                AND a.rated_load LIKE CONCAT('%', #{param.ratedLoad}, '%')
-            </if>
-            <if test="param.maxRatedLoad != null">
-                AND a.max_rated_load LIKE CONCAT('%', #{param.maxRatedLoad}, '%')
-            </if>
-            <if test="param.files != null">
-                AND a.files LIKE CONCAT('%', #{param.files}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.equipmentIdList != null">
-                AND a.equipment_id IN (#{param.equipmentIdList})
-            </if>
-            <if test="param.keywords != null">
-              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}, '%')
-              OR a.filing_no LIKE CONCAT('%', #{param.keywords}, '%')
-              OR a.factory_no LIKE CONCAT('%', #{param.keywords}, '%')
-              )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerEquipment">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerEquipment">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerFallMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerFallMapper.xml
deleted file mode 100644
index b190ebd..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerFallMapper.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerFallMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,b.company_name as companyName
-        FROM tower_fall a
-        left join sys_company b on a.company_id = b.company_id
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.keywords != null">
-                AND (
-                a.factory LIKE CONCAT('%', #{param.keywords}, '%') or
-                a.code LIKE CONCAT('%', #{param.keywords}, '%') or
-                a.model LIKE CONCAT('%', #{param.keywords}, '%')
-                )
-            </if>
-            <if test="param.code != null">
-                AND a.code LIKE CONCAT('%', #{param.code}, '%')
-            </if>
-            <if test="param.model != null">
-                AND a.model LIKE CONCAT('%', #{param.model}, '%')
-            </if>
-            <if test="param.factory != null">
-                AND a.factory LIKE CONCAT('%', #{param.factory}, '%')
-            </if>
-            <if test="param.companyId != null">
-                AND a.company_id LIKE CONCAT('%', #{param.companyId}, '%')
-            </if>
-            <if test="param.factoryDate != null">
-                AND a.factory_date LIKE CONCAT('%', #{param.factoryDate}, '%')
-            </if>
-            <if test="param.discardDate != null">
-                AND a.discard_date LIKE CONCAT('%', #{param.discardDate}, '%')
-            </if>
-            <if test="param.file1 != null">
-                AND a.file1 LIKE CONCAT('%', #{param.file1}, '%')
-            </if>
-            <if test="param.file2 != null">
-                AND a.file2 LIKE CONCAT('%', #{param.file2}, '%')
-            </if>
-            <if test="param.file3 != null">
-                AND a.file3 LIKE CONCAT('%', #{param.file3}, '%')
-            </if>
-            <if test="param.file4 != null">
-                AND a.file4 LIKE CONCAT('%', #{param.file4}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerFall">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerFall">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerHistorySettleMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerHistorySettleMapper.xml
deleted file mode 100644
index 0326116..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerHistorySettleMapper.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerHistorySettleMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_history_settle a
-        <where>
-            <if test="param.historySettleId != null">
-                AND a.history_settle_id = #{param.historySettleId}
-            </if>
-            <if test="param.projectId != null">
-                AND a.project_id = #{param.projectId}
-            </if>
-            <if test="param.contractNo != null">
-                AND a.contract_no LIKE CONCAT('%', #{param.contractNo}, '%')
-            </if>
-            <if test="param.equipmentId != null">
-                AND a.equipment_id = #{param.equipmentId}
-            </if>
-            <if test="param.amountWithTax != null">
-                AND a.amount_with_tax = #{param.amountWithTax}
-            </if>
-            <if test="param.taxAmount != null">
-                AND a.tax_amount = #{param.taxAmount}
-            </if>
-            <if test="param.inOutWithTax != null">
-                AND a.in_out_with_tax = #{param.inOutWithTax}
-            </if>
-            <if test="param.inOutTax != null">
-                AND a.in_out_tax = #{param.inOutTax}
-            </if>
-            <if test="param.workerAmountWithTax != null">
-                AND a.worker_amount_with_tax = #{param.workerAmountWithTax}
-            </if>
-            <if test="param.workerTax != null">
-                AND a.worker_tax = #{param.workerTax}
-            </if>
-            <if test="param.otherAmountWithTax != null">
-                AND a.other_amount_with_tax = #{param.otherAmountWithTax}
-            </if>
-            <if test="param.otherTax != null">
-                AND a.other_tax = #{param.otherTax}
-            </if>
-            <if test="param.startDate != null">
-                AND a.start_date LIKE CONCAT('%', #{param.startDate}, '%')
-            </if>
-            <if test="param.endDate != null">
-                AND a.end_date LIKE CONCAT('%', #{param.endDate}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerHistorySettle">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerHistorySettle">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerIncomeEquipmentMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerIncomeEquipmentMapper.xml
deleted file mode 100644
index 9907c67..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerIncomeEquipmentMapper.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerIncomeEquipmentMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_income_equipment a
-        <where>
-            <if test="param.incomeEquipmentId != null">
-                AND a.income_equipment_id = #{param.incomeEquipmentId}
-            </if>
-            <if test="param.incomeId != null">
-                AND a.income_id = #{param.incomeId}
-            </if>
-            <if test="param.equipmentId != null">
-                AND a.equipment_id = #{param.equipmentId}
-            </if>
-            <if test="param.shareAmount != null">
-                AND a.share_amount = #{param.shareAmount}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerIncomeEquipment">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerIncomeEquipment">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerIncomeMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerIncomeMapper.xml
deleted file mode 100644
index 4262944..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerIncomeMapper.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerIncomeMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_income a
-        <where>
-            <if test="param.incomeId != null">
-                AND a.income_id = #{param.incomeId}
-            </if>
-            <if test="param.contractId != null">
-                AND a.contract_id = #{param.contractId}
-            </if>
-            <if test="param.incomeNo != null">
-                AND a.income_no LIKE CONCAT('%', #{param.incomeNo}, '%')
-            </if>
-            <if test="param.incomeDate != null">
-                AND a.income_date LIKE CONCAT('%', #{param.incomeDate}, '%')
-            </if>
-            <if test="param.incomeCompanyId != null">
-                AND a.income_company_id = #{param.incomeCompanyId}
-            </if>
-            <if test="param.amount != null">
-                AND a.amount = #{param.amount}
-            </if>
-            <if test="param.incomeType != null">
-                AND a.income_type LIKE CONCAT('%', #{param.incomeType}, '%')
-            </if>
-            <if test="param.expectIncomeDate != null">
-                AND a.expect_income_date LIKE CONCAT('%', #{param.expectIncomeDate}, '%')
-            </if>
-            <if test="param.expectIncomeAmount != null">
-                AND a.expect_income_amount = #{param.expectIncomeAmount}
-            </if>
-            <if test="param.incomeMethod != null">
-                AND a.income_method LIKE CONCAT('%', #{param.incomeMethod}, '%')
-            </if>
-            <if test="param.invoicingNo != null">
-                AND a.invoicing_no LIKE CONCAT('%', #{param.invoicingNo}, '%')
-            </if>
-            <if test="param.fileList != null">
-                AND a.file_list LIKE CONCAT('%', #{param.fileList}, '%')
-            </if>
-            <if test="param.remark != null">
-                AND a.remark LIKE CONCAT('%', #{param.remark}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerIncome">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerIncome">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerInvoicingMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerInvoicingMapper.xml
deleted file mode 100644
index 0c9fef2..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerInvoicingMapper.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerInvoicingMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_invoicing a
-        <where>
-            <if test="param.invoicingId != null">
-                AND a.invoicing_id = #{param.invoicingId}
-            </if>
-            <if test="param.contractId != null">
-                AND a.contract_id = #{param.contractId}
-            </if>
-            <if test="param.invoicingDate != null">
-                AND a.invoicing_date LIKE CONCAT('%', #{param.invoicingDate}, '%')
-            </if>
-            <if test="param.invoicingCompany != null">
-                AND a.invoicing_company LIKE CONCAT('%', #{param.invoicingCompany}, '%')
-            </if>
-            <if test="param.requestName != null">
-                AND a.request_name LIKE CONCAT('%', #{param.requestName}, '%')
-            </if>
-            <if test="param.invoicingAmount != null">
-                AND a.invoicing_amount = #{param.invoicingAmount}
-            </if>
-            <if test="param.invoicingNo != null">
-                AND a.invoicing_no LIKE CONCAT('%', #{param.invoicingNo}, '%')
-            </if>
-            <if test="param.fileList != null">
-                AND a.file_list LIKE CONCAT('%', #{param.fileList}, '%')
-            </if>
-            <if test="param.remark != null">
-                AND a.remark LIKE CONCAT('%', #{param.remark}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerInvoicing">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerInvoicing">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerInvoicingSettleMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerInvoicingSettleMapper.xml
deleted file mode 100644
index 7726288..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerInvoicingSettleMapper.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerInvoicingSettleMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_invoicing_settle a
-        <where>
-            <if test="param.invoicingSettleId != null">
-                AND a.invoicing_settle_id = #{param.invoicingSettleId}
-            </if>
-            <if test="param.invoicingId != null">
-                AND a.invoicing_id = #{param.invoicingId}
-            </if>
-            <if test="param.settleId != null">
-                AND a.settle_id = #{param.settleId}
-            </if>
-            <if test="param.shareAmount != null">
-                AND a.share_amount = #{param.shareAmount}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerInvoicingSettle">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerInvoicingSettle">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerLendingMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerLendingMapper.xml
deleted file mode 100644
index 48dfd75..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerLendingMapper.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerLendingMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_lending a
-        <where>
-            <if test="param.lendingId != null">
-                AND a.lending_id = #{param.lendingId}
-            </if>
-            <if test="param.contractId != null">
-                AND a.contract_id = #{param.contractId}
-            </if>
-            <if test="param.propertyCompany != null">
-                AND a.property_company LIKE CONCAT('%', #{param.propertyCompany}, '%')
-            </if>
-            <if test="param.settleDate != null">
-                AND a.settle_date LIKE CONCAT('%', #{param.settleDate}, '%')
-            </if>
-            <if test="param.settleAmount != null">
-                AND a.settle_amount = #{param.settleAmount}
-            </if>
-            <if test="param.fileList != null">
-                AND a.file_list LIKE CONCAT('%', #{param.fileList}, '%')
-            </if>
-            <if test="param.remark != null">
-                AND a.remark LIKE CONCAT('%', #{param.remark}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerLending">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerLending">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerLendingSettleListMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerLendingSettleListMapper.xml
deleted file mode 100644
index 8087e8f..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerLendingSettleListMapper.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerLendingSettleListMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_lending_settle_list a
-        <where>
-            <if test="param.lendingSettleListId != null">
-                AND a.lending_settle_list_id = #{param.lendingSettleListId}
-            </if>
-            <if test="param.lendingId != null">
-                AND a.lending_id = #{param.lendingId}
-            </if>
-            <if test="param.equipmentId != null">
-                AND a.equipment_id = #{param.equipmentId}
-            </if>
-            <if test="param.lendingPath != null">
-                AND a.lending_path LIKE CONCAT('%', #{param.lendingPath}, '%')
-            </if>
-            <if test="param.coopWay != null">
-                AND a.coop_way LIKE CONCAT('%', #{param.coopWay}, '%')
-            </if>
-            <if test="param.startDate != null">
-                AND a.start_date LIKE CONCAT('%', #{param.startDate}, '%')
-            </if>
-            <if test="param.stopDate != null">
-                AND a.stop_date LIKE CONCAT('%', #{param.stopDate}, '%')
-            </if>
-            <if test="param.calDay != null">
-                AND a.cal_day = #{param.calDay}
-            </if>
-            <if test="param.isFullMonth != null">
-                AND a.is_full_month = #{param.isFullMonth}
-            </if>
-            <if test="param.daysInMonth != null">
-                AND a.days_in_month = #{param.daysInMonth}
-            </if>
-            <if test="param.monthRentAmount != null">
-                AND a.month_rent_amount = #{param.monthRentAmount}
-            </if>
-            <if test="param.shouldPayRentAmount != null">
-                AND a.should_pay_rent_amount = #{param.shouldPayRentAmount}
-            </if>
-            <if test="param.dailyRentAmount != null">
-                AND a.daily_rent_amount = #{param.dailyRentAmount}
-            </if>
-            <if test="param.shouldSupplementAmount != null">
-                AND a.should_supplement_amount = #{param.shouldSupplementAmount}
-            </if>
-            <if test="param.shouldDeductionAmount != null">
-                AND a.should_deduction_amount = #{param.shouldDeductionAmount}
-            </if>
-            <if test="param.paidAmount != null">
-                AND a.paid_amount = #{param.paidAmount}
-            </if>
-            <if test="param.taxRate != null">
-                AND a.tax_rate = #{param.taxRate}
-            </if>
-            <if test="param.taxAmount != null">
-                AND a.tax_amount = #{param.taxAmount}
-            </if>
-            <if test="param.totalAmountWithTax != null">
-                AND a.total_amount_with_tax = #{param.totalAmountWithTax}
-            </if>
-            <if test="param.remark != null">
-                AND a.remark LIKE CONCAT('%', #{param.remark}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerLendingSettleList">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerLendingSettleList">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerModelMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerModelMapper.xml
deleted file mode 100644
index ee0ae23..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerModelMapper.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerModelMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_model a
-        <where>
-            <if test="param.modelId != null">
-                AND a.model_id = #{param.modelId}
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.model != null">
-              AND a.model LIKE CONCAT('%', #{param.model}, '%')
-            </if>
-            <if test="param.parentId != null">
-                AND a.parent_id = #{param.parentId}
-            </if>
-            <if test="param.image != null">
-                AND a.image LIKE CONCAT('%', #{param.image}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.yearLife != null">
-                AND a.year_life = #{param.yearLife}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-          <if test="param.keywords != null">
-            AND (
-            a.name LIKE CONCAT('%', #{param.keywords}, '%')
-            OR a.model LIKE CONCAT('%', #{param.keywords}, '%')
-            )
-          </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerModel">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerModel">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPartGoodsMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPartGoodsMapper.xml
deleted file mode 100644
index 32e3245..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPartGoodsMapper.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerPartGoodsMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,b.nickname,b.phone,b.avatar,c.stock,c.stock_money,c.stock_min,c.stock_lower
-        FROM tower_part_goods a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        LEFT JOIN tower_part_stock c ON a.goods_id = c.goods_id
-        <where>
-            <if test="param.goodsId != null">
-                AND a.goods_id = #{param.goodsId}
-            </if>
-            <if test="param.goodsCode != null">
-                AND a.goods_code LIKE CONCAT('%', #{param.goodsCode}, '%')
-            </if>
-            <if test="param.category != null">
-                AND a.category LIKE CONCAT('%', #{param.category}, '%')
-            </if>
-            <if test="param.specs != null">
-                AND a.specs LIKE CONCAT('%', #{param.specs}, '%')
-            </if>
-            <if test="param.position != null">
-                AND a.position LIKE CONCAT('%', #{param.position}, '%')
-            </if>
-            <if test="param.price != null">
-                AND a.price = #{param.price}
-            </if>
-            <if test="param.salePrice != null">
-                AND a.sale_price = #{param.salePrice}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.keywords != null">
-              AND (a.goods_name LIKE CONCAT('%', #{param.keywords}, '%')
-              OR a.goods_id = #{param.keywords}
-              OR a.goods_code = #{param.keywords}
-              )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerPartGoods">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerPartGoods">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPartMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPartMapper.xml
deleted file mode 100644
index a44ab5a..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPartMapper.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerPartMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_part a
-        <where>
-            <if test="param.partId != null">
-                AND a.part_id = #{param.partId}
-            </if>
-            <if test="param.partCode != null">
-                AND a.part_code LIKE CONCAT('%', #{param.partCode}, '%')
-            </if>
-            <if test="param.category != null">
-                AND a.category LIKE CONCAT('%', #{param.category}, '%')
-            </if>
-            <if test="param.specs != null">
-                AND a.specs LIKE CONCAT('%', #{param.specs}, '%')
-            </if>
-            <if test="param.position != null">
-                AND a.position LIKE CONCAT('%', #{param.position}, '%')
-            </if>
-            <if test="param.stock != null">
-                AND a.stock = #{param.stock}
-            </if>
-            <if test="param.stockMoney != null">
-                AND a.stock_money = #{param.stockMoney}
-            </if>
-            <if test="param.price != null">
-                AND a.price = #{param.price}
-            </if>
-            <if test="param.stockMin != null">
-                AND a.stock_min = #{param.stockMin}
-            </if>
-            <if test="param.stockLower != null">
-                AND a.stock_lower = #{param.stockLower}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerPart">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerPart">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPartStockMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPartStockMapper.xml
deleted file mode 100644
index 6b80e46..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPartStockMapper.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerPartStockMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,b.nickname,b.phone,b.avatar
-        FROM tower_part_stock a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        <where>
-            <if test="param.partId != null">
-                AND a.part_id = #{param.partId}
-            </if>
-            <if test="param.goodsId != null">
-                AND a.goods_id = #{param.goodsId}
-            </if>
-            <if test="param.partCode != null">
-                AND a.part_code LIKE CONCAT('%', #{param.partCode}, '%')
-            </if>
-            <if test="param.category != null">
-                AND a.category LIKE CONCAT('%', #{param.category}, '%')
-            </if>
-            <if test="param.specs != null">
-                AND a.specs LIKE CONCAT('%', #{param.specs}, '%')
-            </if>
-            <if test="param.position != null">
-                AND a.position LIKE CONCAT('%', #{param.position}, '%')
-            </if>
-            <if test="param.stock != null">
-                AND a.stock = #{param.stock}
-            </if>
-            <if test="param.stockMoney != null">
-                AND a.stock_money = #{param.stockMoney}
-            </if>
-            <if test="param.price != null">
-                AND a.price = #{param.price}
-            </if>
-            <if test="param.stockMin != null">
-                AND a.stock_min = #{param.stockMin}
-            </if>
-            <if test="param.stockLower != null">
-                AND a.stock_lower = #{param.stockLower}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerPartStock">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerPartStock">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceMapper.xml
deleted file mode 100644
index 6fed629..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceMapper.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerPlaceMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_place a
-        <where>
-            <if test="param.placeId != null">
-                AND a.place_id = #{param.placeId}
-            </if>
-            <if test="param.placeCode != null">
-                AND a.place_code LIKE CONCAT('%', #{param.placeCode}, '%')
-            </if>
-            <if test="param.equipmentType != null">
-                AND a.equipment_type LIKE CONCAT('%', #{param.equipmentType}, '%')
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.standard != null">
-                AND a.standard LIKE CONCAT('%', #{param.standard}, '%')
-            </if>
-            <if test="param.type != null">
-                AND a.type LIKE CONCAT('%', #{param.type}, '%')
-            </if>
-            <if test="param.pushSystem != null">
-                AND a.push_system LIKE CONCAT('%', #{param.pushSystem}, '%')
-            </if>
-            <if test="param.otherParam != null">
-                AND a.other_param LIKE CONCAT('%', #{param.otherParam}, '%')
-            </if>
-            <if test="param.files != null">
-                AND a.files LIKE CONCAT('%', #{param.files}, '%')
-            </if>
-            <if test="param.isShow != null">
-                AND a.is_show = #{param.isShow}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.keywords != null">
-              AND (a.equipment_type LIKE CONCAT('%', #{param.keywords}, '%')
-              OR a.place_code = #{param.keywords}
-              OR a.name #{param.keywords}
-              )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerPlace">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerPlace">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceSafetyMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceSafetyMapper.xml
deleted file mode 100644
index 82e35d1..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceSafetyMapper.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerPlaceSafetyMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_place_safety a
-        <where>
-            <if test="param.placeSafetyId != null">
-                AND a.place_safety_id = #{param.placeSafetyId}
-            </if>
-            <if test="param.placeCode != null">
-                AND a.place_code LIKE CONCAT('%', #{param.placeCode}, '%')
-            </if>
-            <if test="param.equipmentType != null">
-                AND a.equipment_type LIKE CONCAT('%', #{param.equipmentType}, '%')
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.checkStandard != null">
-                AND a.check_standard LIKE CONCAT('%', #{param.checkStandard}, '%')
-            </if>
-            <if test="param.type != null">
-                AND a.type LIKE CONCAT('%', #{param.type}, '%')
-            </if>
-            <if test="param.pushSystem != null">
-                AND a.push_system LIKE CONCAT('%', #{param.pushSystem}, '%')
-            </if>
-            <if test="param.otherParam != null">
-                AND a.other_param LIKE CONCAT('%', #{param.otherParam}, '%')
-            </if>
-            <if test="param.files != null">
-                AND a.files LIKE CONCAT('%', #{param.files}, '%')
-            </if>
-            <if test="param.isShow != null">
-                AND a.is_show = #{param.isShow}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerPlaceSafety">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerPlaceSafety">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceStandardMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceStandardMapper.xml
deleted file mode 100644
index 51988a5..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceStandardMapper.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerPlaceStandardMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_place_standard a
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.placeId != null">
-                AND a.place_id = #{param.placeId}
-            </if>
-            <if test="param.standard != null">
-                AND a.standard LIKE CONCAT('%', #{param.standard}, '%')
-            </if>
-            <if test="param.files != null">
-                AND a.files LIKE CONCAT('%', #{param.files}, '%')
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerPlaceStandard">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerPlaceStandard">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectMapper.xml
deleted file mode 100644
index a43acf8..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectMapper.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerProjectMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_project a
-        <where>
-            <if test="param.projectId != null">
-                AND a.project_id = #{param.projectId}
-            </if>
-            <if test="param.projectName != null">
-                AND a.project_name LIKE CONCAT('%', #{param.projectName}, '%')
-            </if>
-            <if test="param.companyName != null">
-                AND a.company_name LIKE CONCAT('%', #{param.companyName}, '%')
-            </if>
-            <if test="param.customerName != null">
-                AND a.customer_name LIKE CONCAT('%', #{param.customerName}, '%')
-            </if>
-            <if test="param.projectRegion != null">
-                AND a.project_region LIKE CONCAT('%', #{param.projectRegion}, '%')
-            </if>
-            <if test="param.projectAddress != null">
-                AND a.project_address LIKE CONCAT('%', #{param.projectAddress}, '%')
-            </if>
-            <if test="param.longitude != null">
-                AND a.longitude LIKE CONCAT('%', #{param.longitude}, '%')
-            </if>
-            <if test="param.latitude != null">
-                AND a.latitude LIKE CONCAT('%', #{param.latitude}, '%')
-            </if>
-            <if test="param.superviseNo != null">
-                AND a.supervise_no LIKE CONCAT('%', #{param.superviseNo}, '%')
-            </if>
-            <if test="param.licenceNo != null">
-                AND a.licence_no LIKE CONCAT('%', #{param.licenceNo}, '%')
-            </if>
-            <if test="param.securityStatus != null">
-                AND a.security_status LIKE CONCAT('%', #{param.securityStatus}, '%')
-            </if>
-            <if test="param.competentDepartment != null">
-                AND a.competent_department LIKE CONCAT('%', #{param.competentDepartment}, '%')
-            </if>
-            <if test="param.dismantlingCompany != null">
-                AND a.dismantling_company LIKE CONCAT('%', #{param.dismantlingCompany}, '%')
-            </if>
-            <if test="param.truckCraneSpecs != null">
-                AND a.truck_crane_specs LIKE CONCAT('%', #{param.truckCraneSpecs}, '%')
-            </if>
-            <if test="param.contract != null">
-                AND a.contract LIKE CONCAT('%', #{param.contract}, '%')
-            </if>
-            <if test="param.director != null">
-                AND a.director = #{param.director}
-            </if>
-            <if test="param.projectDirector != null">
-                AND a.project_director LIKE CONCAT('%', #{param.projectDirector}, '%')
-            </if>
-            <if test="param.projectStatus != null">
-                AND a.project_status LIKE CONCAT('%', #{param.projectStatus}, '%')
-            </if>
-            <if test="param.salesman != null">
-                AND a.salesman LIKE CONCAT('%', #{param.salesman}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.keywords != null">
-                AND ( a.project_name LIKE CONCAT('%', #{param.keywords}, '%') )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerProject">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerProject">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectOrderMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectOrderMapper.xml
deleted file mode 100644
index 7549e71..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectOrderMapper.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerProjectOrderMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_project_order a
-        <where>
-            <if test="param.projectOrderId != null">
-                AND a.project_order_id = #{param.projectOrderId}
-            </if>
-          <if test="param.projectId != null">
-            AND a.project_id = #{param.projectId}
-          </if>
-            <if test="param.equipmentName != null">
-                AND a.equipment_name LIKE CONCAT('%', #{param.equipmentName}, '%')
-            </if>
-            <if test="param.equipmentModel != null">
-                AND a.equipment_model LIKE CONCAT('%', #{param.equipmentModel}, '%')
-            </if>
-            <if test="param.equipmentNum != null">
-                AND a.equipment_num = #{param.equipmentNum}
-            </if>
-            <if test="param.unit != null">
-                AND a.unit LIKE CONCAT('%', #{param.unit}, '%')
-            </if>
-            <if test="param.startTime != null">
-                AND a.start_time LIKE CONCAT('%', #{param.startTime}, '%')
-            </if>
-            <if test="param.endTime != null">
-                AND a.end_time LIKE CONCAT('%', #{param.endTime}, '%')
-            </if>
-            <if test="param.year != null">
-                AND a.year LIKE CONCAT('%', #{param.year}, '%')
-            </if>
-            <if test="param.documenter != null">
-                AND a.documenter LIKE CONCAT('%', #{param.documenter}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerProjectOrder">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerProjectOrder">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectPlaceMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectPlaceMapper.xml
deleted file mode 100644
index dc461fe..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectPlaceMapper.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerProjectPlaceMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        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
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.projectId != null">
-                AND a.project_id = #{param.projectId}
-            </if>
-            <if test="param.placeId != null">
-                AND a.place_id = #{param.placeId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.keywords != null">
-              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}, '%')
-              )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerProjectPlace">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerProjectPlace">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectUserMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectUserMapper.xml
deleted file mode 100644
index 07a766f..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectUserMapper.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerProjectUserMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        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
-        <where>
-            AND a.user_id != 0
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.role != null">
-                AND a.role = #{param.role}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.projectId != null">
-                AND a.project_id = #{param.projectId}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.keywords != null">
-              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}, '%')
-              )
-            </if>
-        </where>
-        GROUP BY a.user_id
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerProjectUser">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerProjectUser">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPurchaseMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPurchaseMapper.xml
deleted file mode 100644
index 82008d5..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPurchaseMapper.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerPurchaseMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_purchase a
-        <where>
-            <if test="param.purchaseId != null">
-                AND a.purchase_id = #{param.purchaseId}
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.purchaseCode != null">
-                AND a.purchase_code LIKE CONCAT('%', #{param.purchaseCode}, '%')
-            </if>
-            <if test="param.purchaseType != null">
-                AND a.purchase_type LIKE CONCAT('%', #{param.purchaseType}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerPurchase">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerPurchase">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerRentMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerRentMapper.xml
deleted file mode 100644
index ea8309e..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerRentMapper.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerRentMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*, b.company_name
-        FROM tower_rent a
-        LEFT JOIN sys_company b ON a.company_id = b.company_id
-        <where>
-            <if test="param.rentId != null">
-                AND a.rent_id = #{param.rentId}
-            </if>
-            <if test="param.rent != null">
-                AND a.rent = #{param.rent}
-            </if>
-            <if test="param.month != null">
-                AND a.month = #{param.month}
-            </if>
-            <if test="param.totalRent != null">
-                AND a.total_rent = #{param.totalRent}
-            </if>
-            <if test="param.projectId != null">
-                AND a.project_id = #{param.projectId}
-            </if>
-            <if test="param.equipmentId != null">
-                AND a.equipment_id = #{param.equipmentId}
-            </if>
-            <if test="param.startDate != null">
-                AND a.start_date LIKE CONCAT('%', #{param.startDate}, '%')
-            </if>
-            <if test="param.stopDate != null">
-                AND a.stop_date LIKE CONCAT('%', #{param.stopDate}, '%')
-            </if>
-            <if test="param.checkDate != null">
-                AND a.check_date LIKE CONCAT('%', #{param.checkDate}, '%')
-            </if>
-            <if test="param.reportStopDate != null">
-                AND a.report_stop_date LIKE CONCAT('%', #{param.reportStopDate}, '%')
-            </if>
-            <if test="param.reportStopType != null">
-                AND a.report_stop_type LIKE CONCAT('%', #{param.reportStopType}, '%')
-            </if>
-            <if test="param.restoreDate != null">
-                AND a.restore_date LIKE CONCAT('%', #{param.restoreDate}, '%')
-            </if>
-            <if test="param.reportMonitorNo != null">
-                AND a.report_monitor_no LIKE CONCAT('%', #{param.reportMonitorNo}, '%')
-            </if>
-            <if test="param.companyId != null">
-                AND a.company_id = #{param.companyId}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.keywords != null">
-              AND ( a.company_name LIKE CONCAT('%', #{param.keywords}, '%') )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerRent">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerRent">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerRentRecordMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerRentRecordMapper.xml
deleted file mode 100644
index 666b165..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerRentRecordMapper.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerRentRecordMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_rent_record a
-        <where>
-            <if test="param.rentRecordId != null">
-                AND a.rent_record_id = #{param.rentRecordId}
-            </if>
-            <if test="param.projectId != null">
-                AND a.project_id = #{param.projectId}
-            </if>
-            <if test="param.contractNo != null">
-                AND a.contract_no LIKE CONCAT('%', #{param.contractNo}, '%')
-            </if>
-            <if test="param.equipmentId != null">
-                AND a.equipment_id = #{param.equipmentId}
-            </if>
-            <if test="param.startDate != null">
-                AND a.start_date LIKE CONCAT('%', #{param.startDate}, '%')
-            </if>
-            <if test="param.stopDate != null">
-                AND a.stop_date LIKE CONCAT('%', #{param.stopDate}, '%')
-            </if>
-            <if test="param.checkDate != null">
-                AND a.check_date LIKE CONCAT('%', #{param.checkDate}, '%')
-            </if>
-            <if test="param.reportStopDate != null">
-                AND a.report_stop_date LIKE CONCAT('%', #{param.reportStopDate}, '%')
-            </if>
-            <if test="param.reportStopType != null">
-                AND a.report_stop_type LIKE CONCAT('%', #{param.reportStopType}, '%')
-            </if>
-            <if test="param.restoreDate != null">
-                AND a.restore_date LIKE CONCAT('%', #{param.restoreDate}, '%')
-            </if>
-            <if test="param.reportMonitorNo != null">
-                AND a.report_monitor_no LIKE CONCAT('%', #{param.reportMonitorNo}, '%')
-            </if>
-            <if test="param.companyId != null">
-                AND a.company_id = #{param.companyId}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerRentRecord">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerRentRecord">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSecurityPlantMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSecurityPlantMapper.xml
deleted file mode 100644
index e831333..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSecurityPlantMapper.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerSecurityPlantMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,b.nickname,b.phone,b.avatar,c.accessory_no,c.accessory_category,c.accessory_name,c.accessory_model,c.accessory_specs
-        FROM tower_security_plant a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        LEFT JOIN tower_accessory c ON c.accessory_id = a.security_id
-        <where>
-            <if test="param.securityRecordId != null">
-                AND a.security_record_id = #{param.securityRecordId}
-            </if>
-            <if test="param.securityId != null">
-                AND a.security_id = #{param.securityId}
-            </if>
-            <if test="param.securityCode != null">
-                AND a.security_code LIKE CONCAT('%', #{param.securityCode}, '%')
-            </if>
-            <if test="param.images != null">
-                AND a.images LIKE CONCAT('%', #{param.images}, '%')
-            </if>
-            <if test="param.longitude != null">
-                AND a.longitude LIKE CONCAT('%', #{param.longitude}, '%')
-            </if>
-            <if test="param.latitude != null">
-                AND a.latitude LIKE CONCAT('%', #{param.latitude}, '%')
-            </if>
-            <if test="param.country != null">
-                AND a.country LIKE CONCAT('%', #{param.country}, '%')
-            </if>
-            <if test="param.province != null">
-                AND a.province LIKE CONCAT('%', #{param.province}, '%')
-            </if>
-            <if test="param.city != null">
-                AND a.city LIKE CONCAT('%', #{param.city}, '%')
-            </if>
-            <if test="param.region != null">
-                AND a.region LIKE CONCAT('%', #{param.region}, '%')
-            </if>
-            <if test="param.regionName != null">
-                AND a.region_name LIKE CONCAT('%', #{param.regionName}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerSecurityPlant">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerSecurityPlant">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSecurityRecordMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSecurityRecordMapper.xml
deleted file mode 100644
index 4fe403a..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSecurityRecordMapper.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerSecurityRecordMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,b.nickname,b.phone,b.avatar,c.accessory_no,c.accessory_category,c.accessory_name,c.accessory_model,c.accessory_specs
-        FROM tower_security_record a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        LEFT JOIN tower_accessory c ON c.accessory_id = a.security_id
-        <where>
-            <if test="param.securityRecordId != null">
-                AND a.security_record_id = #{param.securityRecordId}
-            </if>
-            <if test="param.securityId != null">
-                AND a.security_id = #{param.securityId}
-            </if>
-            <if test="param.securityCode != null">
-                AND a.security_code LIKE CONCAT('%', #{param.securityCode}, '%')
-            </if>
-            <if test="param.images != null">
-                AND a.images LIKE CONCAT('%', #{param.images}, '%')
-            </if>
-            <if test="param.before1 != null">
-                AND a.before1 LIKE CONCAT('%', #{param.before1}, '%')
-            </if>
-            <if test="param.before2 != null">
-                AND a.before2 LIKE CONCAT('%', #{param.before2}, '%')
-            </if>
-            <if test="param.before3 != null">
-                AND a.before3 LIKE CONCAT('%', #{param.before3}, '%')
-            </if>
-            <if test="param.before4 != null">
-                AND a.before4 LIKE CONCAT('%', #{param.before4}, '%')
-            </if>
-            <if test="param.before5 != null">
-                AND a.before5 LIKE CONCAT('%', #{param.before5}, '%')
-            </if>
-            <if test="param.before6 != null">
-                AND a.before6 LIKE CONCAT('%', #{param.before6}, '%')
-            </if>
-            <if test="param.before7 != null">
-                AND a.before7 LIKE CONCAT('%', #{param.before7}, '%')
-            </if>
-            <if test="param.before8 != null">
-                AND a.before8 LIKE CONCAT('%', #{param.before8}, '%')
-            </if>
-            <if test="param.before9 != null">
-                AND a.before9 LIKE CONCAT('%', #{param.before9}, '%')
-            </if>
-            <if test="param.before10 != null">
-                AND a.before10 LIKE CONCAT('%', #{param.before10}, '%')
-            </if>
-            <if test="param.before11 != null">
-                AND a.before11 LIKE CONCAT('%', #{param.before11}, '%')
-            </if>
-            <if test="param.before12 != null">
-                AND a.before12 LIKE CONCAT('%', #{param.before12}, '%')
-            </if>
-            <if test="param.before13 != null">
-                AND a.before13 LIKE CONCAT('%', #{param.before13}, '%')
-            </if>
-            <if test="param.after1 != null">
-                AND a.after1 LIKE CONCAT('%', #{param.after1}, '%')
-            </if>
-            <if test="param.after2 != null">
-                AND a.after2 LIKE CONCAT('%', #{param.after2}, '%')
-            </if>
-            <if test="param.after3 != null">
-                AND a.after3 LIKE CONCAT('%', #{param.after3}, '%')
-            </if>
-            <if test="param.after4 != null">
-                AND a.after4 LIKE CONCAT('%', #{param.after4}, '%')
-            </if>
-            <if test="param.after5 != null">
-                AND a.after5 LIKE CONCAT('%', #{param.after5}, '%')
-            </if>
-            <if test="param.after6 != null">
-                AND a.after6 LIKE CONCAT('%', #{param.after6}, '%')
-            </if>
-            <if test="param.after7 != null">
-                AND a.after7 LIKE CONCAT('%', #{param.after7}, '%')
-            </if>
-            <if test="param.after8 != null">
-                AND a.after8 LIKE CONCAT('%', #{param.after8}, '%')
-            </if>
-            <if test="param.after9 != null">
-                AND a.after9 LIKE CONCAT('%', #{param.after9}, '%')
-            </if>
-            <if test="param.after10 != null">
-                AND a.after10 LIKE CONCAT('%', #{param.after10}, '%')
-            </if>
-            <if test="param.after11 != null">
-                AND a.after11 LIKE CONCAT('%', #{param.after11}, '%')
-            </if>
-            <if test="param.after12 != null">
-                AND a.after12 LIKE CONCAT('%', #{param.after12}, '%')
-            </if>
-            <if test="param.after13 != null">
-                AND a.after13 LIKE CONCAT('%', #{param.after13}, '%')
-            </if>
-            <if test="param.longitude != null">
-                AND a.longitude LIKE CONCAT('%', #{param.longitude}, '%')
-            </if>
-            <if test="param.latitude != null">
-                AND a.latitude LIKE CONCAT('%', #{param.latitude}, '%')
-            </if>
-            <if test="param.country != null">
-                AND a.country LIKE CONCAT('%', #{param.country}, '%')
-            </if>
-            <if test="param.province != null">
-                AND a.province LIKE CONCAT('%', #{param.province}, '%')
-            </if>
-            <if test="param.city != null">
-                AND a.city LIKE CONCAT('%', #{param.city}, '%')
-            </if>
-            <if test="param.region != null">
-                AND a.region LIKE CONCAT('%', #{param.region}, '%')
-            </if>
-            <if test="param.regionName != null">
-                AND a.region_name LIKE CONCAT('%', #{param.regionName}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerSecurityRecord">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerSecurityRecord">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSettleDetailMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSettleDetailMapper.xml
deleted file mode 100644
index c068e62..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSettleDetailMapper.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerSettleDetailMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_settle_detail a
-        <where>
-            <if test="param.settleDetailId != null">
-                AND a.settle_detail_id = #{param.settleDetailId}
-            </if>
-            <if test="param.settleId != null">
-                AND a.settle_id = #{param.settleId}
-            </if>
-            <if test="param.type != null">
-                AND a.type = #{param.type}
-            </if>
-            <if test="param.settleCostType != null">
-                AND a.settle_cost_type LIKE CONCAT('%', #{param.settleCostType}, '%')
-            </if>
-            <if test="param.equipmentName != null">
-                AND a.equipment_name LIKE CONCAT('%', #{param.equipmentName}, '%')
-            </if>
-            <if test="param.equipmentModel != null">
-                AND a.equipment_model LIKE CONCAT('%', #{param.equipmentModel}, '%')
-            </if>
-            <if test="param.factoryNo != null">
-                AND a.factory_no LIKE CONCAT('%', #{param.factoryNo}, '%')
-            </if>
-            <if test="param.startDate != null">
-                AND a.start_date LIKE CONCAT('%', #{param.startDate}, '%')
-            </if>
-            <if test="param.endDate != null">
-                AND a.end_date LIKE CONCAT('%', #{param.endDate}, '%')
-            </if>
-            <if test="param.monthAmount != null">
-                AND a.month_amount = #{param.monthAmount}
-            </if>
-            <if test="param.taxRate != null">
-                AND a.tax_rate = #{param.taxRate}
-            </if>
-            <if test="param.singleAmount != null">
-                AND a.single_amount = #{param.singleAmount}
-            </if>
-            <if test="param.num != null">
-                AND a.num = #{param.num}
-            </if>
-            <if test="param.unit != null">
-                AND a.unit LIKE CONCAT('%', #{param.unit}, '%')
-            </if>
-            <if test="param.remark != null">
-                AND a.remark LIKE CONCAT('%', #{param.remark}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerSettleDetail">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerSettleDetail">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSettleMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSettleMapper.xml
deleted file mode 100644
index c91535f..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSettleMapper.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerSettleMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_settle a
-        <where>
-            <if test="param.settleId != null">
-                AND a.settle_id = #{param.settleId}
-            </if>
-            <if test="param.settleNo != null">
-                AND a.settle_no LIKE CONCAT('%', #{param.settleNo}, '%')
-            </if>
-            <if test="param.contractId != null">
-                AND a.contract_id = #{param.contractId}
-            </if>
-            <if test="param.startDate != null">
-                AND a.start_date LIKE CONCAT('%', #{param.startDate}, '%')
-            </if>
-            <if test="param.endDate != null">
-                AND a.end_date LIKE CONCAT('%', #{param.endDate}, '%')
-            </if>
-            <if test="param.settleMethod != null">
-                AND a.settle_method = #{param.settleMethod}
-            </if>
-            <if test="param.extendMonthDate != null">
-                AND a.extend_month_date = #{param.extendMonthDate}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerSettle">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerSettle">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWarehouseMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWarehouseMapper.xml
deleted file mode 100644
index c2ecbef..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWarehouseMapper.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerWarehouseMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_warehouse a
-        <where>
-            <if test="param.warehouseId != null">
-                AND a.warehouse_id = #{param.warehouseId}
-            </if>
-            <if test="param.warehouseName != null">
-                AND a.warehouse_name LIKE CONCAT('%', #{param.warehouseName}, '%')
-            </if>
-            <if test="param.warehouseKeeper != null">
-                AND a.warehouse_keeper LIKE CONCAT('%', #{param.warehouseKeeper}, '%')
-            </if>
-            <if test="param.warehousePhone != null">
-                AND a.warehouse_phone LIKE CONCAT('%', #{param.warehousePhone}, '%')
-            </if>
-            <if test="param.longitude != null">
-                AND a.longitude LIKE CONCAT('%', #{param.longitude}, '%')
-            </if>
-            <if test="param.latitude != null">
-                AND a.latitude LIKE CONCAT('%', #{param.latitude}, '%')
-            </if>
-            <if test="param.country != null">
-                AND a.country LIKE CONCAT('%', #{param.country}, '%')
-            </if>
-            <if test="param.province != null">
-                AND a.province LIKE CONCAT('%', #{param.province}, '%')
-            </if>
-            <if test="param.city != null">
-                AND a.city LIKE CONCAT('%', #{param.city}, '%')
-            </if>
-            <if test="param.region != null">
-                AND a.region LIKE CONCAT('%', #{param.region}, '%')
-            </if>
-            <if test="param.address != null">
-                AND a.address LIKE CONCAT('%', #{param.address}, '%')
-            </if>
-            <if test="param.regionName != null">
-                AND a.region_name LIKE CONCAT('%', #{param.regionName}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-<!--            <if test="param.username != null">-->
-<!--                AND a.username = #{param.username}-->
-<!--            </if>-->
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.keywords != null">
-              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}
-              )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerWarehouse">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerWarehouse">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetCarDispatchMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetCarDispatchMapper.xml
deleted file mode 100644
index 8365273..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetCarDispatchMapper.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerWorksheetCarDispatchMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_worksheet_car_dispatch a
-        <where>
-            <if test="param.carDispatchId != null">
-                AND a.car_dispatch_id = #{param.carDispatchId}
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.carPlate != null">
-                AND a.car_plate LIKE CONCAT('%', #{param.carPlate}, '%')
-            </if>
-            <if test="param.phone != null">
-                AND a.phone LIKE CONCAT('%', #{param.phone}, '%')
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.contactPhone != null">
-                AND a.contact_phone LIKE CONCAT('%', #{param.contactPhone}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerWorksheetCarDispatch">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerWorksheetCarDispatch">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetCheckMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetCheckMapper.xml
deleted file mode 100644
index c98d687..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetCheckMapper.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerWorksheetCheckMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_worksheet_check a
-        <where>
-            <if test="param.checkId != null">
-                AND a.check_id = #{param.checkId}
-            </if>
-            <if test="param.worksheetId != null">
-                AND a.worksheet_id = #{param.worksheetId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.photos != null">
-                AND a.photos LIKE CONCAT('%', #{param.photos}, '%')
-            </if>
-            <if test="param.lat != null">
-                AND a.lat LIKE CONCAT('%', #{param.lat}, '%')
-            </if>
-            <if test="param.lng != null">
-                AND a.lng LIKE CONCAT('%', #{param.lng}, '%')
-            </if>
-            <if test="param.address != null">
-                AND a.address LIKE CONCAT('%', #{param.address}, '%')
-            </if>
-            <if test="param.checkTime != null">
-                AND a.check_time LIKE CONCAT('%', #{param.checkTime}, '%')
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerWorksheetCheck">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerWorksheetCheck">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetDetailMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetDetailMapper.xml
deleted file mode 100644
index ed9256f..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetDetailMapper.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerWorksheetDetailMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_worksheet_detail a
-        <where>
-            <if test="param.detailId != null">
-                AND a.detail_id = #{param.detailId}
-            </if>
-            <if test="param.worksheetId != null">
-                AND a.worksheet_id = #{param.worksheetId}
-            </if>
-            <if test="param.workType != null">
-                AND a.work_type = #{param.workType}
-            </if>
-            <if test="param.workerType != null">
-                AND a.worker_type = #{param.workerType}
-            </if>
-            <if test="param.equipmentId != null">
-                AND a.equipment_id = #{param.equipmentId}
-            </if>
-            <if test="param.setupLength != null">
-                AND a.setup_length = #{param.setupLength}
-            </if>
-            <if test="param.yearRequest != null">
-                AND a.year_request = #{param.yearRequest}
-            </if>
-            <if test="param.setupHeight != null">
-                AND a.setup_height = #{param.setupHeight}
-            </if>
-            <if test="param.needPaint != null">
-                AND a.need_paint = #{param.needPaint}
-            </if>
-            <if test="param.clingMethod != null">
-                AND a.cling_method = #{param.clingMethod}
-            </if>
-            <if test="param.hasConfirm != null">
-                AND a.has_confirm = #{param.hasConfirm}
-            </if>
-            <if test="param.clingNum != null">
-                AND a.cling_num = #{param.clingNum}
-            </if>
-            <if test="param.sectionNeedExpress != null">
-                AND a.section_need_express = #{param.sectionNeedExpress}
-            </if>
-            <if test="param.sectionNum != null">
-                AND a.section_num = #{param.sectionNum}
-            </if>
-            <if test="param.sectionNeedPaint != null">
-                AND a.section_need_paint = #{param.sectionNeedPaint}
-            </if>
-            <if test="param.removeHeight != null">
-                AND a.remove_height = #{param.removeHeight}
-            </if>
-            <if test="param.intro != null">
-                AND a.intro LIKE CONCAT('%', #{param.intro}, '%')
-            </if>
-            <if test="param.sysWorkerList != null">
-                AND a.sys_worker_list LIKE CONCAT('%', #{param.sysWorkerList}, '%')
-            </if>
-            <if test="param.outComeWorkerList != null">
-                AND a.out_come_worker_list LIKE CONCAT('%', #{param.outComeWorkerList}, '%')
-            </if>
-            <if test="param.classManager != null">
-                AND a.class_manager = #{param.classManager}
-            </if>
-            <if test="param.driver != null">
-                AND a.driver LIKE CONCAT('%', #{param.driver}, '%')
-            </if>
-            <if test="param.carPlate != null">
-                AND a.car_plate LIKE CONCAT('%', #{param.carPlate}, '%')
-            </if>
-            <if test="param.photos != null">
-                AND a.photos LIKE CONCAT('%', #{param.photos}, '%')
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerWorksheetDetail">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerWorksheetDetail">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetMapper.xml
deleted file mode 100644
index c592717..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetMapper.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerWorksheetMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_worksheet a
-        <where>
-            <if test="param.worksheetId != null">
-                AND a.worksheet_id = #{param.worksheetId}
-            </if>
-            <if test="param.type != null">
-                AND a.type = #{param.type}
-            </if>
-            <if test="param.startUid != null">
-                AND a.start_uid = #{param.startUid}
-            </if>
-            <if test="param.projectId != null">
-                AND a.project_id = #{param.projectId}
-            </if>
-            <if test="param.planInDate != null">
-                AND a.plan_in_date LIKE CONCAT('%', #{param.planInDate}, '%')
-            </if>
-            <if test="param.receiveDate != null">
-                AND a.receive_date LIKE CONCAT('%', #{param.receiveDate}, '%')
-            </if>
-            <if test="param.productionMangerUid != null">
-                AND a.production_manger_uid = #{param.productionMangerUid}
-            </if>
-            <if test="param.equipmentType != null">
-                AND a.equipment_type = #{param.equipmentType}
-            </if>
-            <if test="param.workType != null">
-                AND a.work_type = #{param.workType}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerWorksheet">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerWorksheet">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetPartsMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetPartsMapper.xml
deleted file mode 100644
index 5c8cccb..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetPartsMapper.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerWorksheetPartsMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_worksheet_parts a
-        <where>
-            <if test="param.partsId != null">
-                AND a.parts_id = #{param.partsId}
-            </if>
-            <if test="param.worksheetId != null">
-                AND a.worksheet_id = #{param.worksheetId}
-            </if>
-            <if test="param.parentId != null">
-                AND a.parent_id = #{param.parentId}
-            </if>
-            <if test="param.cateId != null">
-                AND a.cate_id = #{param.cateId}
-            </if>
-            <if test="param.num != null">
-                AND a.num = #{param.num}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerWorksheetParts">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerWorksheetParts">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetSetUpMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetSetUpMapper.xml
deleted file mode 100644
index 0c4ec17..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetSetUpMapper.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerWorksheetSetUpMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_worksheet_set_up a
-        <where>
-            <if test="param.setUpId != null">
-                AND a.set_up_id = #{param.setUpId}
-            </if>
-            <if test="param.worksheetId != null">
-                AND a.worksheet_id = #{param.worksheetId}
-            </if>
-            <if test="param.maxSetUpHeight != null">
-                AND a.max_set_up_height = #{param.maxSetUpHeight}
-            </if>
-            <if test="param.setUpHeight != null">
-                AND a.set_up_height = #{param.setUpHeight}
-            </if>
-            <if test="param.clingHeight != null">
-                AND a.cling_height = #{param.clingHeight}
-            </if>
-            <if test="param.bigArmLength != null">
-                AND a.big_arm_length = #{param.bigArmLength}
-            </if>
-            <if test="param.balanceLength != null">
-                AND a.balance_length = #{param.balanceLength}
-            </if>
-            <if test="param.planSetUpCling != null">
-                AND a.plan_set_up_cling = #{param.planSetUpCling}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerWorksheetSetUp">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerWorksheetSetUp">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerAccessoryParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerAccessoryParam.java
deleted file mode 100644
index c8326ac..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerAccessoryParam.java
+++ /dev/null
@@ -1,90 +0,0 @@
-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/TowerContractEquipmentParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerContractEquipmentParam.java
deleted file mode 100644
index ad3a602..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerContractEquipmentParam.java
+++ /dev/null
@@ -1,78 +0,0 @@
-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-06-09 13:42:20
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerContractEquipmentParam对象", description = "合同设备清单查询参数")
-public class TowerContractEquipmentParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer contractEquipmentId;
-
-    @ApiModelProperty(value = "合同ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer contractId;
-
-    @ApiModelProperty(value = "设备")
-    private String equipmentName;
-
-    @ApiModelProperty(value = "型号")
-    private String equipmentModel;
-
-    @ApiModelProperty(value = "签订数量")
-    @QueryField(type = QueryType.EQ)
-    private Integer num;
-
-    @ApiModelProperty(value = "计划租期(月)")
-    @QueryField(type = QueryType.EQ)
-    private Integer planRentMonth;
-
-    @ApiModelProperty(value = "租金")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal rentAmount;
-
-    @ApiModelProperty(value = "进退场费")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal inOutAmount;
-
-    @ApiModelProperty(value = "劳务费")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal workerAmount;
-
-    @ApiModelProperty(value = "其他费用")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal otherAmount;
-
-    @ApiModelProperty(value = "预埋费")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal preBuryAmount;
-
-    private String remark;
-
-    @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/TowerContractFinalSettleParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerContractFinalSettleParam.java
deleted file mode 100644
index 804789f..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerContractFinalSettleParam.java
+++ /dev/null
@@ -1,53 +0,0 @@
-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-17 22:34:32
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerContractFinalSettleParam对象", description = "项目结算书查询参数")
-public class TowerContractFinalSettleParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer contractFinalSettleId;
-
-    @ApiModelProperty(value = "合同ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer contractId;
-
-    @ApiModelProperty(value = "结算单位")
-    @QueryField(type = QueryType.EQ)
-    private Integer settleCompanyId;
-
-    @ApiModelProperty(value = "登记人员")
-    private String signName;
-
-    @ApiModelProperty(value = "登记日期")
-    private String signDate;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @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/TowerContractParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerContractParam.java
deleted file mode 100644
index 8d7beb6..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerContractParam.java
+++ /dev/null
@@ -1,93 +0,0 @@
-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-06-08 22:36:47
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerContractParam对象", description = "合同存档查询参数")
-public class TowerContractParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer contractId;
-
-    @ApiModelProperty(value = "项目ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer projectId;
-
-    @ApiModelProperty(value = "出租单位")
-    @QueryField(type = QueryType.EQ)
-    private Integer companyId;
-
-    @ApiModelProperty(value = "承租单位")
-    @QueryField(type = QueryType.EQ)
-    private Integer customerId;
-
-    @ApiModelProperty(value = "业务负责人")
-    private String customerContact;
-
-    @ApiModelProperty(value = "合同编号")
-    private String contactNumber;
-
-    @ApiModelProperty(value = "签订日期")
-    private String signDate;
-
-    @ApiModelProperty(value = "开始日期")
-    private String startDate;
-
-    @ApiModelProperty(value = "截止日期")
-    private String endDate;
-
-    @ApiModelProperty(value = "合同金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal contractAmount;
-
-    @ApiModelProperty(value = "合同约定金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal contactAgreeAmount;
-
-    @ApiModelProperty(value = "合同存档0未存档,1已存档")
-    @QueryField(type = QueryType.EQ)
-    private Boolean isInStock;
-
-    @ApiModelProperty(value = "是否自动结算")
-    @QueryField(type = QueryType.EQ)
-    private Boolean autoSettle;
-
-    @ApiModelProperty(value = "结算方式")
-    @QueryField(type = QueryType.EQ)
-    private Integer settleMethod;
-
-    @ApiModelProperty(value = "跨月结算日期")
-    @QueryField(type = QueryType.EQ)
-    private Integer extendMonthDate;
-
-    @ApiModelProperty(value = "已生成结算次数")
-    @QueryField(type = QueryType.EQ)
-    private Integer settleNum;
-
-    @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/TowerContractSettleEquipmentParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerContractSettleEquipmentParam.java
deleted file mode 100644
index 2128bed..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerContractSettleEquipmentParam.java
+++ /dev/null
@@ -1,75 +0,0 @@
-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-06-10 16:52:12
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerContractSettleEquipmentParam对象", description = "合同结算设备查询参数")
-public class TowerContractSettleEquipmentParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer contractSettleId;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer contractId;
-
-    @ApiModelProperty(value = "设备")
-    private String equipmentName;
-
-    @ApiModelProperty(value = "型号")
-    private String equipmentModel;
-
-    @ApiModelProperty(value = "出厂编号")
-    private String factoryNo;
-
-    @ApiModelProperty(value = "设备编号")
-    private String equipmentNo;
-
-    @ApiModelProperty(value = "计划租期(月)")
-    @QueryField(type = QueryType.EQ)
-    private Integer rentMonth;
-
-    @ApiModelProperty(value = "租金(元)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal rentAmount;
-
-    @ApiModelProperty(value = "进退场费")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal inOutAmount;
-
-    @ApiModelProperty(value = "劳务费")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal workerAmount;
-
-    @ApiModelProperty(value = "其他费用")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal otherAmount;
-
-    private String remark;
-
-    @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/TowerCustomerParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerCustomerParam.java
deleted file mode 100644
index 431f17a..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerCustomerParam.java
+++ /dev/null
@@ -1,66 +0,0 @@
-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 21:04:27
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerCustomerParam对象", description = "客户管理查询参数")
-public class TowerCustomerParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer customerId;
-
-    @ApiModelProperty(value = "客户名称")
-    private String name;
-
-    @ApiModelProperty(value = "全称")
-    private String fullName;
-
-    @ApiModelProperty(value = "客户标识")
-    private String creditCode;
-
-    @ApiModelProperty(value = "地址")
-    private String address;
-
-    @ApiModelProperty(value = "联系人")
-    private String contact;
-
-    @ApiModelProperty(value = "座机")
-    private String phone;
-
-    @ApiModelProperty(value = "手机")
-    private String telPhone;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "头像")
-    private String avatar;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Boolean deleted;
-
-    @ApiModelProperty(value = "所有人")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerEquipmentParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerEquipmentParam.java
deleted file mode 100644
index 6fd421a..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerEquipmentParam.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.gxwebsoft.tower.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-/**
- * 塔吊设备管理查询参数
- *
- * @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;
-
-    @ApiModelProperty(value = "是否仅显示未绑定项目设备")
-    @TableField(exist = false)
-    private Boolean idleOnly;
-
-    @ApiModelProperty(value = "是否仅显示未绑定项目设备")
-    @TableField(exist = false)
-    private List<String> notInFilingNoList;
-
-    @TableField(exist = false)
-    private List<Integer> equipmentIdList;
-
-    @TableField(exist = false)
-    private String keywords;
-
-    @TableField(exist = false)
-    private Integer yearFilter;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerFallParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerFallParam.java
deleted file mode 100644
index f40479d..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerFallParam.java
+++ /dev/null
@@ -1,78 +0,0 @@
-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-05 22:40:54
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerFallParam对象", description = "项目管理查询参数")
-public class TowerFallParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "防坠器编号")
-    private String code;
-
-    @ApiModelProperty(value = "防坠器型号")
-    private String model;
-
-    @ApiModelProperty(value = "制造厂家")
-    private String factory;
-
-    @ApiModelProperty(value = "产权单位")
-    private Integer companyId;
-
-    @ApiModelProperty(value = "出厂日期")
-    private String factoryDate;
-
-    @ApiModelProperty(value = "报废日期")
-    private String discardDate;
-
-    @ApiModelProperty(value = "出厂检测报告")
-    private String file1;
-
-    @ApiModelProperty(value = "合格证")
-    private String file2;
-
-    @ApiModelProperty(value = "出厂铭牌")
-    private String file3;
-
-    @ApiModelProperty(value = "发票")
-    private String file4;
-
-    @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/TowerHistorySettleParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerHistorySettleParam.java
deleted file mode 100644
index 7b593c0..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerHistorySettleParam.java
+++ /dev/null
@@ -1,87 +0,0 @@
-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-06-12 16:40:25
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerHistorySettleParam对象", description = "查询参数")
-public class TowerHistorySettleParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer historySettleId;
-
-    @ApiModelProperty(value = "项目ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer projectId;
-
-    @ApiModelProperty(value = "合同编号")
-    private String contractNo;
-
-    @ApiModelProperty(value = "设备")
-    @QueryField(type = QueryType.EQ)
-    private Integer equipmentId;
-
-    @ApiModelProperty(value = "设备结算租金含税金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal amountWithTax;
-
-    @ApiModelProperty(value = "设备结算租金税率")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal taxAmount;
-
-    @ApiModelProperty(value = "进出场费含税金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal inOutWithTax;
-
-    @ApiModelProperty(value = "进出场费税率")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal inOutTax;
-
-    @ApiModelProperty(value = "劳务费含税金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal workerAmountWithTax;
-
-    @ApiModelProperty(value = "劳务费税率")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal workerTax;
-
-    @ApiModelProperty(value = "其他费用含税金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal otherAmountWithTax;
-
-    @ApiModelProperty(value = "其他费用税率")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal otherTax;
-
-    @ApiModelProperty(value = "开始日期")
-    private String startDate;
-
-    @ApiModelProperty(value = "结束日期")
-    private String endDate;
-
-    @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/tower/param/TowerIncomeEquipmentParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerIncomeEquipmentParam.java
deleted file mode 100644
index 9ac3f74..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerIncomeEquipmentParam.java
+++ /dev/null
@@ -1,50 +0,0 @@
-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-06-17 17:06:39
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerIncomeEquipmentParam对象", description = "收款设备费用分摊查询参数")
-public class TowerIncomeEquipmentParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer incomeEquipmentId;
-
-    @ApiModelProperty(value = "收款ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer incomeId;
-
-    @ApiModelProperty(value = "设备ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer equipmentId;
-
-    @ApiModelProperty(value = "分摊费用")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal shareAmount;
-
-    @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/TowerIncomeParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerIncomeParam.java
deleted file mode 100644
index c71ee02..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerIncomeParam.java
+++ /dev/null
@@ -1,82 +0,0 @@
-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-06-17 17:06:39
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerIncomeParam对象", description = "收款管理查询参数")
-public class TowerIncomeParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer incomeId;
-
-    @ApiModelProperty(value = "合同ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer contractId;
-
-    @ApiModelProperty(value = "收款单号")
-    private String incomeNo;
-
-    @ApiModelProperty(value = "收款日期")
-    private String incomeDate;
-
-    @ApiModelProperty(value = "收款单位")
-    @QueryField(type = QueryType.EQ)
-    private Integer incomeCompanyId;
-
-    @ApiModelProperty(value = "收款金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal amount;
-
-    @ApiModelProperty(value = "收款类型")
-    private String incomeType;
-
-    @ApiModelProperty(value = "预计收款日期")
-    private String expectIncomeDate;
-
-    @ApiModelProperty(value = "预计收款金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal expectIncomeAmount;
-
-    @ApiModelProperty(value = "收款方式")
-    private String incomeMethod;
-
-    @ApiModelProperty(value = "发票号")
-    private String invoicingNo;
-
-    @ApiModelProperty(value = "附件")
-    private String fileList;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "收款状态(0已收款1已作废)")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @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/TowerInvoicingParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerInvoicingParam.java
deleted file mode 100644
index 5fff76b..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerInvoicingParam.java
+++ /dev/null
@@ -1,68 +0,0 @@
-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-06-17 12:47:08
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerInvoicingParam对象", description = "开票管理查询参数")
-public class TowerInvoicingParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer invoicingId;
-
-    @ApiModelProperty(value = "合同ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer contractId;
-
-    @ApiModelProperty(value = "开票日期")
-    private String invoicingDate;
-
-    @ApiModelProperty(value = "开票单位")
-    private String invoicingCompany;
-
-    @ApiModelProperty(value = "申请人")
-    private String requestName;
-
-    @ApiModelProperty(value = "开票金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal invoicingAmount;
-
-    @ApiModelProperty(value = "开票号")
-    private String invoicingNo;
-
-    @ApiModelProperty(value = "附件")
-    private String fileList;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "开票状态(0已开票1已作废)")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @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/TowerInvoicingSettleParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerInvoicingSettleParam.java
deleted file mode 100644
index d4a8449..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerInvoicingSettleParam.java
+++ /dev/null
@@ -1,50 +0,0 @@
-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-06-17 12:47:08
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerInvoicingSettleParam对象", description = "开票结算单分摊查询参数")
-public class TowerInvoicingSettleParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer invoicingSettleId;
-
-    @ApiModelProperty(value = "开票ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer invoicingId;
-
-    @ApiModelProperty(value = "结算ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer settleId;
-
-    @ApiModelProperty(value = "分摊金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal shareAmount;
-
-    @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/TowerLendingParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerLendingParam.java
deleted file mode 100644
index 86b940b..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerLendingParam.java
+++ /dev/null
@@ -1,58 +0,0 @@
-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-06-15 10:29:54
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerLendingParam对象", description = "拆借管理查询参数")
-public class TowerLendingParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer lendingId;
-
-    @ApiModelProperty(value = "合同ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer contractId;
-
-    @ApiModelProperty(value = "产权单位")
-    private String propertyCompany;
-
-    @ApiModelProperty(value = "结算日期")
-    private String settleDate;
-
-    @ApiModelProperty(value = "本期结算金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal settleAmount;
-
-    @ApiModelProperty(value = "附件")
-    private String fileList;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @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/TowerLendingSettleListParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerLendingSettleListParam.java
deleted file mode 100644
index 18421c8..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerLendingSettleListParam.java
+++ /dev/null
@@ -1,109 +0,0 @@
-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-06-15 10:29:54
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerLendingSettleListParam对象", description = "拆借结算清单查询参数")
-public class TowerLendingSettleListParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer lendingSettleListId;
-
-    @ApiModelProperty(value = "拆借主单id")
-    @QueryField(type = QueryType.EQ)
-    private Integer lendingId;
-
-    @ApiModelProperty(value = "设备")
-    @QueryField(type = QueryType.EQ)
-    private Integer equipmentId;
-
-    @ApiModelProperty(value = "拆借路线")
-    private String lendingPath;
-
-    @ApiModelProperty(value = "合作方式")
-    private String coopWay;
-
-    @ApiModelProperty(value = "结算开始日期")
-    private String startDate;
-
-    @ApiModelProperty(value = "结算截止日期")
-    private String stopDate;
-
-    @ApiModelProperty(value = "计费天数")
-    @QueryField(type = QueryType.EQ)
-    private Integer calDay;
-
-    @ApiModelProperty(value = "整月")
-    @QueryField(type = QueryType.EQ)
-    private Boolean isFullMonth;
-
-    @ApiModelProperty(value = "月计费天数")
-    @QueryField(type = QueryType.EQ)
-    private Integer daysInMonth;
-
-    @ApiModelProperty(value = "月租金")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal monthRentAmount;
-
-    @ApiModelProperty(value = "应付租金")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal shouldPayRentAmount;
-
-    @ApiModelProperty(value = "日租金")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal dailyRentAmount;
-
-    @ApiModelProperty(value = "应补租金")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal shouldSupplementAmount;
-
-    @ApiModelProperty(value = "应扣租金")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal shouldDeductionAmount;
-
-    @ApiModelProperty(value = "实付金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal paidAmount;
-
-    @ApiModelProperty(value = "税率")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal taxRate;
-
-    @ApiModelProperty(value = "税金")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal taxAmount;
-
-    @ApiModelProperty(value = "税价合计")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal totalAmountWithTax;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @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/tower/param/TowerModelParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerModelParam.java
deleted file mode 100644
index 970767e..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerModelParam.java
+++ /dev/null
@@ -1,64 +0,0 @@
-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/TowerPartGoodsParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerPartGoodsParam.java
deleted file mode 100644
index e53b800..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerPartGoodsParam.java
+++ /dev/null
@@ -1,70 +0,0 @@
-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 2024-02-27 19:41:23
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerPartGoodsParam对象", description = "安全检查查询参数")
-public class TowerPartGoodsParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer goodsId;
-
-    @ApiModelProperty(value = "配件编码")
-    private String goodsCode;
-
-    @ApiModelProperty(value = "类别")
-    private String category;
-
-    @ApiModelProperty(value = "规格")
-    private String specs;
-
-    @ApiModelProperty(value = "货架")
-    private String position;
-
-    @ApiModelProperty(value = "进货价格")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "销售价格")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal salePrice;
-
-    @ApiModelProperty(value = "状态, 0正常, 1待修,2异常已修，3异常未修")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "排序号")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "所有人")
-    @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/TowerPartParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerPartParam.java
deleted file mode 100644
index c2bb9aa..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerPartParam.java
+++ /dev/null
@@ -1,82 +0,0 @@
-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 2024-02-27 18:40:31
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerPartParam对象", description = "安全检查查询参数")
-public class TowerPartParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer partId;
-
-    @ApiModelProperty(value = "配件编码")
-    private String partCode;
-
-    @ApiModelProperty(value = "类别")
-    private String category;
-
-    @ApiModelProperty(value = "规格")
-    private String specs;
-
-    @ApiModelProperty(value = "位置")
-    private String position;
-
-    @ApiModelProperty(value = "库存数量")
-    @QueryField(type = QueryType.EQ)
-    private Integer stock;
-
-    @ApiModelProperty(value = "库存金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal stockMoney;
-
-    @ApiModelProperty(value = "进货价格")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "最低库存")
-    @QueryField(type = QueryType.EQ)
-    private Integer stockMin;
-
-    @ApiModelProperty(value = "是否低于最低库存")
-    @QueryField(type = QueryType.EQ)
-    private Integer stockLower;
-
-    @ApiModelProperty(value = "状态, 0正常, 1待修,2异常已修，3异常未修")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "排序号")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "所有人")
-    @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/TowerPartStockParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerPartStockParam.java
deleted file mode 100644
index a1af870..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerPartStockParam.java
+++ /dev/null
@@ -1,86 +0,0 @@
-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 2024-02-27 19:41:23
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerPartStockParam对象", description = "产品库存查询参数")
-public class TowerPartStockParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer partId;
-
-    @ApiModelProperty(value = "产品ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer goodsId;
-
-    @ApiModelProperty(value = "配件编码")
-    private String partCode;
-
-    @ApiModelProperty(value = "类别")
-    private String category;
-
-    @ApiModelProperty(value = "规格")
-    private String specs;
-
-    @ApiModelProperty(value = "位置")
-    private String position;
-
-    @ApiModelProperty(value = "库存数量")
-    @QueryField(type = QueryType.EQ)
-    private Integer stock;
-
-    @ApiModelProperty(value = "库存金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal stockMoney;
-
-    @ApiModelProperty(value = "进货价格")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "最低库存")
-    @QueryField(type = QueryType.EQ)
-    private Integer stockMin;
-
-    @ApiModelProperty(value = "是否低于最低库存")
-    @QueryField(type = QueryType.EQ)
-    private Integer stockLower;
-
-    @ApiModelProperty(value = "状态, 0正常, 1待修,2异常已修，3异常未修")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "排序号")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "所有人")
-    @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/TowerPlaceParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerPlaceParam.java
deleted file mode 100644
index 3800102..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerPlaceParam.java
+++ /dev/null
@@ -1,81 +0,0 @@
-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<TowerPlaceStandard> 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
deleted file mode 100644
index 0385285..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerPlaceSafetyParam.java
+++ /dev/null
@@ -1,76 +0,0 @@
-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
deleted file mode 100644
index 8e13943..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerPlaceStandardParam.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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
deleted file mode 100644
index 2864a5c..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerProjectOrderParam.java
+++ /dev/null
@@ -1,87 +0,0 @@
-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<TowerProjectOrder> orders;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerProjectParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerProjectParam.java
deleted file mode 100644
index a88a9fe..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerProjectParam.java
+++ /dev/null
@@ -1,145 +0,0 @@
-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<TowerProjectUser> users;
-
-    @ApiModelProperty(value = "合同预定设备清单")
-    @TableField(exist = false)
-    private Set<TowerProjectOrder> orders;
-
-    @ApiModelProperty(value = "检查部位配置")
-    @TableField(exist = false)
-    private Set<TowerProjectPlace> places1;
-
-    @ApiModelProperty(value = "保养部位配置")
-    @TableField(exist = false)
-    private Set<TowerProjectPlace> places2;
-
-
-    @ApiModelProperty(value = "派单类型")
-    @TableField(exist = false)
-    private Integer worksheetType;
-
-    @ApiModelProperty(value = "派单设备类型")
-    @TableField(exist = false)
-    private Integer worksheetEquipType;
-
-    @ApiModelProperty(value = "派单作业类型")
-    @TableField(exist = false)
-    private Integer worksheetWortType;
-
-    @ApiModelProperty("搜索关键字")
-    @TableField(exist = false)
-    private String keywords;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerProjectPlaceParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerProjectPlaceParam.java
deleted file mode 100644
index 86607ed..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerProjectPlaceParam.java
+++ /dev/null
@@ -1,54 +0,0 @@
-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
deleted file mode 100644
index 0e0ad28..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerProjectUserParam.java
+++ /dev/null
@@ -1,66 +0,0 @@
-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/TowerPurchaseParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerPurchaseParam.java
deleted file mode 100644
index fa2c82b..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerPurchaseParam.java
+++ /dev/null
@@ -1,60 +0,0 @@
-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 2024-02-05 20:53:31
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerPurchaseParam对象", description = "采购入库表查询参数")
-public class TowerPurchaseParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer purchaseId;
-
-    @ApiModelProperty(value = "部位名称")
-    private String name;
-
-    @ApiModelProperty(value = "部件编码")
-    private String purchaseCode;
-
-    @ApiModelProperty(value = "部件类型")
-    private String purchaseType;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "企业名称")
-    private String companyName;
-
-    @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/TowerRentParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerRentParam.java
deleted file mode 100644
index 002a4bb..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerRentParam.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.gxwebsoft.tower.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 2024-02-05 15:04:19
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerRentParam对象", description = "标准节租金查询参数")
-public class TowerRentParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "租单记录id")
-    @QueryField(type = QueryType.EQ)
-    private Integer rentId;
-
-    @ApiModelProperty(value = "租金")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal rent;
-
-    @ApiModelProperty(value = "每个月租金")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal month;
-
-    @ApiModelProperty(value = "月数")
-    @QueryField(type = QueryType.EQ)
-    private Integer num;
-
-    @ApiModelProperty(value = "获取的租金")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal totalRent;
-
-    @ApiModelProperty(value = "项目ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer projectId;
-
-    @ApiModelProperty(value = "合同编号")
-    private String contractNo;
-
-    @ApiModelProperty(value = "设备ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer equipmentId;
-
-    @ApiModelProperty(value = "起租日期")
-    private String startDate;
-
-    @ApiModelProperty(value = "停租日期")
-    private String stopDate;
-
-    @ApiModelProperty(value = "检测日期")
-    private String checkDate;
-
-    @ApiModelProperty(value = "报停日期")
-    private String reportStopDate;
-
-    @ApiModelProperty(value = "报停类型")
-    private String reportStopType;
-
-    @ApiModelProperty(value = "复工日期")
-    private String restoreDate;
-
-    @ApiModelProperty(value = "报监编号")
-    private String reportMonitorNo;
-
-    @ApiModelProperty(value = "承租单位")
-    @QueryField(type = QueryType.EQ)
-    private Integer companyId;
-
-    @ApiModelProperty(value = "企业名称")
-    @TableField(exist = false)
-    private String companyName;
-
-    @ApiModelProperty(value = "状态(0未起租1起租2中途报停3报停复工4拆卸停租)")
-    @QueryField(type = QueryType.EQ)
-    private Boolean status;
-
-    @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/TowerRentRecordParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerRentRecordParam.java
deleted file mode 100644
index f21df5e..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerRentRecordParam.java
+++ /dev/null
@@ -1,77 +0,0 @@
-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-13 00:42:42
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerRentRecordParam对象", description = "租单记录查询参数")
-public class TowerRentRecordParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "租单记录id")
-    @QueryField(type = QueryType.EQ)
-    private Integer rentRecordId;
-
-    @ApiModelProperty(value = "项目ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer projectId;
-
-    @ApiModelProperty(value = "合同编号")
-    private String contractNo;
-
-    @ApiModelProperty(value = "设备ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer equipmentId;
-
-    @ApiModelProperty(value = "起租日期")
-    private String startDate;
-
-    @ApiModelProperty(value = "停租日期")
-    private String stopDate;
-
-    @ApiModelProperty(value = "检测日期")
-    private String checkDate;
-
-    @ApiModelProperty(value = "报停日期")
-    private String reportStopDate;
-
-    @ApiModelProperty(value = "报停类型")
-    private String reportStopType;
-
-    @ApiModelProperty(value = "复工日期")
-    private String restoreDate;
-
-    @ApiModelProperty(value = "报监编号")
-    private String reportMonitorNo;
-
-    @ApiModelProperty(value = "承租单位")
-    @QueryField(type = QueryType.EQ)
-    private Integer companyId;
-
-    @ApiModelProperty(value = "状态(0未起租1起租2中途报停3报停复工4拆卸停租)")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @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/TowerSecurityParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerSecurityParam.java
deleted file mode 100644
index 21716d6..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerSecurityParam.java
+++ /dev/null
@@ -1,81 +0,0 @@
-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 2024-02-22 13:44:23
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerSecurityParam对象", description = "安全检查查询参数")
-public class TowerSecurityParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer securityId;
-
-    @ApiModelProperty(value = "类型")
-    private Integer type;
-
-    @ApiModelProperty(value = "项目名称")
-    private String projectName;
-
-    @ApiModelProperty(value = "保养编号")
-    private String securityCode;
-
-    @ApiModelProperty(value = "所在地")
-    private String address;
-
-    @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 regionName;
-
-    @ApiModelProperty(value = "状态, 0正常, 1待修,2异常已修，3异常未修")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "排序号")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "所有人")
-    @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/TowerSecurityPlantParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerSecurityPlantParam.java
deleted file mode 100644
index bae304e..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerSecurityPlantParam.java
+++ /dev/null
@@ -1,79 +0,0 @@
-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 2024-02-25 19:03:48
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerSecurityPlantParam对象", description = "保养记录查询参数")
-public class TowerSecurityPlantParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer securityRecordId;
-
-    @ApiModelProperty(value = "保养计划ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer securityId;
-
-    @ApiModelProperty(value = "保养编号")
-    private String securityCode;
-
-    @ApiModelProperty(value = "现场图片")
-    private String images;
-
-    @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 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 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/TowerSecurityRecordParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerSecurityRecordParam.java
deleted file mode 100644
index a2c8a5f..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerSecurityRecordParam.java
+++ /dev/null
@@ -1,157 +0,0 @@
-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 2024-02-27 15:00:15
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerSecurityRecordParam对象", description = "保养记录查询参数")
-public class TowerSecurityRecordParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer securityRecordId;
-
-    @ApiModelProperty(value = "保养计划ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer securityId;
-
-    @ApiModelProperty(value = "保养编号")
-    private String securityCode;
-
-    @ApiModelProperty(value = "现场图片")
-    private String images;
-
-    @ApiModelProperty(value = "基础节(保养前)")
-    private String before1;
-
-    @ApiModelProperty(value = "第一节架(保养前)")
-    private String before2;
-
-    @ApiModelProperty(value = "顶升内套架(保养前)")
-    private String before3;
-
-    @ApiModelProperty(value = "顶升外套架(保养前)")
-    private String before4;
-
-    @ApiModelProperty(value = "过渡节(保养前)")
-    private String before5;
-
-    @ApiModelProperty(value = "回转(保养前)")
-    private String before6;
-
-    @ApiModelProperty(value = "塔帽(保养前)")
-    private String before7;
-
-    @ApiModelProperty(value = "平衡臂(保养前)")
-    private String before8;
-
-    @ApiModelProperty(value = "起重臂(保养前)")
-    private String before9;
-
-    @ApiModelProperty(value = "变幅小车(保养前)")
-    private String before10;
-
-    @ApiModelProperty(value = "大钩(保养前)")
-    private String before11;
-
-    @ApiModelProperty(value = "顶升引进小车(保养前)")
-    private String before12;
-
-    @ApiModelProperty(value = "驾驶室(保养前)")
-    private String before13;
-
-    @ApiModelProperty(value = "基础节(保养后)")
-    private String after1;
-
-    @ApiModelProperty(value = "第一节架(保养后)")
-    private String after2;
-
-    @ApiModelProperty(value = "顶升内套架(保养后)")
-    private String after3;
-
-    @ApiModelProperty(value = "顶升外套架(保养后)")
-    private String after4;
-
-    @ApiModelProperty(value = "过渡节(保养后)")
-    private String after5;
-
-    @ApiModelProperty(value = "回转(保养后)")
-    private String after6;
-
-    @ApiModelProperty(value = "塔帽(保养后)")
-    private String after7;
-
-    @ApiModelProperty(value = "平衡臂(保养后)")
-    private String after8;
-
-    @ApiModelProperty(value = "起重臂(保养后)")
-    private String after9;
-
-    @ApiModelProperty(value = "变幅小车(保养后)")
-    private String after10;
-
-    @ApiModelProperty(value = "大钩(保养后)")
-    private String after11;
-
-    @ApiModelProperty(value = "顶升引进小车(保养后)")
-    private String after12;
-
-    @ApiModelProperty(value = "驾驶室(保养后)")
-    private String after13;
-
-    @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 regionName;
-
-    @ApiModelProperty(value = "状态, 0正常, 1待修,2异常已修，3异常未修")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "排序号")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "所有人")
-    @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/TowerSettleDetailParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerSettleDetailParam.java
deleted file mode 100644
index b2fe3e3..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerSettleDetailParam.java
+++ /dev/null
@@ -1,86 +0,0 @@
-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-06-11 19:13:12
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerSettleDetailParam对象", description = "合同结算详情查询参数")
-public class TowerSettleDetailParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer settleDetailId;
-
-    @ApiModelProperty(value = "结算id")
-    @QueryField(type = QueryType.EQ)
-    private Integer settleId;
-
-    @ApiModelProperty(value = "结算类型:0租金结算;1进退场费结算;2操作人员工资结算;3其他费用;4扣除项")
-    @QueryField(type = QueryType.EQ)
-    private Boolean type;
-
-    @ApiModelProperty(value = "费用类型")
-    private String settleCostType;
-
-    @ApiModelProperty(value = "设备")
-    private String equipmentName;
-
-    @ApiModelProperty(value = "型号")
-    private String equipmentModel;
-
-    @ApiModelProperty(value = "出厂编号")
-    private String factoryNo;
-
-    @ApiModelProperty(value = "结算开始日期")
-    private String startDate;
-
-    @ApiModelProperty(value = "结算结束日期")
-    private String endDate;
-
-    @ApiModelProperty(value = "月租金/月工资")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal monthAmount;
-
-    @ApiModelProperty(value = "税率")
-    @QueryField(type = QueryType.EQ)
-    private Integer taxRate;
-
-    @ApiModelProperty(value = "进退场单价/单次费用")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal singleAmount;
-
-    @ApiModelProperty(value = "进退场次数/次数")
-    @QueryField(type = QueryType.EQ)
-    private Integer num;
-
-    @ApiModelProperty(value = "单位")
-    private String unit;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @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/TowerSettleParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerSettleParam.java
deleted file mode 100644
index 1c2942b..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerSettleParam.java
+++ /dev/null
@@ -1,61 +0,0 @@
-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-11 19:19:10
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerSettleParam对象", description = "结算管理查询参数")
-public class TowerSettleParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer settleId;
-
-    @ApiModelProperty(value = "结算单号")
-    private String settleNo;
-
-    @ApiModelProperty(value = "合同id")
-    @QueryField(type = QueryType.EQ)
-    private Integer contractId;
-
-    @ApiModelProperty(value = "本期开始日期")
-    private String startDate;
-
-    @ApiModelProperty(value = "本期结束日期")
-    private String endDate;
-
-    @ApiModelProperty(value = "结算方式(0跨月;1自然月;2按日;3系数结算-跨月;4系数结算-自然月")
-    @QueryField(type = QueryType.EQ)
-    private Boolean settleMethod;
-
-    @ApiModelProperty(value = "跨月结算日期")
-    @QueryField(type = QueryType.EQ)
-    private Integer extendMonthDate;
-
-    @ApiModelProperty(value = "结算状态(0未认证;1已认证;2已失效;)")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @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/TowerWarehouseParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerWarehouseParam.java
deleted file mode 100644
index 2a1d29d..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerWarehouseParam.java
+++ /dev/null
@@ -1,77 +0,0 @@
-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/param/TowerWorksheetCarDispatchParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerWorksheetCarDispatchParam.java
deleted file mode 100644
index 01d93df..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerWorksheetCarDispatchParam.java
+++ /dev/null
@@ -1,41 +0,0 @@
-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-10-31 12:05:49
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerWorksheetCarDispatchParam对象", description = "车辆调度查询参数")
-public class TowerWorksheetCarDispatchParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer carDispatchId;
-
-    private String name;
-
-    private String carPlate;
-
-    private String phone;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "项目联系人电话")
-    private String contactPhone;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerWorksheetDetailParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerWorksheetDetailParam.java
deleted file mode 100644
index b28d2ae..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerWorksheetDetailParam.java
+++ /dev/null
@@ -1,113 +0,0 @@
-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-07-03 10:56:04
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerWorksheetDetailParam对象", description = "派单详情查询参数")
-public class TowerWorksheetDetailParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer detailId;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer worksheetId;
-
-    @ApiModelProperty(value = "工作类型(0安装1加高2拆卸)")
-    @QueryField(type = QueryType.EQ)
-    private Integer workType;
-
-    @ApiModelProperty(value = "设备ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer equipmentId;
-
-    @ApiModelProperty(value = "安装臂长(m)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal setupLength;
-
-    @ApiModelProperty(value = "年份要求")
-    @QueryField(type = QueryType.EQ)
-    private Integer yearRequest;
-
-    @ApiModelProperty(value = "安装高度")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal setupHeight;
-
-    @ApiModelProperty(value = "是否要油漆")
-    @QueryField(type = QueryType.EQ)
-    private Integer needPaint;
-
-    @ApiModelProperty(value = "附着方式(0预埋1钻孔)")
-    @QueryField(type = QueryType.EQ)
-    private Integer clingMethod;
-
-    @ApiModelProperty(value = "现场条件确认")
-    @QueryField(type = QueryType.EQ)
-    private Integer hasConfirm;
-
-    @ApiModelProperty(value = "加高第几道附着")
-    @QueryField(type = QueryType.EQ)
-    private Integer clingNum;
-
-    @ApiModelProperty(value = "标节是否需要发货")
-    @QueryField(type = QueryType.EQ)
-    private Integer sectionNeedExpress;
-
-    @ApiModelProperty(value = "标节数量")
-    @QueryField(type = QueryType.EQ)
-    private Integer sectionNum;
-
-    @ApiModelProperty(value = "标节是否需要油漆")
-    @QueryField(type = QueryType.EQ)
-    private Integer sectionNeedPaint;
-
-    @ApiModelProperty(value = "拆卸高度")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal removeHeight;
-
-    @ApiModelProperty(value = "派单说明")
-    private String intro;
-
-    @ApiModelProperty(value = "系统内的作业人员")
-    private String sysWorkerList;
-
-    @ApiModelProperty(value = "外调的作业人员")
-    private String outComeWorkerList;
-
-    @ApiModelProperty(value = "人员类型(0自有1外派)")
-    private Integer workerType;
-
-    @ApiModelProperty(value = "班组负责人")
-    @QueryField(type = QueryType.EQ)
-    private Integer classManager;
-
-    @ApiModelProperty(value = "司机")
-    private String driver;
-
-    @ApiModelProperty(value = "车牌")
-    private String carPlate;
-
-    private String photos;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerWorksheetParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerWorksheetParam.java
deleted file mode 100644
index 782785d..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerWorksheetParam.java
+++ /dev/null
@@ -1,69 +0,0 @@
-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-07-02 16:15:31
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerWorksheetParam对象", description = "派单管理查询参数")
-public class TowerWorksheetParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer worksheetId;
-
-    @ApiModelProperty(value = "派单类型:0安拆1质检2仓储3维保")
-    @QueryField(type = QueryType.EQ)
-    private Integer type;
-
-    @ApiModelProperty(value = "工作类型(0安装1加高2拆卸)")
-    @QueryField(type = QueryType.EQ)
-    private Integer workType;
-
-    @ApiModelProperty(value = "经营人员ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer startUid;
-
-    @ApiModelProperty(value = "项目ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer projectId;
-
-    @ApiModelProperty(value = "计划进场时间(经营人员填)")
-    private String planInDateInit;
-
-    @ApiModelProperty(value = "计划进场时间")
-    private String planInDate;
-
-    @ApiModelProperty(value = "到货时间")
-    private String receiveDate;
-
-    @ApiModelProperty(value = "生产主管ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer productionMangerUid;
-
-    @ApiModelProperty(value = "设备类型:(0塔式起重机;1施工升降机;2物料提升机)")
-    @QueryField(type = QueryType.EQ)
-    private Integer equipmentType;
-
-    @ApiModelProperty(value = "0已取消1待派单2待到场3待确认4已完成")
-    @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/TowerWorksheetPartsParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerWorksheetPartsParam.java
deleted file mode 100644
index 1591a13..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerWorksheetPartsParam.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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-07-03 10:18:57
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerWorksheetPartsParam对象", description = "派单配件查询参数")
-public class TowerWorksheetPartsParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer partsId;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer worksheetId;
-
-
-    @ApiModelProperty(value = "父级分类ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer parentId;
-
-    @ApiModelProperty(value = "配件ID,对应category表ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer cateId;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer num;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerWorksheetSetUpParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerWorksheetSetUpParam.java
deleted file mode 100644
index 31e0402..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerWorksheetSetUpParam.java
+++ /dev/null
@@ -1,61 +0,0 @@
-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-07-03 10:18:57
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerWorksheetSetUpParam对象", description = "派单安装信息查询参数")
-public class TowerWorksheetSetUpParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer setUpId;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer worksheetId;
-
-    @ApiModelProperty(value = "最大安装高度")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal maxSetUpHeight;
-
-    @ApiModelProperty(value = "安装高度")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal setUpHeight;
-
-    @ApiModelProperty(value = "附着高度")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal clingHeight;
-
-    @ApiModelProperty(value = "大臂长度")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal bigArmLength;
-
-    @ApiModelProperty(value = "平衡长度")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal balanceLength;
-
-    @ApiModelProperty(value = "计划安装附着")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal planSetUpCling;
-
-    @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
deleted file mode 100644
index 2224bf0..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerAccessoryService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<TowerAccessory> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerAccessory>
-     */
-    PageResult<TowerAccessory> pageRel(TowerAccessoryParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerAccessory>
-     */
-    List<TowerAccessory> listRel(TowerAccessoryParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param accessoryId 自增ID
-     * @return TowerAccessory
-     */
-    TowerAccessory getByIdRel(Integer accessoryId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerContractEquipmentService.java b/src/main/java/com/gxwebsoft/tower/service/TowerContractEquipmentService.java
deleted file mode 100644
index 1998245..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerContractEquipmentService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerContractEquipment;
-import com.gxwebsoft.tower.param.TowerContractEquipmentParam;
-
-import java.util.List;
-
-/**
- * 合同设备清单Service
- *
- * @author 科技小王子
- * @since 2023-06-09 13:42:20
- */
-public interface TowerContractEquipmentService extends IService<TowerContractEquipment> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerContractEquipment>
-     */
-    PageResult<TowerContractEquipment> pageRel(TowerContractEquipmentParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerContractEquipment>
-     */
-    List<TowerContractEquipment> listRel(TowerContractEquipmentParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param contractEquipmentId 
-     * @return TowerContractEquipment
-     */
-    TowerContractEquipment getByIdRel(Integer contractEquipmentId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerContractFileService.java b/src/main/java/com/gxwebsoft/tower/service/TowerContractFileService.java
deleted file mode 100644
index ae0057b..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerContractFileService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerContractFile;
-import com.gxwebsoft.tower.param.TowerContractFileParam;
-
-import java.util.List;
-
-/**
- * 合同附件Service
- *
- * @author 科技小王子
- * @since 2023-06-09 13:42:20
- */
-public interface TowerContractFileService extends IService<TowerContractFile> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerContractFile>
-     */
-    PageResult<TowerContractFile> pageRel(TowerContractFileParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerContractFile>
-     */
-    List<TowerContractFile> listRel(TowerContractFileParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param contractFileId 
-     * @return TowerContractFile
-     */
-    TowerContractFile getByIdRel(Integer contractFileId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerContractFinalSettleLostService.java b/src/main/java/com/gxwebsoft/tower/service/TowerContractFinalSettleLostService.java
deleted file mode 100644
index 7afaa1b..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerContractFinalSettleLostService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerContractFinalSettleLost;
-import com.gxwebsoft.tower.param.TowerContractFinalSettleLostParam;
-
-import java.util.List;
-
-/**
- * 结算书缺失物品Service
- *
- * @author 科技小王子
- * @since 2023-06-18 00:52:41
- */
-public interface TowerContractFinalSettleLostService extends IService<TowerContractFinalSettleLost> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerContractFinalSettleLost>
-     */
-    PageResult<TowerContractFinalSettleLost> pageRel(TowerContractFinalSettleLostParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerContractFinalSettleLost>
-     */
-    List<TowerContractFinalSettleLost> listRel(TowerContractFinalSettleLostParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param finalSettleLostId 
-     * @return TowerContractFinalSettleLost
-     */
-    TowerContractFinalSettleLost getByIdRel(Integer finalSettleLostId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerContractFinalSettleService.java b/src/main/java/com/gxwebsoft/tower/service/TowerContractFinalSettleService.java
deleted file mode 100644
index 563eeeb..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerContractFinalSettleService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerContractFinalSettle;
-import com.gxwebsoft.tower.param.TowerContractFinalSettleParam;
-
-import java.util.List;
-
-/**
- * 项目结算书Service
- *
- * @author 科技小王子
- * @since 2023-06-17 22:34:32
- */
-public interface TowerContractFinalSettleService extends IService<TowerContractFinalSettle> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerContractFinalSettle>
-     */
-    PageResult<TowerContractFinalSettle> pageRel(TowerContractFinalSettleParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerContractFinalSettle>
-     */
-    List<TowerContractFinalSettle> listRel(TowerContractFinalSettleParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param contractFinalSettleId 
-     * @return TowerContractFinalSettle
-     */
-    TowerContractFinalSettle getByIdRel(Integer contractFinalSettleId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerContractService.java b/src/main/java/com/gxwebsoft/tower/service/TowerContractService.java
deleted file mode 100644
index 282a4cd..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerContractService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerContract;
-import com.gxwebsoft.tower.param.TowerContractParam;
-
-import java.util.List;
-
-/**
- * 合同存档Service
- *
- * @author 科技小王子
- * @since 2023-06-08 22:36:47
- */
-public interface TowerContractService extends IService<TowerContract> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerContract>
-     */
-    PageResult<TowerContract> pageRel(TowerContractParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerContract>
-     */
-    List<TowerContract> listRel(TowerContractParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param contractId 
-     * @return TowerContract
-     */
-    TowerContract getByIdRel(Integer contractId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerContractSettleEquipmentService.java b/src/main/java/com/gxwebsoft/tower/service/TowerContractSettleEquipmentService.java
deleted file mode 100644
index d38306e..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerContractSettleEquipmentService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerContractSettleEquipment;
-import com.gxwebsoft.tower.param.TowerContractSettleEquipmentParam;
-
-import java.util.List;
-
-/**
- * 合同结算设备Service
- *
- * @author 科技小王子
- * @since 2023-06-10 16:52:12
- */
-public interface TowerContractSettleEquipmentService extends IService<TowerContractSettleEquipment> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerContractSettleEquipment>
-     */
-    PageResult<TowerContractSettleEquipment> pageRel(TowerContractSettleEquipmentParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerContractSettleEquipment>
-     */
-    List<TowerContractSettleEquipment> listRel(TowerContractSettleEquipmentParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param contractSettleId 
-     * @return TowerContractSettleEquipment
-     */
-    TowerContractSettleEquipment getByIdRel(Integer contractSettleId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerContractSettleRuleService.java b/src/main/java/com/gxwebsoft/tower/service/TowerContractSettleRuleService.java
deleted file mode 100644
index de76cea..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerContractSettleRuleService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerContractSettleRule;
-import com.gxwebsoft.tower.param.TowerContractSettleRuleParam;
-
-import java.util.List;
-
-/**
- * 合同结算规则Service
- *
- * @author 科技小王子
- * @since 2023-06-11 13:48:41
- */
-public interface TowerContractSettleRuleService extends IService<TowerContractSettleRule> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerContractSettleRule>
-     */
-    PageResult<TowerContractSettleRule> pageRel(TowerContractSettleRuleParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerContractSettleRule>
-     */
-    List<TowerContractSettleRule> listRel(TowerContractSettleRuleParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param contractSettleRuleId 
-     * @return TowerContractSettleRule
-     */
-    TowerContractSettleRule getByIdRel(Integer contractSettleRuleId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerCustomerService.java b/src/main/java/com/gxwebsoft/tower/service/TowerCustomerService.java
deleted file mode 100644
index e3790e9..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerCustomerService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerCustomer;
-import com.gxwebsoft.tower.param.TowerCustomerParam;
-
-import java.util.List;
-
-/**
- * 客户管理Service
- *
- * @author 科技小王子
- * @since 2023-06-08 21:04:27
- */
-public interface TowerCustomerService extends IService<TowerCustomer> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerCustomer>
-     */
-    PageResult<TowerCustomer> pageRel(TowerCustomerParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerCustomer>
-     */
-    List<TowerCustomer> listRel(TowerCustomerParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param customerId 
-     * @return TowerCustomer
-     */
-    TowerCustomer getByIdRel(Integer customerId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerEquipmentService.java b/src/main/java/com/gxwebsoft/tower/service/TowerEquipmentService.java
deleted file mode 100644
index de1a69b..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerEquipmentService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<TowerEquipment> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerEquipment>
-     */
-    PageResult<TowerEquipment> pageRel(TowerEquipmentParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerEquipment>
-     */
-    List<TowerEquipment> listRel(TowerEquipmentParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param equipmentId 自增ID
-     * @return TowerEquipment
-     */
-    TowerEquipment getByIdRel(Integer equipmentId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerFallService.java b/src/main/java/com/gxwebsoft/tower/service/TowerFallService.java
deleted file mode 100644
index 46fd0ca..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerFallService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerFall;
-import com.gxwebsoft.tower.param.TowerFallParam;
-
-import java.util.List;
-
-/**
- * 项目管理Service
- *
- * @author 科技小王子
- * @since 2023-06-05 22:40:55
- */
-public interface TowerFallService extends IService<TowerFall> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerFall>
-     */
-    PageResult<TowerFall> pageRel(TowerFallParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerFall>
-     */
-    List<TowerFall> listRel(TowerFallParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id 自增ID
-     * @return TowerFall
-     */
-    TowerFall getByIdRel(Integer id);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerHistorySettleService.java b/src/main/java/com/gxwebsoft/tower/service/TowerHistorySettleService.java
deleted file mode 100644
index d0cd0f4..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerHistorySettleService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerHistorySettle;
-import com.gxwebsoft.tower.param.TowerHistorySettleParam;
-
-import java.util.List;
-
-/**
- * Service
- *
- * @author 科技小王子
- * @since 2023-06-12 16:40:25
- */
-public interface TowerHistorySettleService extends IService<TowerHistorySettle> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerHistorySettle>
-     */
-    PageResult<TowerHistorySettle> pageRel(TowerHistorySettleParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerHistorySettle>
-     */
-    List<TowerHistorySettle> listRel(TowerHistorySettleParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param historySettleId 
-     * @return TowerHistorySettle
-     */
-    TowerHistorySettle getByIdRel(Integer historySettleId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerIncomeEquipmentService.java b/src/main/java/com/gxwebsoft/tower/service/TowerIncomeEquipmentService.java
deleted file mode 100644
index 4499494..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerIncomeEquipmentService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerIncomeEquipment;
-import com.gxwebsoft.tower.param.TowerIncomeEquipmentParam;
-
-import java.util.List;
-
-/**
- * 收款设备费用分摊Service
- *
- * @author 科技小王子
- * @since 2023-06-17 17:06:39
- */
-public interface TowerIncomeEquipmentService extends IService<TowerIncomeEquipment> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerIncomeEquipment>
-     */
-    PageResult<TowerIncomeEquipment> pageRel(TowerIncomeEquipmentParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerIncomeEquipment>
-     */
-    List<TowerIncomeEquipment> listRel(TowerIncomeEquipmentParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param incomeEquipmentId 
-     * @return TowerIncomeEquipment
-     */
-    TowerIncomeEquipment getByIdRel(Integer incomeEquipmentId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerIncomeService.java b/src/main/java/com/gxwebsoft/tower/service/TowerIncomeService.java
deleted file mode 100644
index 305e195..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerIncomeService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerIncome;
-import com.gxwebsoft.tower.param.TowerIncomeParam;
-
-import java.util.List;
-
-/**
- * 收款管理Service
- *
- * @author 科技小王子
- * @since 2023-06-17 17:06:39
- */
-public interface TowerIncomeService extends IService<TowerIncome> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerIncome>
-     */
-    PageResult<TowerIncome> pageRel(TowerIncomeParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerIncome>
-     */
-    List<TowerIncome> listRel(TowerIncomeParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param incomeId 
-     * @return TowerIncome
-     */
-    TowerIncome getByIdRel(Integer incomeId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerInvoicingService.java b/src/main/java/com/gxwebsoft/tower/service/TowerInvoicingService.java
deleted file mode 100644
index cff14f6..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerInvoicingService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerInvoicing;
-import com.gxwebsoft.tower.param.TowerInvoicingParam;
-
-import java.util.List;
-
-/**
- * 开票管理Service
- *
- * @author 科技小王子
- * @since 2023-06-17 12:47:08
- */
-public interface TowerInvoicingService extends IService<TowerInvoicing> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerInvoicing>
-     */
-    PageResult<TowerInvoicing> pageRel(TowerInvoicingParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerInvoicing>
-     */
-    List<TowerInvoicing> listRel(TowerInvoicingParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param invoicingId 
-     * @return TowerInvoicing
-     */
-    TowerInvoicing getByIdRel(Integer invoicingId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerInvoicingSettleService.java b/src/main/java/com/gxwebsoft/tower/service/TowerInvoicingSettleService.java
deleted file mode 100644
index 4bbed08..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerInvoicingSettleService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerInvoicingSettle;
-import com.gxwebsoft.tower.param.TowerInvoicingSettleParam;
-
-import java.util.List;
-
-/**
- * 开票结算单分摊Service
- *
- * @author 科技小王子
- * @since 2023-06-17 12:47:08
- */
-public interface TowerInvoicingSettleService extends IService<TowerInvoicingSettle> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerInvoicingSettle>
-     */
-    PageResult<TowerInvoicingSettle> pageRel(TowerInvoicingSettleParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerInvoicingSettle>
-     */
-    List<TowerInvoicingSettle> listRel(TowerInvoicingSettleParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param invoicingSettleId 
-     * @return TowerInvoicingSettle
-     */
-    TowerInvoicingSettle getByIdRel(Integer invoicingSettleId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerLendingService.java b/src/main/java/com/gxwebsoft/tower/service/TowerLendingService.java
deleted file mode 100644
index f5ab783..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerLendingService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerLending;
-import com.gxwebsoft.tower.param.TowerLendingParam;
-
-import java.util.List;
-
-/**
- * 拆借管理Service
- *
- * @author 科技小王子
- * @since 2023-06-15 10:29:54
- */
-public interface TowerLendingService extends IService<TowerLending> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerLending>
-     */
-    PageResult<TowerLending> pageRel(TowerLendingParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerLending>
-     */
-    List<TowerLending> listRel(TowerLendingParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param lendingId 
-     * @return TowerLending
-     */
-    TowerLending getByIdRel(Integer lendingId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerLendingSettleListService.java b/src/main/java/com/gxwebsoft/tower/service/TowerLendingSettleListService.java
deleted file mode 100644
index 8876f0e..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerLendingSettleListService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerLendingSettleList;
-import com.gxwebsoft.tower.param.TowerLendingSettleListParam;
-
-import java.util.List;
-
-/**
- * 拆借结算清单Service
- *
- * @author 科技小王子
- * @since 2023-06-15 10:29:54
- */
-public interface TowerLendingSettleListService extends IService<TowerLendingSettleList> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerLendingSettleList>
-     */
-    PageResult<TowerLendingSettleList> pageRel(TowerLendingSettleListParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerLendingSettleList>
-     */
-    List<TowerLendingSettleList> listRel(TowerLendingSettleListParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param lendingSettleListId 
-     * @return TowerLendingSettleList
-     */
-    TowerLendingSettleList getByIdRel(Integer lendingSettleListId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerModelService.java b/src/main/java/com/gxwebsoft/tower/service/TowerModelService.java
deleted file mode 100644
index 8811eb7..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerModelService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<TowerModel> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerModel>
-     */
-    PageResult<TowerModel> pageRel(TowerModelParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerModel>
-     */
-    List<TowerModel> listRel(TowerModelParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param categoryId 型号ID
-     * @return TowerModel
-     */
-    TowerModel getByIdRel(Integer categoryId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerPartGoodsService.java b/src/main/java/com/gxwebsoft/tower/service/TowerPartGoodsService.java
deleted file mode 100644
index d1c7690..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerPartGoodsService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerPartGoods;
-import com.gxwebsoft.tower.param.TowerPartGoodsParam;
-
-import java.util.List;
-
-/**
- * 安全检查Service
- *
- * @author 科技小王子
- * @since 2024-02-27 19:41:23
- */
-public interface TowerPartGoodsService extends IService<TowerPartGoods> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerPartGoods>
-     */
-    PageResult<TowerPartGoods> pageRel(TowerPartGoodsParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerPartGoods>
-     */
-    List<TowerPartGoods> listRel(TowerPartGoodsParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param goodsId 自增ID
-     * @return TowerPartGoods
-     */
-    TowerPartGoods getByIdRel(Integer goodsId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerPartService.java b/src/main/java/com/gxwebsoft/tower/service/TowerPartService.java
deleted file mode 100644
index eea32d8..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerPartService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerPart;
-import com.gxwebsoft.tower.param.TowerPartParam;
-
-import java.util.List;
-
-/**
- * 安全检查Service
- *
- * @author 科技小王子
- * @since 2024-02-27 18:40:31
- */
-public interface TowerPartService extends IService<TowerPart> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerPart>
-     */
-    PageResult<TowerPart> pageRel(TowerPartParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerPart>
-     */
-    List<TowerPart> listRel(TowerPartParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param partId 自增ID
-     * @return TowerPart
-     */
-    TowerPart getByIdRel(Integer partId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerPartStockService.java b/src/main/java/com/gxwebsoft/tower/service/TowerPartStockService.java
deleted file mode 100644
index 65f5041..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerPartStockService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerPartStock;
-import com.gxwebsoft.tower.param.TowerPartStockParam;
-
-import java.util.List;
-
-/**
- * 产品库存Service
- *
- * @author 科技小王子
- * @since 2024-02-27 19:41:23
- */
-public interface TowerPartStockService extends IService<TowerPartStock> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerPartStock>
-     */
-    PageResult<TowerPartStock> pageRel(TowerPartStockParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerPartStock>
-     */
-    List<TowerPartStock> listRel(TowerPartStockParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param partId 自增ID
-     * @return TowerPartStock
-     */
-    TowerPartStock getByIdRel(Integer partId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerPlaceSafetyService.java b/src/main/java/com/gxwebsoft/tower/service/TowerPlaceSafetyService.java
deleted file mode 100644
index 846b7a1..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerPlaceSafetyService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<TowerPlaceSafety> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerPlaceSafety>
-     */
-    PageResult<TowerPlaceSafety> pageRel(TowerPlaceSafetyParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerPlaceSafety>
-     */
-    List<TowerPlaceSafety> 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
deleted file mode 100644
index c047181..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerPlaceService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<TowerPlace> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerPlace>
-     */
-    PageResult<TowerPlace> pageRel(TowerPlaceParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerPlace>
-     */
-    List<TowerPlace> 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
deleted file mode 100644
index bce6671..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerPlaceStandardService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<TowerPlaceStandard> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerPlaceStandard>
-     */
-    PageResult<TowerPlaceStandard> pageRel(TowerPlaceStandardParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerPlaceStandard>
-     */
-    List<TowerPlaceStandard> listRel(TowerPlaceStandardParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id 参数ID
-     * @return TowerPlaceStandard
-     */
-    TowerPlaceStandard getByIdRel(Integer id);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerProjectBuildingService.java b/src/main/java/com/gxwebsoft/tower/service/TowerProjectBuildingService.java
deleted file mode 100644
index d840b2e..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerProjectBuildingService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerProjectBuilding;
-import com.gxwebsoft.tower.param.TowerProjectBuildingParam;
-
-import java.util.List;
-
-/**
- * 项目标地Service
- *
- * @author 科技小王子
- * @since 2024-01-05 22:01:16
- */
-public interface TowerProjectBuildingService extends IService<TowerProjectBuilding> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerProjectBuilding>
-     */
-    PageResult<TowerProjectBuilding> pageRel(TowerProjectBuildingParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerProjectBuilding>
-     */
-    List<TowerProjectBuilding> listRel(TowerProjectBuildingParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param buildingId 
-     * @return TowerProjectBuilding
-     */
-    TowerProjectBuilding getByIdRel(Integer buildingId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerProjectOrderService.java b/src/main/java/com/gxwebsoft/tower/service/TowerProjectOrderService.java
deleted file mode 100644
index db761c7..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerProjectOrderService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<TowerProjectOrder> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerProjectOrder>
-     */
-    PageResult<TowerProjectOrder> pageRel(TowerProjectOrderParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerProjectOrder>
-     */
-    List<TowerProjectOrder> 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
deleted file mode 100644
index 950ea42..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerProjectPlaceService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<TowerProjectPlace> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerProjectPlace>
-     */
-    PageResult<TowerProjectPlace> pageRel(TowerProjectPlaceParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerProjectPlace>
-     */
-    List<TowerProjectPlace> 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
deleted file mode 100644
index 84114fd..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerProjectService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<TowerProject> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerProject>
-     */
-    PageResult<TowerProject> pageRel(TowerProjectParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerProject>
-     */
-    List<TowerProject> 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
deleted file mode 100644
index 4a844d8..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerProjectUserService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<TowerProjectUser> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerProjectUser>
-     */
-    PageResult<TowerProjectUser> pageRel(TowerProjectUserParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerProjectUser>
-     */
-    List<TowerProjectUser> listRel(TowerProjectUserParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id 自增ID
-     * @return TowerProjectUser
-     */
-    TowerProjectUser getByIdRel(Integer id);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerPurchaseService.java b/src/main/java/com/gxwebsoft/tower/service/TowerPurchaseService.java
deleted file mode 100644
index 64c1f12..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerPurchaseService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerPurchase;
-import com.gxwebsoft.tower.param.TowerPurchaseParam;
-
-import java.util.List;
-
-/**
- * 采购入库表Service
- *
- * @author 科技小王子
- * @since 2024-02-05 20:53:31
- */
-public interface TowerPurchaseService extends IService<TowerPurchase> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerPurchase>
-     */
-    PageResult<TowerPurchase> pageRel(TowerPurchaseParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerPurchase>
-     */
-    List<TowerPurchase> listRel(TowerPurchaseParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param purchaseId ID
-     * @return TowerPurchase
-     */
-    TowerPurchase getByIdRel(Integer purchaseId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerRentRecordService.java b/src/main/java/com/gxwebsoft/tower/service/TowerRentRecordService.java
deleted file mode 100644
index 9ab8846..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerRentRecordService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerRentRecord;
-import com.gxwebsoft.tower.param.TowerRentRecordParam;
-
-import java.util.List;
-
-/**
- * 租单记录Service
- *
- * @author 科技小王子
- * @since 2023-06-13 00:42:42
- */
-public interface TowerRentRecordService extends IService<TowerRentRecord> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerRentRecord>
-     */
-    PageResult<TowerRentRecord> pageRel(TowerRentRecordParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerRentRecord>
-     */
-    List<TowerRentRecord> listRel(TowerRentRecordParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param rentRecordId 租单记录id
-     * @return TowerRentRecord
-     */
-    TowerRentRecord getByIdRel(Integer rentRecordId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerRentService.java b/src/main/java/com/gxwebsoft/tower/service/TowerRentService.java
deleted file mode 100644
index 1d07e21..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerRentService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerRent;
-import com.gxwebsoft.tower.param.TowerRentParam;
-
-import java.util.List;
-
-/**
- * 标准节租金Service
- *
- * @author 科技小王子
- * @since 2024-02-05 15:04:19
- */
-public interface TowerRentService extends IService<TowerRent> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerRent>
-     */
-    PageResult<TowerRent> pageRel(TowerRentParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerRent>
-     */
-    List<TowerRent> listRel(TowerRentParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param rentId 租单记录id
-     * @return TowerRent
-     */
-    TowerRent getByIdRel(Integer rentId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerSecurityPlantService.java b/src/main/java/com/gxwebsoft/tower/service/TowerSecurityPlantService.java
deleted file mode 100644
index c625b05..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerSecurityPlantService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerSecurityPlant;
-import com.gxwebsoft.tower.param.TowerSecurityPlantParam;
-
-import java.util.List;
-
-/**
- * 保养记录Service
- *
- * @author 科技小王子
- * @since 2024-02-25 19:03:48
- */
-public interface TowerSecurityPlantService extends IService<TowerSecurityPlant> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerSecurityPlant>
-     */
-    PageResult<TowerSecurityPlant> pageRel(TowerSecurityPlantParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerSecurityPlant>
-     */
-    List<TowerSecurityPlant> listRel(TowerSecurityPlantParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param securityRecordId 自增ID
-     * @return TowerSecurityPlant
-     */
-    TowerSecurityPlant getByIdRel(Integer securityRecordId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerSecurityRecordService.java b/src/main/java/com/gxwebsoft/tower/service/TowerSecurityRecordService.java
deleted file mode 100644
index ca0c78e..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerSecurityRecordService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerSecurityRecord;
-import com.gxwebsoft.tower.param.TowerSecurityRecordParam;
-
-import java.util.List;
-
-/**
- * 保养记录Service
- *
- * @author 科技小王子
- * @since 2024-02-27 15:00:15
- */
-public interface TowerSecurityRecordService extends IService<TowerSecurityRecord> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerSecurityRecord>
-     */
-    PageResult<TowerSecurityRecord> pageRel(TowerSecurityRecordParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerSecurityRecord>
-     */
-    List<TowerSecurityRecord> listRel(TowerSecurityRecordParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param securityRecordId 自增ID
-     * @return TowerSecurityRecord
-     */
-    TowerSecurityRecord getByIdRel(Integer securityRecordId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerSecurityService.java b/src/main/java/com/gxwebsoft/tower/service/TowerSecurityService.java
deleted file mode 100644
index 051486c..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerSecurityService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerSecurity;
-import com.gxwebsoft.tower.param.TowerSecurityParam;
-
-import java.util.List;
-
-/**
- * 安全检查Service
- *
- * @author 科技小王子
- * @since 2024-02-22 13:44:23
- */
-public interface TowerSecurityService extends IService<TowerSecurity> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerSecurity>
-     */
-    PageResult<TowerSecurity> pageRel(TowerSecurityParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerSecurity>
-     */
-    List<TowerSecurity> listRel(TowerSecurityParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param securityId 自增ID
-     * @return TowerSecurity
-     */
-    TowerSecurity getByIdRel(Integer securityId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerSettleDetailService.java b/src/main/java/com/gxwebsoft/tower/service/TowerSettleDetailService.java
deleted file mode 100644
index 753237e..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerSettleDetailService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerSettleDetail;
-import com.gxwebsoft.tower.param.TowerSettleDetailParam;
-
-import java.util.List;
-
-/**
- * 合同结算详情Service
- *
- * @author 科技小王子
- * @since 2023-06-11 19:13:12
- */
-public interface TowerSettleDetailService extends IService<TowerSettleDetail> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerSettleDetail>
-     */
-    PageResult<TowerSettleDetail> pageRel(TowerSettleDetailParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerSettleDetail>
-     */
-    List<TowerSettleDetail> listRel(TowerSettleDetailParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param settleDetailId 
-     * @return TowerSettleDetail
-     */
-    TowerSettleDetail getByIdRel(Integer settleDetailId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerSettleService.java b/src/main/java/com/gxwebsoft/tower/service/TowerSettleService.java
deleted file mode 100644
index b49d4ea..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerSettleService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerSettle;
-import com.gxwebsoft.tower.param.TowerSettleParam;
-
-import java.util.List;
-
-/**
- * 结算管理Service
- *
- * @author 科技小王子
- * @since 2023-06-11 19:19:10
- */
-public interface TowerSettleService extends IService<TowerSettle> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerSettle>
-     */
-    PageResult<TowerSettle> pageRel(TowerSettleParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerSettle>
-     */
-    List<TowerSettle> listRel(TowerSettleParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param settleId 
-     * @return TowerSettle
-     */
-    TowerSettle getByIdRel(Integer settleId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerWarehouseService.java b/src/main/java/com/gxwebsoft/tower/service/TowerWarehouseService.java
deleted file mode 100644
index c9095c4..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerWarehouseService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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<TowerWarehouse> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerWarehouse>
-     */
-    PageResult<TowerWarehouse> pageRel(TowerWarehouseParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerWarehouse>
-     */
-    List<TowerWarehouse> listRel(TowerWarehouseParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param warehouseId 自增ID
-     * @return TowerWarehouse
-     */
-    TowerWarehouse getByIdRel(Integer warehouseId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerWorksheetAuditService.java b/src/main/java/com/gxwebsoft/tower/service/TowerWorksheetAuditService.java
deleted file mode 100644
index 838fa98..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerWorksheetAuditService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerWorksheetAudit;
-import com.gxwebsoft.tower.param.TowerWorksheetAuditParam;
-
-import java.util.List;
-
-/**
- * 派单审核Service
- *
- * @author 科技小王子
- * @since 2023-08-21 00:46:43
- */
-public interface TowerWorksheetAuditService extends IService<TowerWorksheetAudit> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerWorksheetAudit>
-     */
-    PageResult<TowerWorksheetAudit> pageRel(TowerWorksheetAuditParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerWorksheetAudit>
-     */
-    List<TowerWorksheetAudit> listRel(TowerWorksheetAuditParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param worksheetAuditId 
-     * @return TowerWorksheetAudit
-     */
-    TowerWorksheetAudit getByIdRel(Integer worksheetAuditId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerWorksheetCarDispatchService.java b/src/main/java/com/gxwebsoft/tower/service/TowerWorksheetCarDispatchService.java
deleted file mode 100644
index 153e1ac..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerWorksheetCarDispatchService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerWorksheetCarDispatch;
-import com.gxwebsoft.tower.param.TowerWorksheetCarDispatchParam;
-
-import java.util.List;
-
-/**
- * 车辆调度Service
- *
- * @author 科技小王子
- * @since 2023-10-31 12:05:49
- */
-public interface TowerWorksheetCarDispatchService extends IService<TowerWorksheetCarDispatch> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerWorksheetCarDispatch>
-     */
-    PageResult<TowerWorksheetCarDispatch> pageRel(TowerWorksheetCarDispatchParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerWorksheetCarDispatch>
-     */
-    List<TowerWorksheetCarDispatch> listRel(TowerWorksheetCarDispatchParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param carDispatchId 
-     * @return TowerWorksheetCarDispatch
-     */
-    TowerWorksheetCarDispatch getByIdRel(Integer carDispatchId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerWorksheetCheckService.java b/src/main/java/com/gxwebsoft/tower/service/TowerWorksheetCheckService.java
deleted file mode 100644
index 3e9e1c9..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerWorksheetCheckService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerWorksheetCheck;
-import com.gxwebsoft.tower.param.TowerWorksheetCheckParam;
-
-import java.util.List;
-
-/**
- * 派单现场核验Service
- *
- * @author 科技小王子
- * @since 2023-07-04 01:24:45
- */
-public interface TowerWorksheetCheckService extends IService<TowerWorksheetCheck> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerWorksheetCheck>
-     */
-    PageResult<TowerWorksheetCheck> pageRel(TowerWorksheetCheckParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerWorksheetCheck>
-     */
-    List<TowerWorksheetCheck> listRel(TowerWorksheetCheckParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param checkId 
-     * @return TowerWorksheetCheck
-     */
-    TowerWorksheetCheck getByIdRel(Integer checkId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerWorksheetDetailService.java b/src/main/java/com/gxwebsoft/tower/service/TowerWorksheetDetailService.java
deleted file mode 100644
index 035b52c..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerWorksheetDetailService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerWorksheetDetail;
-import com.gxwebsoft.tower.param.TowerWorksheetDetailParam;
-
-import java.util.List;
-
-/**
- * 派单详情Service
- *
- * @author 科技小王子
- * @since 2023-07-03 10:56:04
- */
-public interface TowerWorksheetDetailService extends IService<TowerWorksheetDetail> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerWorksheetDetail>
-     */
-    PageResult<TowerWorksheetDetail> pageRel(TowerWorksheetDetailParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerWorksheetDetail>
-     */
-    List<TowerWorksheetDetail> listRel(TowerWorksheetDetailParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param detailId 
-     * @return TowerWorksheetDetail
-     */
-    TowerWorksheetDetail getByIdRel(Integer detailId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerWorksheetPartsService.java b/src/main/java/com/gxwebsoft/tower/service/TowerWorksheetPartsService.java
deleted file mode 100644
index af2c751..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerWorksheetPartsService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerWorksheetParts;
-import com.gxwebsoft.tower.param.TowerWorksheetPartsParam;
-
-import java.util.List;
-
-/**
- * 派单配件Service
- *
- * @author 科技小王子
- * @since 2023-07-03 10:18:57
- */
-public interface TowerWorksheetPartsService extends IService<TowerWorksheetParts> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerWorksheetParts>
-     */
-    PageResult<TowerWorksheetParts> pageRel(TowerWorksheetPartsParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerWorksheetParts>
-     */
-    List<TowerWorksheetParts> listRel(TowerWorksheetPartsParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param partsId 
-     * @return TowerWorksheetParts
-     */
-    TowerWorksheetParts getByIdRel(Integer partsId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerWorksheetService.java b/src/main/java/com/gxwebsoft/tower/service/TowerWorksheetService.java
deleted file mode 100644
index d55850e..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerWorksheetService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerWorksheet;
-import com.gxwebsoft.tower.param.TowerWorksheetParam;
-
-import java.util.List;
-
-/**
- * 派单管理Service
- *
- * @author 科技小王子
- * @since 2023-07-02 16:15:31
- */
-public interface TowerWorksheetService extends IService<TowerWorksheet> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerWorksheet>
-     */
-    PageResult<TowerWorksheet> pageRel(TowerWorksheetParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerWorksheet>
-     */
-    List<TowerWorksheet> listRel(TowerWorksheetParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param worksheetId 
-     * @return TowerWorksheet
-     */
-    TowerWorksheet getByIdRel(Integer worksheetId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerWorksheetSetUpService.java b/src/main/java/com/gxwebsoft/tower/service/TowerWorksheetSetUpService.java
deleted file mode 100644
index 0a356a2..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerWorksheetSetUpService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerWorksheetSetUp;
-import com.gxwebsoft.tower.param.TowerWorksheetSetUpParam;
-
-import java.util.List;
-
-/**
- * 派单安装信息Service
- *
- * @author 科技小王子
- * @since 2023-07-03 10:18:57
- */
-public interface TowerWorksheetSetUpService extends IService<TowerWorksheetSetUp> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerWorksheetSetUp>
-     */
-    PageResult<TowerWorksheetSetUp> pageRel(TowerWorksheetSetUpParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerWorksheetSetUp>
-     */
-    List<TowerWorksheetSetUp> listRel(TowerWorksheetSetUpParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param setUpId 
-     * @return TowerWorksheetSetUp
-     */
-    TowerWorksheetSetUp getByIdRel(Integer setUpId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerAccessoryServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerAccessoryServiceImpl.java
deleted file mode 100644
index a48aa07..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerAccessoryServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<TowerAccessoryMapper, TowerAccessory> implements TowerAccessoryService {
-
-    @Override
-    public PageResult<TowerAccessory> pageRel(TowerAccessoryParam param) {
-        PageParam<TowerAccessory, TowerAccessoryParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerAccessory> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerAccessory> listRel(TowerAccessoryParam param) {
-        List<TowerAccessory> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerAccessory, TowerAccessoryParam> 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/TowerContractEquipmentServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractEquipmentServiceImpl.java
deleted file mode 100644
index ce73fdd..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractEquipmentServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerContractEquipmentMapper;
-import com.gxwebsoft.tower.service.TowerContractEquipmentService;
-import com.gxwebsoft.tower.entity.TowerContractEquipment;
-import com.gxwebsoft.tower.param.TowerContractEquipmentParam;
-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-09 13:42:20
- */
-@Service
-public class TowerContractEquipmentServiceImpl extends ServiceImpl<TowerContractEquipmentMapper, TowerContractEquipment> implements TowerContractEquipmentService {
-
-    @Override
-    public PageResult<TowerContractEquipment> pageRel(TowerContractEquipmentParam param) {
-        PageParam<TowerContractEquipment, TowerContractEquipmentParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerContractEquipment> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerContractEquipment> listRel(TowerContractEquipmentParam param) {
-        List<TowerContractEquipment> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerContractEquipment, TowerContractEquipmentParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerContractEquipment getByIdRel(Integer contractEquipmentId) {
-        TowerContractEquipmentParam param = new TowerContractEquipmentParam();
-        param.setContractEquipmentId(contractEquipmentId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractFileServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractFileServiceImpl.java
deleted file mode 100644
index 19652b1..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractFileServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerContractFileMapper;
-import com.gxwebsoft.tower.service.TowerContractFileService;
-import com.gxwebsoft.tower.entity.TowerContractFile;
-import com.gxwebsoft.tower.param.TowerContractFileParam;
-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-09 13:42:20
- */
-@Service
-public class TowerContractFileServiceImpl extends ServiceImpl<TowerContractFileMapper, TowerContractFile> implements TowerContractFileService {
-
-    @Override
-    public PageResult<TowerContractFile> pageRel(TowerContractFileParam param) {
-        PageParam<TowerContractFile, TowerContractFileParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerContractFile> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerContractFile> listRel(TowerContractFileParam param) {
-        List<TowerContractFile> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerContractFile, TowerContractFileParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerContractFile getByIdRel(Integer contractFileId) {
-        TowerContractFileParam param = new TowerContractFileParam();
-        param.setContractFileId(contractFileId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractFinalSettleLostServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractFinalSettleLostServiceImpl.java
deleted file mode 100644
index 7527012..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractFinalSettleLostServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerContractFinalSettleLostMapper;
-import com.gxwebsoft.tower.service.TowerContractFinalSettleLostService;
-import com.gxwebsoft.tower.entity.TowerContractFinalSettleLost;
-import com.gxwebsoft.tower.param.TowerContractFinalSettleLostParam;
-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-18 00:52:41
- */
-@Service
-public class TowerContractFinalSettleLostServiceImpl extends ServiceImpl<TowerContractFinalSettleLostMapper, TowerContractFinalSettleLost> implements TowerContractFinalSettleLostService {
-
-    @Override
-    public PageResult<TowerContractFinalSettleLost> pageRel(TowerContractFinalSettleLostParam param) {
-        PageParam<TowerContractFinalSettleLost, TowerContractFinalSettleLostParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerContractFinalSettleLost> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerContractFinalSettleLost> listRel(TowerContractFinalSettleLostParam param) {
-        List<TowerContractFinalSettleLost> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerContractFinalSettleLost, TowerContractFinalSettleLostParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerContractFinalSettleLost getByIdRel(Integer finalSettleLostId) {
-        TowerContractFinalSettleLostParam param = new TowerContractFinalSettleLostParam();
-        param.setFinalSettleLostId(finalSettleLostId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractFinalSettleServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractFinalSettleServiceImpl.java
deleted file mode 100644
index 984aa1f..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractFinalSettleServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerContractFinalSettleMapper;
-import com.gxwebsoft.tower.service.TowerContractFinalSettleService;
-import com.gxwebsoft.tower.entity.TowerContractFinalSettle;
-import com.gxwebsoft.tower.param.TowerContractFinalSettleParam;
-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-17 22:34:32
- */
-@Service
-public class TowerContractFinalSettleServiceImpl extends ServiceImpl<TowerContractFinalSettleMapper, TowerContractFinalSettle> implements TowerContractFinalSettleService {
-
-    @Override
-    public PageResult<TowerContractFinalSettle> pageRel(TowerContractFinalSettleParam param) {
-        PageParam<TowerContractFinalSettle, TowerContractFinalSettleParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerContractFinalSettle> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerContractFinalSettle> listRel(TowerContractFinalSettleParam param) {
-        List<TowerContractFinalSettle> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerContractFinalSettle, TowerContractFinalSettleParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerContractFinalSettle getByIdRel(Integer contractFinalSettleId) {
-        TowerContractFinalSettleParam param = new TowerContractFinalSettleParam();
-        param.setContractFinalSettleId(contractFinalSettleId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractServiceImpl.java
deleted file mode 100644
index 7792908..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerContractMapper;
-import com.gxwebsoft.tower.service.TowerContractService;
-import com.gxwebsoft.tower.entity.TowerContract;
-import com.gxwebsoft.tower.param.TowerContractParam;
-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 22:36:47
- */
-@Service
-public class TowerContractServiceImpl extends ServiceImpl<TowerContractMapper, TowerContract> implements TowerContractService {
-
-    @Override
-    public PageResult<TowerContract> pageRel(TowerContractParam param) {
-        PageParam<TowerContract, TowerContractParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerContract> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerContract> listRel(TowerContractParam param) {
-        List<TowerContract> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerContract, TowerContractParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerContract getByIdRel(Integer contractId) {
-        TowerContractParam param = new TowerContractParam();
-        param.setContractId(contractId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractSettleEquipmentServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractSettleEquipmentServiceImpl.java
deleted file mode 100644
index a5c4522..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractSettleEquipmentServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerContractSettleEquipmentMapper;
-import com.gxwebsoft.tower.service.TowerContractSettleEquipmentService;
-import com.gxwebsoft.tower.entity.TowerContractSettleEquipment;
-import com.gxwebsoft.tower.param.TowerContractSettleEquipmentParam;
-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-10 16:52:12
- */
-@Service
-public class TowerContractSettleEquipmentServiceImpl extends ServiceImpl<TowerContractSettleEquipmentMapper, TowerContractSettleEquipment> implements TowerContractSettleEquipmentService {
-
-    @Override
-    public PageResult<TowerContractSettleEquipment> pageRel(TowerContractSettleEquipmentParam param) {
-        PageParam<TowerContractSettleEquipment, TowerContractSettleEquipmentParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerContractSettleEquipment> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerContractSettleEquipment> listRel(TowerContractSettleEquipmentParam param) {
-        List<TowerContractSettleEquipment> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerContractSettleEquipment, TowerContractSettleEquipmentParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerContractSettleEquipment getByIdRel(Integer contractSettleId) {
-        TowerContractSettleEquipmentParam param = new TowerContractSettleEquipmentParam();
-        param.setContractSettleId(contractSettleId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractSettleRuleServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractSettleRuleServiceImpl.java
deleted file mode 100644
index 4691635..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerContractSettleRuleServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerContractSettleRuleMapper;
-import com.gxwebsoft.tower.service.TowerContractSettleRuleService;
-import com.gxwebsoft.tower.entity.TowerContractSettleRule;
-import com.gxwebsoft.tower.param.TowerContractSettleRuleParam;
-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-11 13:48:41
- */
-@Service
-public class TowerContractSettleRuleServiceImpl extends ServiceImpl<TowerContractSettleRuleMapper, TowerContractSettleRule> implements TowerContractSettleRuleService {
-
-    @Override
-    public PageResult<TowerContractSettleRule> pageRel(TowerContractSettleRuleParam param) {
-        PageParam<TowerContractSettleRule, TowerContractSettleRuleParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerContractSettleRule> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerContractSettleRule> listRel(TowerContractSettleRuleParam param) {
-        List<TowerContractSettleRule> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerContractSettleRule, TowerContractSettleRuleParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerContractSettleRule getByIdRel(Integer contractSettleRuleId) {
-        TowerContractSettleRuleParam param = new TowerContractSettleRuleParam();
-        param.setContractSettleRuleId(contractSettleRuleId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerCustomerServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerCustomerServiceImpl.java
deleted file mode 100644
index c038ff5..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerCustomerServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerCustomerMapper;
-import com.gxwebsoft.tower.service.TowerCustomerService;
-import com.gxwebsoft.tower.entity.TowerCustomer;
-import com.gxwebsoft.tower.param.TowerCustomerParam;
-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 21:04:27
- */
-@Service
-public class TowerCustomerServiceImpl extends ServiceImpl<TowerCustomerMapper, TowerCustomer> implements TowerCustomerService {
-
-    @Override
-    public PageResult<TowerCustomer> pageRel(TowerCustomerParam param) {
-        PageParam<TowerCustomer, TowerCustomerParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerCustomer> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerCustomer> listRel(TowerCustomerParam param) {
-        List<TowerCustomer> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerCustomer, TowerCustomerParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerCustomer getByIdRel(Integer customerId) {
-        TowerCustomerParam param = new TowerCustomerParam();
-        param.setCustomerId(customerId);
-        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
deleted file mode 100644
index 6555537..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerEquipmentServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<TowerEquipmentMapper, TowerEquipment> implements TowerEquipmentService {
-
-    @Override
-    public PageResult<TowerEquipment> pageRel(TowerEquipmentParam param) {
-        PageParam<TowerEquipment, TowerEquipmentParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerEquipment> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerEquipment> listRel(TowerEquipmentParam param) {
-        List<TowerEquipment> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerEquipment, TowerEquipmentParam> 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/TowerFallServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerFallServiceImpl.java
deleted file mode 100644
index 541ea9f..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerFallServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerFallMapper;
-import com.gxwebsoft.tower.service.TowerFallService;
-import com.gxwebsoft.tower.entity.TowerFall;
-import com.gxwebsoft.tower.param.TowerFallParam;
-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-05 22:40:55
- */
-@Service
-public class TowerFallServiceImpl extends ServiceImpl<TowerFallMapper, TowerFall> implements TowerFallService {
-
-    @Override
-    public PageResult<TowerFall> pageRel(TowerFallParam param) {
-        PageParam<TowerFall, TowerFallParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerFall> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerFall> listRel(TowerFallParam param) {
-        List<TowerFall> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerFall, TowerFallParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerFall getByIdRel(Integer id) {
-        TowerFallParam param = new TowerFallParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerHistorySettleServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerHistorySettleServiceImpl.java
deleted file mode 100644
index 4dbcd1d..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerHistorySettleServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerHistorySettleMapper;
-import com.gxwebsoft.tower.service.TowerHistorySettleService;
-import com.gxwebsoft.tower.entity.TowerHistorySettle;
-import com.gxwebsoft.tower.param.TowerHistorySettleParam;
-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-12 16:40:25
- */
-@Service
-public class TowerHistorySettleServiceImpl extends ServiceImpl<TowerHistorySettleMapper, TowerHistorySettle> implements TowerHistorySettleService {
-
-    @Override
-    public PageResult<TowerHistorySettle> pageRel(TowerHistorySettleParam param) {
-        PageParam<TowerHistorySettle, TowerHistorySettleParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerHistorySettle> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerHistorySettle> listRel(TowerHistorySettleParam param) {
-        List<TowerHistorySettle> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerHistorySettle, TowerHistorySettleParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerHistorySettle getByIdRel(Integer historySettleId) {
-        TowerHistorySettleParam param = new TowerHistorySettleParam();
-        param.setHistorySettleId(historySettleId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerIncomeEquipmentServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerIncomeEquipmentServiceImpl.java
deleted file mode 100644
index aa06108..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerIncomeEquipmentServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerIncomeEquipmentMapper;
-import com.gxwebsoft.tower.service.TowerIncomeEquipmentService;
-import com.gxwebsoft.tower.entity.TowerIncomeEquipment;
-import com.gxwebsoft.tower.param.TowerIncomeEquipmentParam;
-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-17 17:06:39
- */
-@Service
-public class TowerIncomeEquipmentServiceImpl extends ServiceImpl<TowerIncomeEquipmentMapper, TowerIncomeEquipment> implements TowerIncomeEquipmentService {
-
-    @Override
-    public PageResult<TowerIncomeEquipment> pageRel(TowerIncomeEquipmentParam param) {
-        PageParam<TowerIncomeEquipment, TowerIncomeEquipmentParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerIncomeEquipment> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerIncomeEquipment> listRel(TowerIncomeEquipmentParam param) {
-        List<TowerIncomeEquipment> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerIncomeEquipment, TowerIncomeEquipmentParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerIncomeEquipment getByIdRel(Integer incomeEquipmentId) {
-        TowerIncomeEquipmentParam param = new TowerIncomeEquipmentParam();
-        param.setIncomeEquipmentId(incomeEquipmentId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerIncomeServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerIncomeServiceImpl.java
deleted file mode 100644
index f65f24b..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerIncomeServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerIncomeMapper;
-import com.gxwebsoft.tower.service.TowerIncomeService;
-import com.gxwebsoft.tower.entity.TowerIncome;
-import com.gxwebsoft.tower.param.TowerIncomeParam;
-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-17 17:06:39
- */
-@Service
-public class TowerIncomeServiceImpl extends ServiceImpl<TowerIncomeMapper, TowerIncome> implements TowerIncomeService {
-
-    @Override
-    public PageResult<TowerIncome> pageRel(TowerIncomeParam param) {
-        PageParam<TowerIncome, TowerIncomeParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerIncome> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerIncome> listRel(TowerIncomeParam param) {
-        List<TowerIncome> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerIncome, TowerIncomeParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerIncome getByIdRel(Integer incomeId) {
-        TowerIncomeParam param = new TowerIncomeParam();
-        param.setIncomeId(incomeId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerInvoicingServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerInvoicingServiceImpl.java
deleted file mode 100644
index 8520edb..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerInvoicingServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerInvoicingMapper;
-import com.gxwebsoft.tower.service.TowerInvoicingService;
-import com.gxwebsoft.tower.entity.TowerInvoicing;
-import com.gxwebsoft.tower.param.TowerInvoicingParam;
-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-17 12:47:08
- */
-@Service
-public class TowerInvoicingServiceImpl extends ServiceImpl<TowerInvoicingMapper, TowerInvoicing> implements TowerInvoicingService {
-
-    @Override
-    public PageResult<TowerInvoicing> pageRel(TowerInvoicingParam param) {
-        PageParam<TowerInvoicing, TowerInvoicingParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerInvoicing> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerInvoicing> listRel(TowerInvoicingParam param) {
-        List<TowerInvoicing> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerInvoicing, TowerInvoicingParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerInvoicing getByIdRel(Integer invoicingId) {
-        TowerInvoicingParam param = new TowerInvoicingParam();
-        param.setInvoicingId(invoicingId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerInvoicingSettleServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerInvoicingSettleServiceImpl.java
deleted file mode 100644
index 9e64f57..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerInvoicingSettleServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerInvoicingSettleMapper;
-import com.gxwebsoft.tower.service.TowerInvoicingSettleService;
-import com.gxwebsoft.tower.entity.TowerInvoicingSettle;
-import com.gxwebsoft.tower.param.TowerInvoicingSettleParam;
-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-17 12:47:08
- */
-@Service
-public class TowerInvoicingSettleServiceImpl extends ServiceImpl<TowerInvoicingSettleMapper, TowerInvoicingSettle> implements TowerInvoicingSettleService {
-
-    @Override
-    public PageResult<TowerInvoicingSettle> pageRel(TowerInvoicingSettleParam param) {
-        PageParam<TowerInvoicingSettle, TowerInvoicingSettleParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerInvoicingSettle> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerInvoicingSettle> listRel(TowerInvoicingSettleParam param) {
-        List<TowerInvoicingSettle> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerInvoicingSettle, TowerInvoicingSettleParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerInvoicingSettle getByIdRel(Integer invoicingSettleId) {
-        TowerInvoicingSettleParam param = new TowerInvoicingSettleParam();
-        param.setInvoicingSettleId(invoicingSettleId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerLendingServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerLendingServiceImpl.java
deleted file mode 100644
index 445f795..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerLendingServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerLendingMapper;
-import com.gxwebsoft.tower.service.TowerLendingService;
-import com.gxwebsoft.tower.entity.TowerLending;
-import com.gxwebsoft.tower.param.TowerLendingParam;
-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-15 10:29:54
- */
-@Service
-public class TowerLendingServiceImpl extends ServiceImpl<TowerLendingMapper, TowerLending> implements TowerLendingService {
-
-    @Override
-    public PageResult<TowerLending> pageRel(TowerLendingParam param) {
-        PageParam<TowerLending, TowerLendingParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerLending> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerLending> listRel(TowerLendingParam param) {
-        List<TowerLending> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerLending, TowerLendingParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerLending getByIdRel(Integer lendingId) {
-        TowerLendingParam param = new TowerLendingParam();
-        param.setLendingId(lendingId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerLendingSettleListServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerLendingSettleListServiceImpl.java
deleted file mode 100644
index 59a1d0d..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerLendingSettleListServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerLendingSettleListMapper;
-import com.gxwebsoft.tower.service.TowerLendingSettleListService;
-import com.gxwebsoft.tower.entity.TowerLendingSettleList;
-import com.gxwebsoft.tower.param.TowerLendingSettleListParam;
-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-15 10:29:54
- */
-@Service
-public class TowerLendingSettleListServiceImpl extends ServiceImpl<TowerLendingSettleListMapper, TowerLendingSettleList> implements TowerLendingSettleListService {
-
-    @Override
-    public PageResult<TowerLendingSettleList> pageRel(TowerLendingSettleListParam param) {
-        PageParam<TowerLendingSettleList, TowerLendingSettleListParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerLendingSettleList> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerLendingSettleList> listRel(TowerLendingSettleListParam param) {
-        List<TowerLendingSettleList> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerLendingSettleList, TowerLendingSettleListParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerLendingSettleList getByIdRel(Integer lendingSettleListId) {
-        TowerLendingSettleListParam param = new TowerLendingSettleListParam();
-        param.setLendingSettleListId(lendingSettleListId);
-        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
deleted file mode 100644
index 3bd109f..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerModelServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<TowerModelMapper, TowerModel> implements TowerModelService {
-
-    @Override
-    public PageResult<TowerModel> pageRel(TowerModelParam param) {
-        PageParam<TowerModel, TowerModelParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerModel> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerModel> listRel(TowerModelParam param) {
-        List<TowerModel> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerModel, TowerModelParam> 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/TowerPartGoodsServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerPartGoodsServiceImpl.java
deleted file mode 100644
index aff9f7d..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPartGoodsServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerPartGoodsMapper;
-import com.gxwebsoft.tower.service.TowerPartGoodsService;
-import com.gxwebsoft.tower.entity.TowerPartGoods;
-import com.gxwebsoft.tower.param.TowerPartGoodsParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 安全检查Service实现
- *
- * @author 科技小王子
- * @since 2024-02-27 19:41:23
- */
-@Service
-public class TowerPartGoodsServiceImpl extends ServiceImpl<TowerPartGoodsMapper, TowerPartGoods> implements TowerPartGoodsService {
-
-    @Override
-    public PageResult<TowerPartGoods> pageRel(TowerPartGoodsParam param) {
-        PageParam<TowerPartGoods, TowerPartGoodsParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerPartGoods> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerPartGoods> listRel(TowerPartGoodsParam param) {
-        List<TowerPartGoods> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerPartGoods, TowerPartGoodsParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerPartGoods getByIdRel(Integer goodsId) {
-        TowerPartGoodsParam param = new TowerPartGoodsParam();
-        param.setGoodsId(goodsId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPartServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerPartServiceImpl.java
deleted file mode 100644
index 64dcdab..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPartServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerPartMapper;
-import com.gxwebsoft.tower.service.TowerPartService;
-import com.gxwebsoft.tower.entity.TowerPart;
-import com.gxwebsoft.tower.param.TowerPartParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 安全检查Service实现
- *
- * @author 科技小王子
- * @since 2024-02-27 18:40:31
- */
-@Service
-public class TowerPartServiceImpl extends ServiceImpl<TowerPartMapper, TowerPart> implements TowerPartService {
-
-    @Override
-    public PageResult<TowerPart> pageRel(TowerPartParam param) {
-        PageParam<TowerPart, TowerPartParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerPart> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerPart> listRel(TowerPartParam param) {
-        List<TowerPart> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerPart, TowerPartParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerPart getByIdRel(Integer partId) {
-        TowerPartParam param = new TowerPartParam();
-        param.setPartId(partId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPartStockServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerPartStockServiceImpl.java
deleted file mode 100644
index abb67a4..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPartStockServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerPartStockMapper;
-import com.gxwebsoft.tower.service.TowerPartStockService;
-import com.gxwebsoft.tower.entity.TowerPartStock;
-import com.gxwebsoft.tower.param.TowerPartStockParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 产品库存Service实现
- *
- * @author 科技小王子
- * @since 2024-02-27 19:41:23
- */
-@Service
-public class TowerPartStockServiceImpl extends ServiceImpl<TowerPartStockMapper, TowerPartStock> implements TowerPartStockService {
-
-    @Override
-    public PageResult<TowerPartStock> pageRel(TowerPartStockParam param) {
-        PageParam<TowerPartStock, TowerPartStockParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerPartStock> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerPartStock> listRel(TowerPartStockParam param) {
-        List<TowerPartStock> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerPartStock, TowerPartStockParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerPartStock getByIdRel(Integer partId) {
-        TowerPartStockParam param = new TowerPartStockParam();
-        param.setPartId(partId);
-        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
deleted file mode 100644
index 481fd4a..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceSafetyServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<TowerPlaceSafetyMapper, TowerPlaceSafety> implements TowerPlaceSafetyService {
-
-    @Override
-    public PageResult<TowerPlaceSafety> pageRel(TowerPlaceSafetyParam param) {
-        PageParam<TowerPlaceSafety, TowerPlaceSafetyParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerPlaceSafety> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerPlaceSafety> listRel(TowerPlaceSafetyParam param) {
-        List<TowerPlaceSafety> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerPlaceSafety, TowerPlaceSafetyParam> 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
deleted file mode 100644
index 61ea96d..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<TowerPlaceMapper, TowerPlace> implements TowerPlaceService {
-
-    @Override
-    public PageResult<TowerPlace> pageRel(TowerPlaceParam param) {
-        PageParam<TowerPlace, TowerPlaceParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerPlace> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerPlace> listRel(TowerPlaceParam param) {
-        List<TowerPlace> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerPlace, TowerPlaceParam> 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
deleted file mode 100644
index 9607273..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceStandardServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<TowerPlaceStandardMapper, TowerPlaceStandard> implements TowerPlaceStandardService {
-
-    @Override
-    public PageResult<TowerPlaceStandard> pageRel(TowerPlaceStandardParam param) {
-        PageParam<TowerPlaceStandard, TowerPlaceStandardParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerPlaceStandard> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerPlaceStandard> listRel(TowerPlaceStandardParam param) {
-        List<TowerPlaceStandard> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerPlaceStandard, TowerPlaceStandardParam> 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/TowerProjectBuildingServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectBuildingServiceImpl.java
deleted file mode 100644
index 53b7138..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectBuildingServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerProjectBuildingMapper;
-import com.gxwebsoft.tower.service.TowerProjectBuildingService;
-import com.gxwebsoft.tower.entity.TowerProjectBuilding;
-import com.gxwebsoft.tower.param.TowerProjectBuildingParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 项目标地Service实现
- *
- * @author 科技小王子
- * @since 2024-01-05 22:01:16
- */
-@Service
-public class TowerProjectBuildingServiceImpl extends ServiceImpl<TowerProjectBuildingMapper, TowerProjectBuilding> implements TowerProjectBuildingService {
-
-    @Override
-    public PageResult<TowerProjectBuilding> pageRel(TowerProjectBuildingParam param) {
-        PageParam<TowerProjectBuilding, TowerProjectBuildingParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerProjectBuilding> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerProjectBuilding> listRel(TowerProjectBuildingParam param) {
-        List<TowerProjectBuilding> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerProjectBuilding, TowerProjectBuildingParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerProjectBuilding getByIdRel(Integer buildingId) {
-        TowerProjectBuildingParam param = new TowerProjectBuildingParam();
-        param.setBuildingId(buildingId);
-        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
deleted file mode 100644
index bcc29f4..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectOrderServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<TowerProjectOrderMapper, TowerProjectOrder> implements TowerProjectOrderService {
-
-    @Override
-    public PageResult<TowerProjectOrder> pageRel(TowerProjectOrderParam param) {
-        PageParam<TowerProjectOrder, TowerProjectOrderParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerProjectOrder> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerProjectOrder> listRel(TowerProjectOrderParam param) {
-        List<TowerProjectOrder> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerProjectOrder, TowerProjectOrderParam> 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
deleted file mode 100644
index 4555a61..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectPlaceServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<TowerProjectPlaceMapper, TowerProjectPlace> implements TowerProjectPlaceService {
-
-    @Override
-    public PageResult<TowerProjectPlace> pageRel(TowerProjectPlaceParam param) {
-        PageParam<TowerProjectPlace, TowerProjectPlaceParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerProjectPlace> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerProjectPlace> listRel(TowerProjectPlaceParam param) {
-        List<TowerProjectPlace> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerProjectPlace, TowerProjectPlaceParam> 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
deleted file mode 100644
index e2d4680..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<TowerProjectMapper, TowerProject> implements TowerProjectService {
-
-    @Override
-    public PageResult<TowerProject> pageRel(TowerProjectParam param) {
-        PageParam<TowerProject, TowerProjectParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerProject> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerProject> listRel(TowerProjectParam param) {
-        List<TowerProject> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerProject, TowerProjectParam> 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
deleted file mode 100644
index 548f7ef..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectUserServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<TowerProjectUserMapper, TowerProjectUser> implements TowerProjectUserService {
-
-    @Override
-    public PageResult<TowerProjectUser> pageRel(TowerProjectUserParam param) {
-        PageParam<TowerProjectUser, TowerProjectUserParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerProjectUser> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerProjectUser> listRel(TowerProjectUserParam param) {
-        List<TowerProjectUser> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerProjectUser, TowerProjectUserParam> 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/TowerPurchaseServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerPurchaseServiceImpl.java
deleted file mode 100644
index c8acb44..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPurchaseServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerPurchaseMapper;
-import com.gxwebsoft.tower.service.TowerPurchaseService;
-import com.gxwebsoft.tower.entity.TowerPurchase;
-import com.gxwebsoft.tower.param.TowerPurchaseParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 采购入库表Service实现
- *
- * @author 科技小王子
- * @since 2024-02-05 20:53:32
- */
-@Service
-public class TowerPurchaseServiceImpl extends ServiceImpl<TowerPurchaseMapper, TowerPurchase> implements TowerPurchaseService {
-
-    @Override
-    public PageResult<TowerPurchase> pageRel(TowerPurchaseParam param) {
-        PageParam<TowerPurchase, TowerPurchaseParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerPurchase> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerPurchase> listRel(TowerPurchaseParam param) {
-        List<TowerPurchase> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerPurchase, TowerPurchaseParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerPurchase getByIdRel(Integer purchaseId) {
-        TowerPurchaseParam param = new TowerPurchaseParam();
-        param.setPurchaseId(purchaseId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerRentRecordServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerRentRecordServiceImpl.java
deleted file mode 100644
index 748ff93..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerRentRecordServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerRentRecordMapper;
-import com.gxwebsoft.tower.service.TowerRentRecordService;
-import com.gxwebsoft.tower.entity.TowerRentRecord;
-import com.gxwebsoft.tower.param.TowerRentRecordParam;
-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-13 00:42:42
- */
-@Service
-public class TowerRentRecordServiceImpl extends ServiceImpl<TowerRentRecordMapper, TowerRentRecord> implements TowerRentRecordService {
-
-    @Override
-    public PageResult<TowerRentRecord> pageRel(TowerRentRecordParam param) {
-        PageParam<TowerRentRecord, TowerRentRecordParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerRentRecord> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerRentRecord> listRel(TowerRentRecordParam param) {
-        List<TowerRentRecord> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerRentRecord, TowerRentRecordParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerRentRecord getByIdRel(Integer rentRecordId) {
-        TowerRentRecordParam param = new TowerRentRecordParam();
-        param.setRentRecordId(rentRecordId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerRentServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerRentServiceImpl.java
deleted file mode 100644
index f700b30..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerRentServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerRentMapper;
-import com.gxwebsoft.tower.service.TowerRentService;
-import com.gxwebsoft.tower.entity.TowerRent;
-import com.gxwebsoft.tower.param.TowerRentParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 标准节租金Service实现
- *
- * @author 科技小王子
- * @since 2024-02-05 15:04:19
- */
-@Service
-public class TowerRentServiceImpl extends ServiceImpl<TowerRentMapper, TowerRent> implements TowerRentService {
-
-    @Override
-    public PageResult<TowerRent> pageRel(TowerRentParam param) {
-        PageParam<TowerRent, TowerRentParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerRent> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerRent> listRel(TowerRentParam param) {
-        List<TowerRent> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerRent, TowerRentParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerRent getByIdRel(Integer rentId) {
-        TowerRentParam param = new TowerRentParam();
-        param.setRentId(rentId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityPlantServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityPlantServiceImpl.java
deleted file mode 100644
index 430bae3..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityPlantServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerSecurityPlantMapper;
-import com.gxwebsoft.tower.service.TowerSecurityPlantService;
-import com.gxwebsoft.tower.entity.TowerSecurityPlant;
-import com.gxwebsoft.tower.param.TowerSecurityPlantParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 保养记录Service实现
- *
- * @author 科技小王子
- * @since 2024-02-25 19:03:48
- */
-@Service
-public class TowerSecurityPlantServiceImpl extends ServiceImpl<TowerSecurityPlantMapper, TowerSecurityPlant> implements TowerSecurityPlantService {
-
-    @Override
-    public PageResult<TowerSecurityPlant> pageRel(TowerSecurityPlantParam param) {
-        PageParam<TowerSecurityPlant, TowerSecurityPlantParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerSecurityPlant> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerSecurityPlant> listRel(TowerSecurityPlantParam param) {
-        List<TowerSecurityPlant> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerSecurityPlant, TowerSecurityPlantParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerSecurityPlant getByIdRel(Integer securityRecordId) {
-        TowerSecurityPlantParam param = new TowerSecurityPlantParam();
-        param.setSecurityRecordId(securityRecordId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityRecordServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityRecordServiceImpl.java
deleted file mode 100644
index 46e07a2..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityRecordServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerSecurityRecordMapper;
-import com.gxwebsoft.tower.service.TowerSecurityRecordService;
-import com.gxwebsoft.tower.entity.TowerSecurityRecord;
-import com.gxwebsoft.tower.param.TowerSecurityRecordParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 保养记录Service实现
- *
- * @author 科技小王子
- * @since 2024-02-27 15:00:15
- */
-@Service
-public class TowerSecurityRecordServiceImpl extends ServiceImpl<TowerSecurityRecordMapper, TowerSecurityRecord> implements TowerSecurityRecordService {
-
-    @Override
-    public PageResult<TowerSecurityRecord> pageRel(TowerSecurityRecordParam param) {
-        PageParam<TowerSecurityRecord, TowerSecurityRecordParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerSecurityRecord> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerSecurityRecord> listRel(TowerSecurityRecordParam param) {
-        List<TowerSecurityRecord> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerSecurityRecord, TowerSecurityRecordParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerSecurityRecord getByIdRel(Integer securityRecordId) {
-        TowerSecurityRecordParam param = new TowerSecurityRecordParam();
-        param.setSecurityRecordId(securityRecordId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityServiceImpl.java
deleted file mode 100644
index cd374e7..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerSecurityMapper;
-import com.gxwebsoft.tower.service.TowerSecurityService;
-import com.gxwebsoft.tower.entity.TowerSecurity;
-import com.gxwebsoft.tower.param.TowerSecurityParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 安全检查Service实现
- *
- * @author 科技小王子
- * @since 2024-02-22 13:44:23
- */
-@Service
-public class TowerSecurityServiceImpl extends ServiceImpl<TowerSecurityMapper, TowerSecurity> implements TowerSecurityService {
-
-    @Override
-    public PageResult<TowerSecurity> pageRel(TowerSecurityParam param) {
-        PageParam<TowerSecurity, TowerSecurityParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerSecurity> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerSecurity> listRel(TowerSecurityParam param) {
-        List<TowerSecurity> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerSecurity, TowerSecurityParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerSecurity getByIdRel(Integer securityId) {
-        TowerSecurityParam param = new TowerSecurityParam();
-        param.setSecurityId(securityId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerSettleDetailServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerSettleDetailServiceImpl.java
deleted file mode 100644
index d7a4902..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerSettleDetailServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerSettleDetailMapper;
-import com.gxwebsoft.tower.service.TowerSettleDetailService;
-import com.gxwebsoft.tower.entity.TowerSettleDetail;
-import com.gxwebsoft.tower.param.TowerSettleDetailParam;
-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-11 19:13:12
- */
-@Service
-public class TowerSettleDetailServiceImpl extends ServiceImpl<TowerSettleDetailMapper, TowerSettleDetail> implements TowerSettleDetailService {
-
-    @Override
-    public PageResult<TowerSettleDetail> pageRel(TowerSettleDetailParam param) {
-        PageParam<TowerSettleDetail, TowerSettleDetailParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerSettleDetail> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerSettleDetail> listRel(TowerSettleDetailParam param) {
-        List<TowerSettleDetail> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerSettleDetail, TowerSettleDetailParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerSettleDetail getByIdRel(Integer settleDetailId) {
-        TowerSettleDetailParam param = new TowerSettleDetailParam();
-        param.setSettleDetailId(settleDetailId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerSettleServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerSettleServiceImpl.java
deleted file mode 100644
index 642a61b..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerSettleServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerSettleMapper;
-import com.gxwebsoft.tower.service.TowerSettleService;
-import com.gxwebsoft.tower.entity.TowerSettle;
-import com.gxwebsoft.tower.param.TowerSettleParam;
-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-11 19:19:10
- */
-@Service
-public class TowerSettleServiceImpl extends ServiceImpl<TowerSettleMapper, TowerSettle> implements TowerSettleService {
-
-    @Override
-    public PageResult<TowerSettle> pageRel(TowerSettleParam param) {
-        PageParam<TowerSettle, TowerSettleParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerSettle> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerSettle> listRel(TowerSettleParam param) {
-        List<TowerSettle> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerSettle, TowerSettleParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerSettle getByIdRel(Integer settleId) {
-        TowerSettleParam param = new TowerSettleParam();
-        param.setSettleId(settleId);
-        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
deleted file mode 100644
index 984ffc9..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerWarehouseServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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<TowerWarehouseMapper, TowerWarehouse> implements TowerWarehouseService {
-
-    @Override
-    public PageResult<TowerWarehouse> pageRel(TowerWarehouseParam param) {
-        PageParam<TowerWarehouse, TowerWarehouseParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerWarehouse> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerWarehouse> listRel(TowerWarehouseParam param) {
-        List<TowerWarehouse> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerWarehouse, TowerWarehouseParam> 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/gxwebsoft/tower/service/impl/TowerWorksheetAuditServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetAuditServiceImpl.java
deleted file mode 100644
index 8324191..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetAuditServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerWorksheetAuditMapper;
-import com.gxwebsoft.tower.service.TowerWorksheetAuditService;
-import com.gxwebsoft.tower.entity.TowerWorksheetAudit;
-import com.gxwebsoft.tower.param.TowerWorksheetAuditParam;
-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-21 00:46:43
- */
-@Service
-public class TowerWorksheetAuditServiceImpl extends ServiceImpl<TowerWorksheetAuditMapper, TowerWorksheetAudit> implements TowerWorksheetAuditService {
-
-    @Override
-    public PageResult<TowerWorksheetAudit> pageRel(TowerWorksheetAuditParam param) {
-        PageParam<TowerWorksheetAudit, TowerWorksheetAuditParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerWorksheetAudit> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerWorksheetAudit> listRel(TowerWorksheetAuditParam param) {
-        List<TowerWorksheetAudit> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerWorksheetAudit, TowerWorksheetAuditParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerWorksheetAudit getByIdRel(Integer worksheetAuditId) {
-        TowerWorksheetAuditParam param = new TowerWorksheetAuditParam();
-        param.setWorksheetAuditId(worksheetAuditId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetCarDispatchServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetCarDispatchServiceImpl.java
deleted file mode 100644
index 6240b91..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetCarDispatchServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerWorksheetCarDispatchMapper;
-import com.gxwebsoft.tower.service.TowerWorksheetCarDispatchService;
-import com.gxwebsoft.tower.entity.TowerWorksheetCarDispatch;
-import com.gxwebsoft.tower.param.TowerWorksheetCarDispatchParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 车辆调度Service实现
- *
- * @author 科技小王子
- * @since 2023-10-31 12:05:49
- */
-@Service
-public class TowerWorksheetCarDispatchServiceImpl extends ServiceImpl<TowerWorksheetCarDispatchMapper, TowerWorksheetCarDispatch> implements TowerWorksheetCarDispatchService {
-
-    @Override
-    public PageResult<TowerWorksheetCarDispatch> pageRel(TowerWorksheetCarDispatchParam param) {
-        PageParam<TowerWorksheetCarDispatch, TowerWorksheetCarDispatchParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerWorksheetCarDispatch> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerWorksheetCarDispatch> listRel(TowerWorksheetCarDispatchParam param) {
-        List<TowerWorksheetCarDispatch> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerWorksheetCarDispatch, TowerWorksheetCarDispatchParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerWorksheetCarDispatch getByIdRel(Integer carDispatchId) {
-        TowerWorksheetCarDispatchParam param = new TowerWorksheetCarDispatchParam();
-        param.setCarDispatchId(carDispatchId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetCheckServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetCheckServiceImpl.java
deleted file mode 100644
index 23676eb..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetCheckServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerWorksheetCheckMapper;
-import com.gxwebsoft.tower.service.TowerWorksheetCheckService;
-import com.gxwebsoft.tower.entity.TowerWorksheetCheck;
-import com.gxwebsoft.tower.param.TowerWorksheetCheckParam;
-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-04 01:24:45
- */
-@Service
-public class TowerWorksheetCheckServiceImpl extends ServiceImpl<TowerWorksheetCheckMapper, TowerWorksheetCheck> implements TowerWorksheetCheckService {
-
-    @Override
-    public PageResult<TowerWorksheetCheck> pageRel(TowerWorksheetCheckParam param) {
-        PageParam<TowerWorksheetCheck, TowerWorksheetCheckParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerWorksheetCheck> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerWorksheetCheck> listRel(TowerWorksheetCheckParam param) {
-        List<TowerWorksheetCheck> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerWorksheetCheck, TowerWorksheetCheckParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerWorksheetCheck getByIdRel(Integer checkId) {
-        TowerWorksheetCheckParam param = new TowerWorksheetCheckParam();
-        param.setCheckId(checkId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetDetailServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetDetailServiceImpl.java
deleted file mode 100644
index b078f84..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetDetailServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerWorksheetDetailMapper;
-import com.gxwebsoft.tower.service.TowerWorksheetDetailService;
-import com.gxwebsoft.tower.entity.TowerWorksheetDetail;
-import com.gxwebsoft.tower.param.TowerWorksheetDetailParam;
-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-03 10:56:04
- */
-@Service
-public class TowerWorksheetDetailServiceImpl extends ServiceImpl<TowerWorksheetDetailMapper, TowerWorksheetDetail> implements TowerWorksheetDetailService {
-
-    @Override
-    public PageResult<TowerWorksheetDetail> pageRel(TowerWorksheetDetailParam param) {
-        PageParam<TowerWorksheetDetail, TowerWorksheetDetailParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerWorksheetDetail> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerWorksheetDetail> listRel(TowerWorksheetDetailParam param) {
-        List<TowerWorksheetDetail> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerWorksheetDetail, TowerWorksheetDetailParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerWorksheetDetail getByIdRel(Integer detailId) {
-        TowerWorksheetDetailParam param = new TowerWorksheetDetailParam();
-        param.setDetailId(detailId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetPartsServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetPartsServiceImpl.java
deleted file mode 100644
index 30cd174..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetPartsServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerWorksheetPartsMapper;
-import com.gxwebsoft.tower.service.TowerWorksheetPartsService;
-import com.gxwebsoft.tower.entity.TowerWorksheetParts;
-import com.gxwebsoft.tower.param.TowerWorksheetPartsParam;
-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-03 10:18:57
- */
-@Service
-public class TowerWorksheetPartsServiceImpl extends ServiceImpl<TowerWorksheetPartsMapper, TowerWorksheetParts> implements TowerWorksheetPartsService {
-
-    @Override
-    public PageResult<TowerWorksheetParts> pageRel(TowerWorksheetPartsParam param) {
-        PageParam<TowerWorksheetParts, TowerWorksheetPartsParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerWorksheetParts> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerWorksheetParts> listRel(TowerWorksheetPartsParam param) {
-        List<TowerWorksheetParts> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerWorksheetParts, TowerWorksheetPartsParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerWorksheetParts getByIdRel(Integer partsId) {
-        TowerWorksheetPartsParam param = new TowerWorksheetPartsParam();
-        param.setPartsId(partsId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetServiceImpl.java
deleted file mode 100644
index 6caa5ea..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerWorksheetMapper;
-import com.gxwebsoft.tower.service.TowerWorksheetService;
-import com.gxwebsoft.tower.entity.TowerWorksheet;
-import com.gxwebsoft.tower.param.TowerWorksheetParam;
-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-02 16:15:31
- */
-@Service
-public class TowerWorksheetServiceImpl extends ServiceImpl<TowerWorksheetMapper, TowerWorksheet> implements TowerWorksheetService {
-
-    @Override
-    public PageResult<TowerWorksheet> pageRel(TowerWorksheetParam param) {
-        PageParam<TowerWorksheet, TowerWorksheetParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerWorksheet> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerWorksheet> listRel(TowerWorksheetParam param) {
-        List<TowerWorksheet> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerWorksheet, TowerWorksheetParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerWorksheet getByIdRel(Integer worksheetId) {
-        TowerWorksheetParam param = new TowerWorksheetParam();
-        param.setWorksheetId(worksheetId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetSetUpServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetSetUpServiceImpl.java
deleted file mode 100644
index 29010f0..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerWorksheetSetUpServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerWorksheetSetUpMapper;
-import com.gxwebsoft.tower.service.TowerWorksheetSetUpService;
-import com.gxwebsoft.tower.entity.TowerWorksheetSetUp;
-import com.gxwebsoft.tower.param.TowerWorksheetSetUpParam;
-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-03 10:18:57
- */
-@Service
-public class TowerWorksheetSetUpServiceImpl extends ServiceImpl<TowerWorksheetSetUpMapper, TowerWorksheetSetUp> implements TowerWorksheetSetUpService {
-
-    @Override
-    public PageResult<TowerWorksheetSetUp> pageRel(TowerWorksheetSetUpParam param) {
-        PageParam<TowerWorksheetSetUp, TowerWorksheetSetUpParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerWorksheetSetUp> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerWorksheetSetUp> listRel(TowerWorksheetSetUpParam param) {
-        List<TowerWorksheetSetUp> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerWorksheetSetUp, TowerWorksheetSetUpParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerWorksheetSetUp getByIdRel(Integer setUpId) {
-        TowerWorksheetSetUpParam param = new TowerWorksheetSetUpParam();
-        param.setSetUpId(setUpId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/vivo/controller/DataController.java b/src/main/java/com/gxwebsoft/vivo/controller/DataController.java
new file mode 100644
index 0000000..c2e1ba0
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/vivo/controller/DataController.java
@@ -0,0 +1,135 @@
+package com.gxwebsoft.vivo.controller;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.shop.entity.UserBalanceLog;
+import com.gxwebsoft.shop.param.OrderParam;
+import com.gxwebsoft.shop.param.UserBalanceLogParam;
+import com.gxwebsoft.shop.service.OrderService;
+import com.gxwebsoft.shop.service.UserBalanceLogService;
+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.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController()
+@RequestMapping("/api/vivo/data")
+public class DataController extends BaseController {
+    @Resource
+    private OrderService orderService;
+    @Resource
+    private UserBalanceLogService userBalanceLogService;
+
+    @PostMapping("")
+    public ApiResult<?> data(@RequestBody Map<String, Object> param) {
+        String startTime = DateUtil.offsetDay(DateUtil.date(), -7).toString("yyyy-MM-dd");
+        String endTime = DateUtil.today();
+
+        if (param != null && param.get("startTime") != null) {
+            startTime = param.get("startTime").toString();
+            endTime = param.get("endTime").toString();
+        }
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("todayNum", orderService.countNum(
+                new OrderParam() {{
+                    setCreateTimeStart(DateUtil.today() + " 00:00:00");
+                    setCreateTimeEnd(DateUtil.now());
+                }}
+        ));
+        map.put("totalNum", orderService.countNum(
+                new OrderParam() {{
+                    setCreateTimeStart("2024-01-01 00:00:00");
+                    setCreateTimeEnd(DateUtil.now());
+                }}
+        ));
+
+        map.put("todayAmount", orderService.sumData(
+                new OrderParam() {{
+                    setCreateTimeStart(DateUtil.today() + " 00:00:00");
+                    setCreateTimeEnd(DateUtil.now());
+                }}, "total_price"
+        ));
+        map.put("totalAmount", orderService.sumData(
+                new OrderParam() {{
+                    setCreateTimeStart("2024-01-01 00:00:00");
+                    setCreateTimeEnd(DateUtil.now());
+                }}, "total_price"
+        ));
+
+        map.put("todayIncome", orderService.sumIncome(
+                new OrderParam() {{
+                    setCreateTimeStart(DateUtil.today() + " 00:00:00");
+                    setCreateTimeEnd(DateUtil.now());
+                }}
+        ));
+        map.put("totalIncome", orderService.sumIncome(
+                new OrderParam() {{
+                    setCreateTimeStart("2024-01-01 00:00:00");
+                    setCreateTimeEnd(DateUtil.now());
+                }}
+        ));
+
+        BigDecimal todayBalanceIncome = userBalanceLogService.sumData(
+                new UserBalanceLogParam(){{
+                    setCreateTimeStart(DateUtil.today() + " 00:00:00");
+                    setCreateTimeEnd(DateUtil.now());
+                    setScene(0);
+                }}
+        );
+
+        BigDecimal todayBalanceRefund = userBalanceLogService.sumData(
+                new UserBalanceLogParam(){{
+                    setCreateTimeStart(DateUtil.today() + " 00:00:00");
+                    setCreateTimeEnd(DateUtil.now());
+                    setScene(1);
+                }}
+        );
+
+        BigDecimal totalBalanceIncome = userBalanceLogService.sumData(
+                new UserBalanceLogParam(){{
+                    setCreateTimeStart("2024-01-01 00:00:00");
+                    setCreateTimeEnd(DateUtil.now());
+                    setScene(0);
+                }}
+        );
+
+        BigDecimal totalBalanceRefund = userBalanceLogService.sumData(
+                new UserBalanceLogParam(){{
+                    setCreateTimeStart("2024-01-01 00:00:00");
+                    setCreateTimeEnd(DateUtil.now());
+                    setScene(1);
+                }}
+        );
+
+        map.put("todayCommission", todayBalanceIncome.subtract(todayBalanceRefund));
+        map.put("totalCommission", totalBalanceIncome.subtract(totalBalanceRefund));
+
+        List<Map<String, Object>> list = new ArrayList<>();
+        long betweenDay = DateUtil.between(DateUtil.parseDate(startTime), DateUtil.parseDate(endTime), DateUnit.DAY);
+        for (long i = 0; i <= betweenDay; i++){
+            Map<String, Object> item = new HashMap<>();
+            DateTime date = DateUtil.offsetDay(DateUtil.parseDate(startTime), Long.valueOf(i).intValue());
+            item.put("date", date.toString("yyyy-MM-dd"));
+            item.put("data", orderService.countNum(
+                    new OrderParam() {{
+                        setCreateTimeStart(date.toString("yyyy-MM-dd") + " 00:00:00");
+                        setCreateTimeEnd(date.toString("yyyy-MM-dd") + " 23:59:59");
+                    }}
+            ));
+            list.add(item);
+        }
+        map.put("list", list);
+        return success(map);
+    }
+}
diff --git a/src/main/java/com/gxwebsoft/vivo/controller/VivoFixStoreController.java b/src/main/java/com/gxwebsoft/vivo/controller/VivoFixStoreController.java
new file mode 100644
index 0000000..6fd5d7b
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/vivo/controller/VivoFixStoreController.java
@@ -0,0 +1,151 @@
+package com.gxwebsoft.vivo.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.vivo.service.VivoFixStoreService;
+import com.gxwebsoft.vivo.entity.VivoFixStore;
+import com.gxwebsoft.vivo.param.VivoFixStoreParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 维修店控制器
+ *
+ * @author 科技小王子
+ * @since 2024-03-13 15:31:21
+ */
+@Api(tags = "维修店管理")
+@RestController
+@RequestMapping("/api/vivo/vivo-fix-store")
+public class VivoFixStoreController extends BaseController {
+    @Resource
+    private VivoFixStoreService vivoFixStoreService;
+
+    @PostMapping("/list")
+    public ApiResult<List<VivoFixStore>> listForFront(@RequestBody VivoFixStoreParam param) {
+        return success(vivoFixStoreService.getListByDistance(param.getLongitude(), param.getLatitude()));
+    }
+
+    @PostMapping("/list-all")
+    public ApiResult<List<VivoFixStore>> listAll() {
+        return success(vivoFixStoreService.list());
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoFixStore:list')")
+    @OperationLog
+    @ApiOperation("分页查询维修店")
+    @GetMapping("/page")
+    public ApiResult<PageResult<VivoFixStore>> page(VivoFixStoreParam param) {
+        PageParam<VivoFixStore, VivoFixStoreParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(vivoFixStoreService.page(page, page.getWrapper()));
+        // 使用关联查询
+        //return success(vivoFixStoreService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoFixStore:list')")
+    @OperationLog
+    @ApiOperation("查询全部维修店")
+    @GetMapping()
+    public ApiResult<List<VivoFixStore>> list(VivoFixStoreParam param) {
+        PageParam<VivoFixStore, VivoFixStoreParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(vivoFixStoreService.list(page.getOrderWrapper()));
+        // 使用关联查询
+        //return success(vivoFixStoreService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoFixStore:list')")
+    @OperationLog
+    @ApiOperation("根据id查询维修店")
+    @GetMapping("/{id}")
+    public ApiResult<VivoFixStore> get(@PathVariable("id") Integer id) {
+        return success(vivoFixStoreService.getById(id));
+        // 使用关联查询
+        //return success(vivoFixStoreService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoFixStore:save')")
+    @OperationLog
+    @ApiOperation("添加维修店")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody VivoFixStore vivoFixStore) {
+        // 记录当前登录用户id
+        User loginUser = getLoginUser();
+        if (loginUser != null) {
+          vivoFixStore.setUserId(loginUser.getUserId());
+        }
+        if (vivoFixStoreService.save(vivoFixStore)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoFixStore:update')")
+    @OperationLog
+    @ApiOperation("修改维修店")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody VivoFixStore vivoFixStore) {
+        if (vivoFixStoreService.updateById(vivoFixStore)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoFixStore:remove')")
+    @OperationLog
+    @ApiOperation("删除维修店")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (vivoFixStoreService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoFixStore:save')")
+    @OperationLog
+    @ApiOperation("批量添加维修店")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<VivoFixStore> list) {
+        if (vivoFixStoreService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoFixStore:update')")
+    @OperationLog
+    @ApiOperation("批量修改维修店")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<VivoFixStore> batchParam) {
+        if (batchParam.update(vivoFixStoreService, "id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoFixStore:remove')")
+    @OperationLog
+    @ApiOperation("批量删除维修店")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (vivoFixStoreService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}
diff --git a/src/main/java/com/gxwebsoft/vivo/controller/VivoPayCodeController.java b/src/main/java/com/gxwebsoft/vivo/controller/VivoPayCodeController.java
new file mode 100644
index 0000000..abf5348
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/vivo/controller/VivoPayCodeController.java
@@ -0,0 +1,148 @@
+package com.gxwebsoft.vivo.controller;
+
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.service.AreaService;
+import com.gxwebsoft.vivo.service.VivoPayCodeService;
+import com.gxwebsoft.vivo.entity.VivoPayCode;
+import com.gxwebsoft.vivo.param.VivoPayCodeParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 控制器
+ *
+ * @author 科技小王子
+ * @since 2024-03-15 23:47:43
+ */
+@Api(tags = "管理")
+@RestController
+@RequestMapping("/api/vivo/vivo-pay-code")
+public class VivoPayCodeController extends BaseController {
+    @Resource
+    private VivoPayCodeService vivoPayCodeService;
+    @Resource
+    private AreaService areaService;
+
+    @PostMapping("/info-by-user-city")
+    public ApiResult<?> infoByUserCity() {
+        User user = getLoginUser();
+        VivoPayCode vivoPayCode = vivoPayCodeService.getByCity(user.getCityId());
+        if (vivoPayCode != null) return success(vivoPayCode);
+        return fail("该区域暂未配置收款码,请联系管理员");
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoPayCode:list')")
+    @OperationLog
+    @ApiOperation("分页查询")
+    @GetMapping("/page")
+    public ApiResult<PageResult<VivoPayCode>> page(VivoPayCodeParam param) {
+        return success(vivoPayCodeService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoPayCode:list')")
+    @OperationLog
+    @ApiOperation("查询全部")
+    @GetMapping()
+    public ApiResult<List<VivoPayCode>> list(VivoPayCodeParam param) {
+        List<VivoPayCode> list = vivoPayCodeService.listRel(param);
+        list.forEach(vivoPayCode -> {
+            vivoPayCode.setProvinceId(areaService.getParent(vivoPayCode.getCityId()).getId());
+        });
+        return success(list);
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoPayCode:list')")
+    @OperationLog
+    @ApiOperation("根据id查询")
+    @GetMapping("/{id}")
+    public ApiResult<VivoPayCode> get(@PathVariable("id") Integer id) {
+        return success(vivoPayCodeService.getById(id));
+        // 使用关联查询
+        //return success(vivoPayCodeService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoPayCode:save')")
+    @OperationLog
+    @ApiOperation("添加")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody VivoPayCode vivoPayCode) {
+        // 记录当前登录用户id
+        User loginUser = getLoginUser();
+        if (loginUser != null) {
+            vivoPayCode.setUserId(loginUser.getUserId());
+        }
+        VivoPayCode hasData = vivoPayCodeService.getByCity(vivoPayCode.getCityId());
+        if (hasData != null) return fail("该区域已有收款码");
+        if (vivoPayCodeService.save(vivoPayCode)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoPayCode:update')")
+    @OperationLog
+    @ApiOperation("修改")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody VivoPayCode vivoPayCode) {
+        if (vivoPayCodeService.updateById(vivoPayCode)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoPayCode:remove')")
+    @OperationLog
+    @ApiOperation("删除")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (vivoPayCodeService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoPayCode:save')")
+    @OperationLog
+    @ApiOperation("批量添加")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<VivoPayCode> list) {
+        if (vivoPayCodeService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoPayCode:update')")
+    @OperationLog
+    @ApiOperation("批量修改")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<VivoPayCode> batchParam) {
+        if (batchParam.update(vivoPayCodeService, "id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoPayCode:remove')")
+    @OperationLog
+    @ApiOperation("批量删除")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (vivoPayCodeService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}
diff --git a/src/main/java/com/gxwebsoft/vivo/controller/VivoPhoneModelController.java b/src/main/java/com/gxwebsoft/vivo/controller/VivoPhoneModelController.java
new file mode 100644
index 0000000..9465caf
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/vivo/controller/VivoPhoneModelController.java
@@ -0,0 +1,203 @@
+package com.gxwebsoft.vivo.controller;
+
+import cn.hutool.http.HttpUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.shop.entity.Goods;
+import com.gxwebsoft.shop.entity.GoodsPhoneModel;
+import com.gxwebsoft.shop.entity.GoodsPrice;
+import com.gxwebsoft.shop.service.CategoryService;
+import com.gxwebsoft.shop.service.GoodsPhoneModelService;
+import com.gxwebsoft.shop.service.GoodsService;
+import com.gxwebsoft.vivo.service.VivoPhoneModelService;
+import com.gxwebsoft.vivo.entity.VivoPhoneModel;
+import com.gxwebsoft.vivo.param.VivoPhoneModelParam;
+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.Map;
+
+/**
+ * 机型控制器
+ *
+ * @author 科技小王子
+ * @since 2024-03-13 15:31:21
+ */
+@Api(tags = "机型管理")
+@RestController
+@RequestMapping("/api/vivo/vivo-phone-model")
+public class VivoPhoneModelController extends BaseController {
+    @Resource
+    private VivoPhoneModelService vivoPhoneModelService;
+    @Resource
+    private CategoryService categoryService;
+    @Resource
+    private GoodsPhoneModelService goodsPhoneModelService;
+    @Resource
+    private GoodsService goodsService;
+
+    @ApiOperation("查询机型")
+    @PostMapping("/imei")
+    public ApiResult<?> page(@RequestBody Map<String, Object> param) {
+        System.out.println("param:" + param);
+        String imei = (String) param.get("imei");
+        String url = "http://119.23.214.121:9527/api/app/serialNoList?imei=";
+//        String url = "http://8.138.82.168:9527/api/app/serialNoList?imei=";
+        String res = HttpUtil.get(url + imei);
+        return success("操作成功", res);
+    }
+
+    @ApiOperation("分类查询机型")
+    @PostMapping("/list-by-cate")
+    public ApiResult<?> listByCate(@RequestBody VivoPhoneModelParam param) {
+        List<VivoPhoneModel> phoneModels = vivoPhoneModelService.listRel(param);
+        phoneModels.forEach(item -> {
+            List<GoodsPhoneModel> goodsPhoneModel = goodsPhoneModelService.getByModelId(item.getId());
+            if (!goodsPhoneModel.isEmpty()) {
+                Goods goods = goodsService.getById(goodsPhoneModel.get(0).getGoodsId());
+                if (goods != null) {
+                    goodsService.setData(new ArrayList<Goods>() {{
+                        add(goods);
+                    }}, getLoginUser());
+                    item.setGoods(goods);
+                }
+            }
+        });
+        return success(phoneModels);
+    }
+
+    @PostMapping("/list")
+    public ApiResult<?> listForFront() {
+        List<VivoPhoneModel> phoneModels = vivoPhoneModelService.listRel(new VivoPhoneModelParam());
+        return success(phoneModels);
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoPhoneModel:list')")
+    @OperationLog
+    @ApiOperation("分页查询机型")
+    @GetMapping("/page")
+    public ApiResult<PageResult<VivoPhoneModel>> page(VivoPhoneModelParam param) {
+        PageParam<VivoPhoneModel, VivoPhoneModelParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        IPage<VivoPhoneModel> list = vivoPhoneModelService.page(page, page.getWrapper());
+        list.getRecords().forEach(item -> {
+            if (item.getCate() != null) item.setCateItem(categoryService.getById(item.getCate()));
+            System.out.println("item:");
+        });
+        return success(list);
+        // 使用关联查询
+//        return success(vivoPhoneModelService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoPhoneModel:list')")
+    @OperationLog
+    @ApiOperation("查询全部机型")
+    @GetMapping()
+    public ApiResult<List<VivoPhoneModel>> list(VivoPhoneModelParam param) {
+        List<VivoPhoneModel> list = vivoPhoneModelService.listRel(param);
+        list.forEach(item -> {
+            if (item.getCate() != null) item.setCateItem(categoryService.getById(item.getCate()));
+        });
+        return success(list);
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoPhoneModel:list')")
+    @OperationLog
+    @ApiOperation("根据id查询机型")
+    @GetMapping("/{id}")
+    public ApiResult<VivoPhoneModel> get(@PathVariable("id") Integer id) {
+        return success(vivoPhoneModelService.getById(id));
+        // 使用关联查询
+        //return success(vivoPhoneModelService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoPhoneModel:save')")
+    @OperationLog
+    @ApiOperation("添加机型")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody VivoPhoneModel vivoPhoneModel) {
+        // 记录当前登录用户id
+        User loginUser = getLoginUser();
+        if (loginUser != null) {
+            vivoPhoneModel.setUserId(loginUser.getUserId());
+        }
+        VivoPhoneModel hasData = vivoPhoneModelService.getModelByName(vivoPhoneModel.getName());
+        if (hasData != null) return fail("该机型已存在");
+        if (vivoPhoneModelService.save(vivoPhoneModel)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoPhoneModel:update')")
+    @OperationLog
+    @ApiOperation("修改机型")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody VivoPhoneModel vivoPhoneModel) {
+        if (vivoPhoneModelService.updateById(vivoPhoneModel)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoPhoneModel:remove')")
+    @OperationLog
+    @ApiOperation("删除机型")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (vivoPhoneModelService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoPhoneModel:save')")
+    @OperationLog
+    @ApiOperation("批量添加机型")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<VivoPhoneModel> list) {
+        List<VivoPhoneModel> insertList = new ArrayList<>();
+        list.forEach(item -> {
+            VivoPhoneModel hasData = vivoPhoneModelService.getModelByName(item.getName());
+            if (hasData != null) insertList.add(item);
+        });
+        if (vivoPhoneModelService.saveBatch(insertList)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoPhoneModel:update')")
+    @OperationLog
+    @ApiOperation("批量修改机型")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<VivoPhoneModel> batchParam) {
+        if (batchParam.update(vivoPhoneModelService, "id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoPhoneModel:remove')")
+    @OperationLog
+    @ApiOperation("批量删除机型")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (vivoPhoneModelService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}
diff --git a/src/main/java/com/gxwebsoft/vivo/controller/VivoStoreController.java b/src/main/java/com/gxwebsoft/vivo/controller/VivoStoreController.java
new file mode 100644
index 0000000..a49c491
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/vivo/controller/VivoStoreController.java
@@ -0,0 +1,149 @@
+package com.gxwebsoft.vivo.controller;
+
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.entity.Area;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.service.AreaService;
+import com.gxwebsoft.vivo.service.VivoStoreService;
+import com.gxwebsoft.vivo.entity.VivoStore;
+import com.gxwebsoft.vivo.param.VivoStoreParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 门店控制器
+ *
+ * @author 科技小王子
+ * @since 2024-03-13 15:31:21
+ */
+@Api(tags = "门店管理")
+@RestController
+@RequestMapping("/api/vivo/vivo-store")
+public class VivoStoreController extends BaseController {
+    @Resource
+    private VivoStoreService vivoStoreService;
+    @Resource
+    private AreaService areaService;
+
+    @PostMapping("/list-by-city")
+    public ApiResult<?> listByCity() {
+        User user = getLoginUser();
+        Area city = areaService.getById(user.getCityId());
+        if (city == null) return success();
+        return success(vivoStoreService.listByCity(city.getName()));
+    }
+
+    @PostMapping("/list-all")
+    public ApiResult<?> listAll() {
+        return success(vivoStoreService.list());
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoStore:list')")
+    @OperationLog
+    @ApiOperation("分页查询门店")
+    @GetMapping("/page")
+    public ApiResult<PageResult<VivoStore>> page(VivoStoreParam param) {
+        // 使用关联查询
+        return success(vivoStoreService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoStore:list')")
+    @OperationLog
+    @ApiOperation("查询全部门店")
+    @GetMapping()
+    public ApiResult<List<VivoStore>> list(VivoStoreParam param) {
+        return success(vivoStoreService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoStore:list')")
+    @OperationLog
+    @ApiOperation("根据id查询门店")
+    @GetMapping("/{id}")
+    public ApiResult<VivoStore> get(@PathVariable("id") Integer id) {
+        return success(vivoStoreService.getById(id));
+        // 使用关联查询
+        //return success(vivoStoreService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoStore:save')")
+    @OperationLog
+    @ApiOperation("添加门店")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody VivoStore vivoStore) {
+        // 记录当前登录用户id
+        User loginUser = getLoginUser();
+        if (loginUser != null) {
+          vivoStore.setUserId(loginUser.getUserId());
+        }
+        if (vivoStoreService.save(vivoStore)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoStore:update')")
+    @OperationLog
+    @ApiOperation("修改门店")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody VivoStore vivoStore) {
+        if (vivoStoreService.updateById(vivoStore)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoStore:remove')")
+    @OperationLog
+    @ApiOperation("删除门店")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (vivoStoreService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoStore:save')")
+    @OperationLog
+    @ApiOperation("批量添加门店")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<VivoStore> list) {
+        if (vivoStoreService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoStore:update')")
+    @OperationLog
+    @ApiOperation("批量修改门店")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<VivoStore> batchParam) {
+        if (batchParam.update(vivoStoreService, "id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('vivo:vivoStore:remove')")
+    @OperationLog
+    @ApiOperation("批量删除门店")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (vivoStoreService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}
diff --git a/src/main/java/com/gxwebsoft/vivo/entity/VivoFixStore.java b/src/main/java/com/gxwebsoft/vivo/entity/VivoFixStore.java
new file mode 100644
index 0000000..f3ff782
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/vivo/entity/VivoFixStore.java
@@ -0,0 +1,73 @@
+package com.gxwebsoft.vivo.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 维修店
+ *
+ * @author 科技小王子
+ * @since 2024-03-13 15:31:21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "VivoFixStore对象", description = "维修店")
+public class VivoFixStore implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "电话")
+    private String phone;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "收款码")
+    private String payeeCode;
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
+    @TableField(exist = false)
+    private BigDecimal distance;
+
+    private String province;
+
+    private String city;
+
+    private String region;
+
+    private String address;
+
+    @ApiModelProperty(value = "是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
+    @ApiModelProperty(value = "区代ID")
+    private Integer userId;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+    @ApiModelProperty(value = "注册时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "修改时间")
+    private LocalDateTime updateTime;
+
+}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerWorksheetCheck.java b/src/main/java/com/gxwebsoft/vivo/entity/VivoPayCode.java
similarity index 55%
rename from src/main/java/com/gxwebsoft/tower/entity/TowerWorksheetCheck.java
rename to src/main/java/com/gxwebsoft/vivo/entity/VivoPayCode.java
index 2e0fc97..6dbee50 100644
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerWorksheetCheck.java
+++ b/src/main/java/com/gxwebsoft/vivo/entity/VivoPayCode.java
@@ -1,4 +1,4 @@
-package com.gxwebsoft.tower.entity;
+package com.gxwebsoft.vivo.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -12,54 +12,47 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 派单现场核验
+ * 
  *
  * @author 科技小王子
- * @since 2023-07-04 01:24:45
+ * @since 2024-03-15 23:47:43
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerWorksheetCheck对象", description = "派单现场核验")
-public class TowerWorksheetCheck implements Serializable {
+@ApiModel(value = "VivoPayCode对象", description = "")
+public class VivoPayCode implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "check_id", type = IdType.AUTO)
-    private Integer checkId;
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
 
-    private Integer worksheetId;
+    @ApiModelProperty(value = "城市")
+    private Integer cityId;
 
-    @ApiModelProperty(value = "核验人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "核验人")
+    @ApiModelProperty(value = "省")
     @TableField(exist = false)
-    private String nickname;
+    private Integer provinceId;
 
-    private String photos;
+    @ApiModelProperty(value = "城市")
+    @TableField(exist = false)
+    private String cityName;
 
-    private String lat;
+    @ApiModelProperty(value = "备注")
+    private String remark;
 
-    private String lng;
+    @ApiModelProperty(value = "码")
+    private String code;
 
-    private String address;
-
-    @ApiModelProperty(value = "实际核验时间")
-    private String checkTime;
+    private Integer userId;
 
     @ApiModelProperty(value = "是否删除, 0否, 1是")
     @TableLogic
     private Integer deleted;
 
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createTime;
 
     @ApiModelProperty(value = "修改时间")
     private LocalDateTime updateTime;
 
-    @TableField(exist = false)
-    private Boolean save;
-
 }
diff --git a/src/main/java/com/gxwebsoft/vivo/entity/VivoPhoneModel.java b/src/main/java/com/gxwebsoft/vivo/entity/VivoPhoneModel.java
new file mode 100644
index 0000000..3ae3522
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/vivo/entity/VivoPhoneModel.java
@@ -0,0 +1,63 @@
+package com.gxwebsoft.vivo.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import com.gxwebsoft.shop.entity.Category;
+import com.gxwebsoft.shop.entity.Goods;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 机型
+ *
+ * @author 科技小王子
+ * @since 2024-03-13 15:31:21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "VivoPhoneModel对象", description = "机型")
+public class VivoPhoneModel implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "系列")
+    private Integer cate;
+
+    @ApiModelProperty(value = "品牌")
+    private String brand;
+
+    @ApiModelProperty(value = "编号")
+    private String code;
+
+    @ApiModelProperty(value = "区代ID")
+    private Integer userId;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+    @ApiModelProperty(value = "注册时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "修改时间")
+    private LocalDateTime updateTime;
+
+    @TableField(exist = false)
+    private Category cateItem;
+
+    @TableField(exist = false)
+    private Goods goods ;
+
+}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerProjectBuilding.java b/src/main/java/com/gxwebsoft/vivo/entity/VivoStore.java
similarity index 51%
rename from src/main/java/com/gxwebsoft/tower/entity/TowerProjectBuilding.java
rename to src/main/java/com/gxwebsoft/vivo/entity/VivoStore.java
index d85b5c0..60fb85c 100644
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerProjectBuilding.java
+++ b/src/main/java/com/gxwebsoft/vivo/entity/VivoStore.java
@@ -1,6 +1,7 @@
-package com.gxwebsoft.tower.entity;
+package com.gxwebsoft.vivo.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -11,39 +12,57 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 项目标地
+ * 门店
  *
  * @author 科技小王子
- * @since 2024-01-05 22:01:16
+ * @since 2024-03-13 15:31:21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerProjectBuilding对象", description = "项目标地")
-public class TowerProjectBuilding implements Serializable {
+@ApiModel(value = "VivoStore对象", description = "门店")
+public class VivoStore implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "building_id", type = IdType.AUTO)
-    private Integer buildingId;
-
-    private Integer projectId;
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
 
     @ApiModelProperty(value = "名称")
     private String name;
 
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
-    private Integer status;
+    @ApiModelProperty(value = "经度")
+    private String longitude;
 
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
+    private String province;
+
+    private String city;
+
+    private String region;
+
+    private String address;
+
+    @ApiModelProperty(value = "店长")
+    private Integer manager;
+
+    @ApiModelProperty(value = "零售商")
+    private Integer orgId;
+
+    @TableField(exist = false)
+    private String orgName;
 
     @ApiModelProperty(value = "是否删除, 0否, 1是")
     @TableLogic
     private Integer deleted;
 
+    @ApiModelProperty(value = "区代ID")
+    private Integer userId;
+
     @ApiModelProperty(value = "租户id")
     private Integer tenantId;
 
-    @ApiModelProperty(value = "创建时间")
+    @ApiModelProperty(value = "注册时间")
     private LocalDateTime createTime;
 
     @ApiModelProperty(value = "修改时间")
diff --git a/src/main/java/com/gxwebsoft/vivo/mapper/VivoFixStoreMapper.java b/src/main/java/com/gxwebsoft/vivo/mapper/VivoFixStoreMapper.java
new file mode 100644
index 0000000..7d8aeef
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/vivo/mapper/VivoFixStoreMapper.java
@@ -0,0 +1,37 @@
+package com.gxwebsoft.vivo.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gxwebsoft.vivo.entity.VivoFixStore;
+import com.gxwebsoft.vivo.param.VivoFixStoreParam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 维修店Mapper
+ *
+ * @author 科技小王子
+ * @since 2024-03-13 15:31:21
+ */
+public interface VivoFixStoreMapper extends BaseMapper<VivoFixStore> {
+
+    /**
+     * 分页查询
+     *
+     * @param page  分页对象
+     * @param param 查询参数
+     * @return List<VivoFixStore>
+     */
+    List<VivoFixStore> selectPageRel(@Param("page") IPage<VivoFixStore> page,
+                             @Param("param") VivoFixStoreParam param);
+
+    /**
+     * 查询全部
+     *
+     * @param param 查询参数
+     * @return List<User>
+     */
+    List<VivoFixStore> selectListRel(@Param("param") VivoFixStoreParam param);
+
+}
diff --git a/src/main/java/com/gxwebsoft/vivo/mapper/VivoPayCodeMapper.java b/src/main/java/com/gxwebsoft/vivo/mapper/VivoPayCodeMapper.java
new file mode 100644
index 0000000..97201d6
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/vivo/mapper/VivoPayCodeMapper.java
@@ -0,0 +1,37 @@
+package com.gxwebsoft.vivo.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gxwebsoft.vivo.entity.VivoPayCode;
+import com.gxwebsoft.vivo.param.VivoPayCodeParam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * Mapper
+ *
+ * @author 科技小王子
+ * @since 2024-03-15 23:47:43
+ */
+public interface VivoPayCodeMapper extends BaseMapper<VivoPayCode> {
+
+    /**
+     * 分页查询
+     *
+     * @param page  分页对象
+     * @param param 查询参数
+     * @return List<VivoPayCode>
+     */
+    List<VivoPayCode> selectPageRel(@Param("page") IPage<VivoPayCode> page,
+                             @Param("param") VivoPayCodeParam param);
+
+    /**
+     * 查询全部
+     *
+     * @param param 查询参数
+     * @return List<User>
+     */
+    List<VivoPayCode> selectListRel(@Param("param") VivoPayCodeParam param);
+
+}
diff --git a/src/main/java/com/gxwebsoft/vivo/mapper/VivoPhoneModelMapper.java b/src/main/java/com/gxwebsoft/vivo/mapper/VivoPhoneModelMapper.java
new file mode 100644
index 0000000..2156b11
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/vivo/mapper/VivoPhoneModelMapper.java
@@ -0,0 +1,37 @@
+package com.gxwebsoft.vivo.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gxwebsoft.vivo.entity.VivoPhoneModel;
+import com.gxwebsoft.vivo.param.VivoPhoneModelParam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 机型Mapper
+ *
+ * @author 科技小王子
+ * @since 2024-03-13 15:31:21
+ */
+public interface VivoPhoneModelMapper extends BaseMapper<VivoPhoneModel> {
+
+    /**
+     * 分页查询
+     *
+     * @param page  分页对象
+     * @param param 查询参数
+     * @return List<VivoPhoneModel>
+     */
+    List<VivoPhoneModel> selectPageRel(@Param("page") IPage<VivoPhoneModel> page,
+                             @Param("param") VivoPhoneModelParam param);
+
+    /**
+     * 查询全部
+     *
+     * @param param 查询参数
+     * @return List<User>
+     */
+    List<VivoPhoneModel> selectListRel(@Param("param") VivoPhoneModelParam param);
+
+}
diff --git a/src/main/java/com/gxwebsoft/vivo/mapper/VivoStoreMapper.java b/src/main/java/com/gxwebsoft/vivo/mapper/VivoStoreMapper.java
new file mode 100644
index 0000000..81b6c2e
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/vivo/mapper/VivoStoreMapper.java
@@ -0,0 +1,37 @@
+package com.gxwebsoft.vivo.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gxwebsoft.vivo.entity.VivoStore;
+import com.gxwebsoft.vivo.param.VivoStoreParam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 门店Mapper
+ *
+ * @author 科技小王子
+ * @since 2024-03-13 15:31:21
+ */
+public interface VivoStoreMapper extends BaseMapper<VivoStore> {
+
+    /**
+     * 分页查询
+     *
+     * @param page  分页对象
+     * @param param 查询参数
+     * @return List<VivoStore>
+     */
+    List<VivoStore> selectPageRel(@Param("page") IPage<VivoStore> page,
+                             @Param("param") VivoStoreParam param);
+
+    /**
+     * 查询全部
+     *
+     * @param param 查询参数
+     * @return List<User>
+     */
+    List<VivoStore> selectListRel(@Param("param") VivoStoreParam param);
+
+}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCardBenefitsMapper.xml b/src/main/java/com/gxwebsoft/vivo/mapper/xml/VivoFixStoreMapper.xml
similarity index 52%
rename from src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCardBenefitsMapper.xml
rename to src/main/java/com/gxwebsoft/vivo/mapper/xml/VivoFixStoreMapper.xml
index 4614721..2b4b4da 100644
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCardBenefitsMapper.xml
+++ b/src/main/java/com/gxwebsoft/vivo/mapper/xml/VivoFixStoreMapper.xml
@@ -1,35 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.apps.mapper.HualalaCardBenefitsMapper">
+<mapper namespace="com.gxwebsoft.vivo.mapper.VivoFixStoreMapper">
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
         SELECT a.*
-        FROM apps_hualala_card_benefits a
+        FROM vivo_fix_store a
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}
             </if>
-            <if test="param.cardLevelName != null">
-                AND a.card_level_name LIKE CONCAT('%', #{param.cardLevelName}, '%')
-            </if>
             <if test="param.name != null">
                 AND a.name LIKE CONCAT('%', #{param.name}, '%')
             </if>
-            <if test="param.image != null">
-                AND a.image LIKE CONCAT('%', #{param.image}, '%')
+            <if test="param.payeeCode != null">
+                AND a.payee_code LIKE CONCAT('%', #{param.payeeCode}, '%')
             </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
+            <if test="param.longitude != null">
+                AND a.longitude LIKE CONCAT('%', #{param.longitude}, '%')
             </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
+            <if test="param.latitude != null">
+                AND a.latitude LIKE CONCAT('%', #{param.latitude}, '%')
             </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
+            <if test="param.province != null">
+                AND a.province LIKE CONCAT('%', #{param.province}, '%')
             </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
+            <if test="param.city != null">
+                AND a.city LIKE CONCAT('%', #{param.city}, '%')
+            </if>
+            <if test="param.region != null">
+                AND a.region LIKE CONCAT('%', #{param.region}, '%')
+            </if>
+            <if test="param.address != null">
+                AND a.address LIKE CONCAT('%', #{param.address}, '%')
             </if>
             <if test="param.deleted != null">
                 AND a.deleted = #{param.deleted}
@@ -37,8 +40,8 @@
             <if test="param.deleted == null">
                 AND a.deleted = 0
             </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
+            <if test="param.userId != null">
+                AND a.user_id = #{param.userId}
             </if>
             <if test="param.createTimeStart != null">
                 AND a.create_time &gt;= #{param.createTimeStart}
@@ -50,12 +53,12 @@
     </sql>
 
     <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.HualalaCardBenefits">
+    <select id="selectPageRel" resultType="com.gxwebsoft.vivo.entity.VivoFixStore">
         <include refid="selectSql"></include>
     </select>
 
     <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.HualalaCardBenefits">
+    <select id="selectListRel" resultType="com.gxwebsoft.vivo.entity.VivoFixStore">
         <include refid="selectSql"></include>
     </select>
 
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractFileMapper.xml b/src/main/java/com/gxwebsoft/vivo/mapper/xml/VivoPayCodeMapper.xml
similarity index 59%
rename from src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractFileMapper.xml
rename to src/main/java/com/gxwebsoft/vivo/mapper/xml/VivoPayCodeMapper.xml
index 90f9c33..9a83dbb 100644
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractFileMapper.xml
+++ b/src/main/java/com/gxwebsoft/vivo/mapper/xml/VivoPayCodeMapper.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerContractFileMapper">
+<mapper namespace="com.gxwebsoft.vivo.mapper.VivoPayCodeMapper">
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
-        SELECT a.*
-        FROM tower_contract_file a
+        SELECT a.*, b.name AS city_name
+        FROM vivo_pay_code a
+        LEFT JOIN sys_area b ON a.city_id = b.id
         <where>
-            <if test="param.contractFileId != null">
-                AND a.contract_file_id = #{param.contractFileId}
+            <if test="param.id != null">
+                AND a.id = #{param.id}
             </if>
-            <if test="param.contractId != null">
-                AND a.contract_id = #{param.contractId}
+            <if test="param.cityId != null">
+                AND a.city_id = #{param.cityId}
             </if>
-            <if test="param.path != null">
-                AND a.path LIKE CONCAT('%', #{param.path}, '%')
+            <if test="param.remark != null">
+                AND a.remark LIKE CONCAT('%', #{param.remark}, '%')
             </if>
-            <if test="param.type != null">
-                AND a.type LIKE CONCAT('%', #{param.type}, '%')
+            <if test="param.code != null">
+                AND a.code LIKE CONCAT('%', #{param.code}, '%')
             </if>
             <if test="param.userId != null">
                 AND a.user_id = #{param.userId}
@@ -38,12 +39,12 @@
     </sql>
 
     <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerContractFile">
+    <select id="selectPageRel" resultType="com.gxwebsoft.vivo.entity.VivoPayCode">
         <include refid="selectSql"></include>
     </select>
 
     <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerContractFile">
+    <select id="selectListRel" resultType="com.gxwebsoft.vivo.entity.VivoPayCode">
         <include refid="selectSql"></include>
     </select>
 
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetAuditMapper.xml b/src/main/java/com/gxwebsoft/vivo/mapper/xml/VivoPhoneModelMapper.xml
similarity index 53%
rename from src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetAuditMapper.xml
rename to src/main/java/com/gxwebsoft/vivo/mapper/xml/VivoPhoneModelMapper.xml
index a0bf4fd..5d11f10 100644
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWorksheetAuditMapper.xml
+++ b/src/main/java/com/gxwebsoft/vivo/mapper/xml/VivoPhoneModelMapper.xml
@@ -1,27 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerWorksheetAuditMapper">
+<mapper namespace="com.gxwebsoft.vivo.mapper.VivoPhoneModelMapper">
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
         SELECT a.*
-        FROM tower_worksheet_audit a
+        FROM vivo_phone_model a
         <where>
-            <if test="param.worksheetAuditId != null">
-                AND a.worksheet_audit_id = #{param.worksheetAuditId}
+            <if test="param.id != null">
+                AND a.id = #{param.id}
             </if>
-            <if test="param.worksheetId != null">
-                AND a.worksheet_id = #{param.worksheetId}
+            <if test="param.cate != null">
+                AND a.cate = #{param.cate}
+            </if>
+            <if test="param.name != null">
+                AND a.name LIKE CONCAT('%', #{param.name}, '%')
+            </if>
+            <if test="param.brand != null">
+                AND a.brand LIKE CONCAT('%', #{param.brand}, '%')
+            </if>
+            <if test="param.code != null">
+                AND a.code LIKE CONCAT('%', #{param.code}, '%')
             </if>
             <if test="param.userId != null">
                 AND a.user_id = #{param.userId}
             </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.refuseReason != null">
-                AND a.refuse_reason LIKE CONCAT('%', #{param.refuseReason}, '%')
-            </if>
             <if test="param.createTimeStart != null">
                 AND a.create_time &gt;= #{param.createTimeStart}
             </if>
@@ -32,12 +35,12 @@
     </sql>
 
     <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerWorksheetAudit">
+    <select id="selectPageRel" resultType="com.gxwebsoft.vivo.entity.VivoPhoneModel">
         <include refid="selectSql"></include>
     </select>
 
     <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerWorksheetAudit">
+    <select id="selectListRel" resultType="com.gxwebsoft.vivo.entity.VivoPhoneModel">
         <include refid="selectSql"></include>
     </select>
 
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSecurityMapper.xml b/src/main/java/com/gxwebsoft/vivo/mapper/xml/VivoStoreMapper.xml
similarity index 51%
rename from src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSecurityMapper.xml
rename to src/main/java/com/gxwebsoft/vivo/mapper/xml/VivoStoreMapper.xml
index 6f1dfe8..102b217 100644
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSecurityMapper.xml
+++ b/src/main/java/com/gxwebsoft/vivo/mapper/xml/VivoStoreMapper.xml
@@ -1,27 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gxwebsoft.tower.mapper.TowerSecurityMapper">
+<mapper namespace="com.gxwebsoft.vivo.mapper.VivoStoreMapper">
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
-        SELECT a.*,b.nickname,b.phone,b.avatar
-        FROM tower_security a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
+        SELECT a.*, b.organization_name org_name
+        FROM vivo_store a
+        LEFT JOIN sys_organization b ON a.org_id = b.organization_id
         <where>
-            <if test="param.securityId != null">
-                AND a.security_id = #{param.securityId}
+            <if test="param.id != null">
+                AND a.id = #{param.id}
             </if>
-            <if test="param.type != null">
-              AND a.type = #{param.type}
-            </if>
-            <if test="param.projectName != null">
-                AND a.project_name LIKE CONCAT('%', #{param.projectName}, '%')
-            </if>
-            <if test="param.securityCode != null">
-                AND a.security_code LIKE CONCAT('%', #{param.securityCode}, '%')
-            </if>
-            <if test="param.address != null">
-                AND a.address LIKE CONCAT('%', #{param.address}, '%')
+            <if test="param.name != null">
+                AND a.name LIKE CONCAT('%', #{param.name}, '%')
             </if>
             <if test="param.longitude != null">
                 AND a.longitude LIKE CONCAT('%', #{param.longitude}, '%')
@@ -29,9 +20,6 @@
             <if test="param.latitude != null">
                 AND a.latitude LIKE CONCAT('%', #{param.latitude}, '%')
             </if>
-            <if test="param.country != null">
-                AND a.country LIKE CONCAT('%', #{param.country}, '%')
-            </if>
             <if test="param.province != null">
                 AND a.province LIKE CONCAT('%', #{param.province}, '%')
             </if>
@@ -41,20 +29,11 @@
             <if test="param.region != null">
                 AND a.region LIKE CONCAT('%', #{param.region}, '%')
             </if>
-            <if test="param.regionName != null">
-                AND a.region_name LIKE CONCAT('%', #{param.regionName}, '%')
+            <if test="param.address != null">
+                AND a.address LIKE CONCAT('%', #{param.address}, '%')
             </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
+            <if test="param.manager != null">
+                AND a.manager = #{param.manager}
             </if>
             <if test="param.deleted != null">
                 AND a.deleted = #{param.deleted}
@@ -62,28 +41,25 @@
             <if test="param.deleted == null">
                 AND a.deleted = 0
             </if>
+            <if test="param.userId != null">
+                AND a.user_id = #{param.userId}
+            </if>
             <if test="param.createTimeStart != null">
                 AND a.create_time &gt;= #{param.createTimeStart}
             </if>
             <if test="param.createTimeEnd != null">
                 AND a.create_time &lt;= #{param.createTimeEnd}
             </if>
-            <if test="param.keywords != null">
-              AND (a.project_name LIKE CONCAT('%', #{param.keywords}, '%')
-              OR a.project_id = #{param.keywords}
-              OR a.security_code = #{param.keywords}
-              )
-            </if>
         </where>
     </sql>
 
     <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerSecurity">
+    <select id="selectPageRel" resultType="com.gxwebsoft.vivo.entity.VivoStore">
         <include refid="selectSql"></include>
     </select>
 
     <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerSecurity">
+    <select id="selectListRel" resultType="com.gxwebsoft.vivo.entity.VivoStore">
         <include refid="selectSql"></include>
     </select>
 
diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerContractSettleRuleParam.java b/src/main/java/com/gxwebsoft/vivo/param/VivoFixStoreParam.java
similarity index 53%
rename from src/main/java/com/gxwebsoft/tower/param/TowerContractSettleRuleParam.java
rename to src/main/java/com/gxwebsoft/vivo/param/VivoFixStoreParam.java
index 4dae858..c36842f 100644
--- a/src/main/java/com/gxwebsoft/tower/param/TowerContractSettleRuleParam.java
+++ b/src/main/java/com/gxwebsoft/vivo/param/VivoFixStoreParam.java
@@ -1,4 +1,4 @@
-package com.gxwebsoft.tower.param;
+package com.gxwebsoft.vivo.param;
 
 import com.gxwebsoft.common.core.annotation.QueryField;
 import com.gxwebsoft.common.core.annotation.QueryType;
@@ -10,37 +10,47 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 合同结算规则查询参数
+ * 维修店查询参数
  *
  * @author 科技小王子
- * @since 2023-06-11 13:48:41
+ * @since 2024-03-13 15:31:21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerContractSettleRuleParam对象", description = "合同结算规则查询参数")
-public class TowerContractSettleRuleParam extends BaseParam {
+@ApiModel(value = "VivoFixStoreParam对象", description = "维修店查询参数")
+public class VivoFixStoreParam extends BaseParam {
     private static final long serialVersionUID = 1L;
 
     @QueryField(type = QueryType.EQ)
-    private Integer contractSettleRuleId;
+    private Integer id;
 
-    @ApiModelProperty(value = "合同ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer contractId;
+    @ApiModelProperty(value = "名称")
+    private String name;
 
-    @ApiModelProperty(value = "结算开始日期")
-    private String startDate;
+    @ApiModelProperty(value = "收款码")
+    private String payeeCode;
 
-    @ApiModelProperty(value = "结算结束日期")
-    private String endDate;
+    @ApiModelProperty(value = "经度")
+    private String longitude;
 
-    @ApiModelProperty(value = "所有人")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
+    private String province;
+
+    private String city;
+
+    private String region;
+
+    private String address;
 
     @ApiModelProperty(value = "是否删除, 0否, 1是")
     @QueryField(type = QueryType.EQ)
     private Integer deleted;
 
+    @ApiModelProperty(value = "区代ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer userId;
+
 }
diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerContractFileParam.java b/src/main/java/com/gxwebsoft/vivo/param/VivoPayCodeParam.java
similarity index 60%
rename from src/main/java/com/gxwebsoft/tower/param/TowerContractFileParam.java
rename to src/main/java/com/gxwebsoft/vivo/param/VivoPayCodeParam.java
index d84617a..65019c4 100644
--- a/src/main/java/com/gxwebsoft/tower/param/TowerContractFileParam.java
+++ b/src/main/java/com/gxwebsoft/vivo/param/VivoPayCodeParam.java
@@ -1,4 +1,4 @@
-package com.gxwebsoft.tower.param;
+package com.gxwebsoft.vivo.param;
 
 import com.gxwebsoft.common.core.annotation.QueryField;
 import com.gxwebsoft.common.core.annotation.QueryType;
@@ -10,32 +10,31 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 合同附件查询参数
+ * 查询参数
  *
  * @author 科技小王子
- * @since 2023-06-09 13:42:20
+ * @since 2024-03-15 23:47:43
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerContractFileParam对象", description = "合同附件查询参数")
-public class TowerContractFileParam extends BaseParam {
+@ApiModel(value = "VivoPayCodeParam对象", description = "查询参数")
+public class VivoPayCodeParam extends BaseParam {
     private static final long serialVersionUID = 1L;
 
     @QueryField(type = QueryType.EQ)
-    private Integer contractFileId;
+    private Integer id;
 
-    @ApiModelProperty(value = "合同id")
+    @ApiModelProperty(value = "城市")
     @QueryField(type = QueryType.EQ)
-    private Integer contractId;
+    private Integer cityId;
 
-    @ApiModelProperty(value = "文件路径")
-    private String path;
+    @ApiModelProperty(value = "备注")
+    private String remark;
 
-    @ApiModelProperty(value = "文件类型")
-    private String type;
+    @ApiModelProperty(value = "码")
+    private String code;
 
-    @ApiModelProperty(value = "所有人")
     @QueryField(type = QueryType.EQ)
     private Integer userId;
 
diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerWorksheetAuditParam.java b/src/main/java/com/gxwebsoft/vivo/param/VivoPhoneModelParam.java
similarity index 56%
rename from src/main/java/com/gxwebsoft/tower/param/TowerWorksheetAuditParam.java
rename to src/main/java/com/gxwebsoft/vivo/param/VivoPhoneModelParam.java
index f7dd9d2..83bc154 100644
--- a/src/main/java/com/gxwebsoft/tower/param/TowerWorksheetAuditParam.java
+++ b/src/main/java/com/gxwebsoft/vivo/param/VivoPhoneModelParam.java
@@ -1,4 +1,4 @@
-package com.gxwebsoft.tower.param;
+package com.gxwebsoft.vivo.param;
 
 import com.gxwebsoft.common.core.annotation.QueryField;
 import com.gxwebsoft.common.core.annotation.QueryType;
@@ -10,32 +10,35 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 派单审核查询参数
+ * 机型查询参数
  *
  * @author 科技小王子
- * @since 2023-08-21 00:46:43
+ * @since 2024-03-13 15:31:21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerWorksheetAuditParam对象", description = "派单审核查询参数")
-public class TowerWorksheetAuditParam extends BaseParam {
+@ApiModel(value = "VivoPhoneModelParam对象", description = "机型查询参数")
+public class VivoPhoneModelParam extends BaseParam {
     private static final long serialVersionUID = 1L;
 
     @QueryField(type = QueryType.EQ)
-    private Integer worksheetAuditId;
+    private Integer id;
 
     @QueryField(type = QueryType.EQ)
-    private Integer worksheetId;
+    private Integer cate;
 
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "品牌")
+    private String brand;
+
+    @ApiModelProperty(value = "编号")
+    private String code;
+
+    @ApiModelProperty(value = "区代ID")
     @QueryField(type = QueryType.EQ)
     private Integer userId;
 
-    @ApiModelProperty(value = "0待审核1已通过2已拒绝")
-    @QueryField(type = QueryType.EQ)
-    private Boolean status;
-
-    @ApiModelProperty(value = "拒绝原因")
-    private String refuseReason;
-
 }
diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerWorksheetCheckParam.java b/src/main/java/com/gxwebsoft/vivo/param/VivoStoreParam.java
similarity index 56%
rename from src/main/java/com/gxwebsoft/tower/param/TowerWorksheetCheckParam.java
rename to src/main/java/com/gxwebsoft/vivo/param/VivoStoreParam.java
index ca1aad6..dc84433 100644
--- a/src/main/java/com/gxwebsoft/tower/param/TowerWorksheetCheckParam.java
+++ b/src/main/java/com/gxwebsoft/vivo/param/VivoStoreParam.java
@@ -1,4 +1,4 @@
-package com.gxwebsoft.tower.param;
+package com.gxwebsoft.vivo.param;
 
 import com.gxwebsoft.common.core.annotation.QueryField;
 import com.gxwebsoft.common.core.annotation.QueryType;
@@ -10,41 +10,48 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 派单现场核验查询参数
+ * 门店查询参数
  *
  * @author 科技小王子
- * @since 2023-07-04 01:24:45
+ * @since 2024-03-13 15:31:21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerWorksheetCheckParam对象", description = "派单现场核验查询参数")
-public class TowerWorksheetCheckParam extends BaseParam {
+@ApiModel(value = "VivoStoreParam对象", description = "门店查询参数")
+public class VivoStoreParam extends BaseParam {
     private static final long serialVersionUID = 1L;
 
     @QueryField(type = QueryType.EQ)
-    private Integer checkId;
+    private Integer id;
 
-    @QueryField(type = QueryType.EQ)
-    private Integer worksheetId;
+    @ApiModelProperty(value = "名称")
+    private String name;
 
-    @ApiModelProperty(value = "核验人")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
+    @ApiModelProperty(value = "经度")
+    private String longitude;
 
-    private String photos;
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
 
-    private String lat;
+    private String province;
 
-    private String lng;
+    private String city;
+
+    private String region;
 
     private String address;
 
-    @ApiModelProperty(value = "实际核验时间")
-    private String checkTime;
+    @ApiModelProperty(value = "店长")
+    @QueryField(type = QueryType.EQ)
+    private Integer manager;
 
     @ApiModelProperty(value = "是否删除, 0否, 1是")
     @QueryField(type = QueryType.EQ)
     private Integer deleted;
 
+    @ApiModelProperty(value = "区代ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer userId;
+
 }
diff --git a/src/main/java/com/gxwebsoft/vivo/service/VivoFixStoreService.java b/src/main/java/com/gxwebsoft/vivo/service/VivoFixStoreService.java
new file mode 100644
index 0000000..24d69fe
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/vivo/service/VivoFixStoreService.java
@@ -0,0 +1,49 @@
+package com.gxwebsoft.vivo.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.vivo.entity.VivoFixStore;
+import com.gxwebsoft.vivo.entity.VivoStore;
+import com.gxwebsoft.vivo.param.VivoFixStoreParam;
+
+import java.util.List;
+
+/**
+ * 维修店Service
+ *
+ * @author 科技小王子
+ * @since 2024-03-13 15:31:21
+ */
+public interface VivoFixStoreService extends IService<VivoFixStore> {
+
+    /**
+     * 分页关联查询
+     *
+     * @param param 查询参数
+     * @return PageResult<VivoFixStore>
+     */
+    PageResult<VivoFixStore> pageRel(VivoFixStoreParam param);
+
+    /**
+     * 关联查询全部
+     *
+     * @param param 查询参数
+     * @return List<VivoFixStore>
+     */
+    List<VivoFixStore> listRel(VivoFixStoreParam param);
+
+    /**
+     * 根据id查询
+     *
+     * @param id 
+     * @return VivoFixStore
+     */
+    VivoFixStore getByIdRel(Integer id);
+    List<VivoFixStore> getListByDistance(String longitude, String latitude);
+
+    VivoFixStore getByName(String storeName);
+
+    List<VivoFixStore> listByCity(String city);
+
+    VivoFixStore getByUserId(Integer userId);
+}
diff --git a/src/main/java/com/gxwebsoft/vivo/service/VivoPayCodeService.java b/src/main/java/com/gxwebsoft/vivo/service/VivoPayCodeService.java
new file mode 100644
index 0000000..b60182c
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/vivo/service/VivoPayCodeService.java
@@ -0,0 +1,44 @@
+package com.gxwebsoft.vivo.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.vivo.entity.VivoPayCode;
+import com.gxwebsoft.vivo.param.VivoPayCodeParam;
+
+import java.util.List;
+
+/**
+ * Service
+ *
+ * @author 科技小王子
+ * @since 2024-03-15 23:47:43
+ */
+public interface VivoPayCodeService extends IService<VivoPayCode> {
+
+    /**
+     * 分页关联查询
+     *
+     * @param param 查询参数
+     * @return PageResult<VivoPayCode>
+     */
+    PageResult<VivoPayCode> pageRel(VivoPayCodeParam param);
+
+    /**
+     * 关联查询全部
+     *
+     * @param param 查询参数
+     * @return List<VivoPayCode>
+     */
+    List<VivoPayCode> listRel(VivoPayCodeParam param);
+
+    /**
+     * 根据id查询
+     *
+     * @param id 
+     * @return VivoPayCode
+     */
+    VivoPayCode getByIdRel(Integer id);
+
+    VivoPayCode getByCity(Integer city);
+
+}
diff --git a/src/main/java/com/gxwebsoft/vivo/service/VivoPhoneModelService.java b/src/main/java/com/gxwebsoft/vivo/service/VivoPhoneModelService.java
new file mode 100644
index 0000000..fb67ac4
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/vivo/service/VivoPhoneModelService.java
@@ -0,0 +1,46 @@
+package com.gxwebsoft.vivo.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.vivo.entity.VivoPhoneModel;
+import com.gxwebsoft.vivo.param.VivoPhoneModelParam;
+
+import java.util.List;
+
+/**
+ * 机型Service
+ *
+ * @author 科技小王子
+ * @since 2024-03-13 15:31:21
+ */
+public interface VivoPhoneModelService extends IService<VivoPhoneModel> {
+
+    /**
+     * 分页关联查询
+     *
+     * @param param 查询参数
+     * @return PageResult<VivoPhoneModel>
+     */
+    PageResult<VivoPhoneModel> pageRel(VivoPhoneModelParam param);
+
+    /**
+     * 关联查询全部
+     *
+     * @param param 查询参数
+     * @return List<VivoPhoneModel>
+     */
+    List<VivoPhoneModel> listRel(VivoPhoneModelParam param);
+
+    /**
+     * 根据id查询
+     *
+     * @param id 
+     * @return VivoPhoneModel
+     */
+    VivoPhoneModel getByIdRel(Integer id);
+
+    VivoPhoneModel getModelByCode(String code);
+
+    VivoPhoneModel getModelByName(String code);
+
+}
diff --git a/src/main/java/com/gxwebsoft/vivo/service/VivoStoreService.java b/src/main/java/com/gxwebsoft/vivo/service/VivoStoreService.java
new file mode 100644
index 0000000..ece5c1a
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/vivo/service/VivoStoreService.java
@@ -0,0 +1,46 @@
+package com.gxwebsoft.vivo.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.vivo.entity.VivoStore;
+import com.gxwebsoft.vivo.param.VivoStoreParam;
+
+import java.util.List;
+
+/**
+ * 门店Service
+ *
+ * @author 科技小王子
+ * @since 2024-03-13 15:31:21
+ */
+public interface VivoStoreService extends IService<VivoStore> {
+
+    /**
+     * 分页关联查询
+     *
+     * @param param 查询参数
+     * @return PageResult<VivoStore>
+     */
+    PageResult<VivoStore> pageRel(VivoStoreParam param);
+
+    /**
+     * 关联查询全部
+     *
+     * @param param 查询参数
+     * @return List<VivoStore>
+     */
+    List<VivoStore> listRel(VivoStoreParam param);
+
+    /**
+     * 根据id查询
+     *
+     * @param id 
+     * @return VivoStore
+     */
+    VivoStore getByIdRel(Integer id);
+
+    VivoStore getByName(String storeName);
+
+    List<VivoStore> listByCity(String city);
+
+}
diff --git a/src/main/java/com/gxwebsoft/vivo/service/impl/VivoFixStoreServiceImpl.java b/src/main/java/com/gxwebsoft/vivo/service/impl/VivoFixStoreServiceImpl.java
new file mode 100644
index 0000000..7f97764
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/vivo/service/impl/VivoFixStoreServiceImpl.java
@@ -0,0 +1,86 @@
+package com.gxwebsoft.vivo.service.impl;
+
+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.vivo.entity.VivoStore;
+import com.gxwebsoft.vivo.mapper.VivoFixStoreMapper;
+import com.gxwebsoft.vivo.service.VivoFixStoreService;
+import com.gxwebsoft.vivo.entity.VivoFixStore;
+import com.gxwebsoft.vivo.param.VivoFixStoreParam;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 维修店Service实现
+ *
+ * @author 科技小王子
+ * @since 2024-03-13 15:31:21
+ */
+@Service
+public class VivoFixStoreServiceImpl extends ServiceImpl<VivoFixStoreMapper, VivoFixStore> implements VivoFixStoreService {
+
+    @Override
+    public PageResult<VivoFixStore> pageRel(VivoFixStoreParam param) {
+        PageParam<VivoFixStore, VivoFixStoreParam> page = new PageParam<>(param);
+        //page.setDefaultOrder("create_time desc");
+        List<VivoFixStore> list = baseMapper.selectPageRel(page, param);
+        return new PageResult<>(list, page.getTotal());
+    }
+
+    @Override
+    public List<VivoFixStore> listRel(VivoFixStoreParam param) {
+        List<VivoFixStore> list = baseMapper.selectListRel(param);
+        // 排序
+        PageParam<VivoFixStore, VivoFixStoreParam> page = new PageParam<>();
+        //page.setDefaultOrder("create_time desc");
+        return page.sortRecords(list);
+    }
+
+    @Override
+    public VivoFixStore getByIdRel(Integer id) {
+        VivoFixStoreParam param = new VivoFixStoreParam();
+        param.setId(id);
+        return param.getOne(baseMapper.selectListRel(param));
+    }
+
+    @Override
+    public List<VivoFixStore> getListByDistance(String longitude, String latitude) {
+        QueryWrapper<VivoFixStore> wrapper = new QueryWrapper<VivoFixStore>()
+                .select(
+                        "*, ACOS(SIN(( " + latitude + " * 3.1415) / 180 ) * SIN((latitude * 3.1415) / 180 ) +COS(( " + latitude + " * 3.1415) / 180 ) * COS((latitude * 3.1415) / 180 ) * COS(( " + longitude + " * 3.1415) / 180 - (longitude * 3.1415) / 180 ) ) * 6380 as distance"
+                )
+                .isNotNull("latitude")
+                .orderByAsc("distance")
+                .last("limit 3");
+        return list(wrapper);
+    }
+
+    @Override
+    public VivoFixStore getByName(String storeName) {
+        return getOne(
+                new LambdaQueryWrapper<VivoFixStore>()
+                        .eq(VivoFixStore::getName, storeName)
+        );
+    }
+
+    @Override
+    public List<VivoFixStore> listByCity(String city) {
+        return list(
+                new LambdaQueryWrapper<VivoFixStore>()
+                        .eq(VivoFixStore::getCity, city)
+        );
+    }
+
+    @Override
+    public VivoFixStore getByUserId(Integer userId) {
+        return getOne(
+                new LambdaQueryWrapper<VivoFixStore>()
+                        .eq(VivoFixStore::getUserId, userId)
+        );
+    }
+
+}
diff --git a/src/main/java/com/gxwebsoft/vivo/service/impl/VivoPayCodeServiceImpl.java b/src/main/java/com/gxwebsoft/vivo/service/impl/VivoPayCodeServiceImpl.java
new file mode 100644
index 0000000..e88ddd2
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/vivo/service/impl/VivoPayCodeServiceImpl.java
@@ -0,0 +1,56 @@
+package com.gxwebsoft.vivo.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gxwebsoft.vivo.mapper.VivoPayCodeMapper;
+import com.gxwebsoft.vivo.service.VivoPayCodeService;
+import com.gxwebsoft.vivo.entity.VivoPayCode;
+import com.gxwebsoft.vivo.param.VivoPayCodeParam;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Service实现
+ *
+ * @author 科技小王子
+ * @since 2024-03-15 23:47:43
+ */
+@Service
+public class VivoPayCodeServiceImpl extends ServiceImpl<VivoPayCodeMapper, VivoPayCode> implements VivoPayCodeService {
+
+    @Override
+    public PageResult<VivoPayCode> pageRel(VivoPayCodeParam param) {
+        PageParam<VivoPayCode, VivoPayCodeParam> page = new PageParam<>(param);
+        //page.setDefaultOrder("create_time desc");
+        List<VivoPayCode> list = baseMapper.selectPageRel(page, param);
+        return new PageResult<>(list, page.getTotal());
+    }
+
+    @Override
+    public List<VivoPayCode> listRel(VivoPayCodeParam param) {
+        List<VivoPayCode> list = baseMapper.selectListRel(param);
+        // 排序
+        PageParam<VivoPayCode, VivoPayCodeParam> page = new PageParam<>();
+        //page.setDefaultOrder("create_time desc");
+        return page.sortRecords(list);
+    }
+
+    @Override
+    public VivoPayCode getByIdRel(Integer id) {
+        VivoPayCodeParam param = new VivoPayCodeParam();
+        param.setId(id);
+        return param.getOne(baseMapper.selectListRel(param));
+    }
+
+    @Override
+    public VivoPayCode getByCity(Integer city) {
+        return getOne(
+                new LambdaQueryWrapper<VivoPayCode>()
+                        .eq(VivoPayCode::getCityId, city)
+        );
+    }
+
+}
diff --git a/src/main/java/com/gxwebsoft/vivo/service/impl/VivoPhoneModelServiceImpl.java b/src/main/java/com/gxwebsoft/vivo/service/impl/VivoPhoneModelServiceImpl.java
new file mode 100644
index 0000000..18821f1
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/vivo/service/impl/VivoPhoneModelServiceImpl.java
@@ -0,0 +1,64 @@
+package com.gxwebsoft.vivo.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gxwebsoft.vivo.mapper.VivoPhoneModelMapper;
+import com.gxwebsoft.vivo.service.VivoPhoneModelService;
+import com.gxwebsoft.vivo.entity.VivoPhoneModel;
+import com.gxwebsoft.vivo.param.VivoPhoneModelParam;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 机型Service实现
+ *
+ * @author 科技小王子
+ * @since 2024-03-13 15:31:21
+ */
+@Service
+public class VivoPhoneModelServiceImpl extends ServiceImpl<VivoPhoneModelMapper, VivoPhoneModel> implements VivoPhoneModelService {
+
+    @Override
+    public PageResult<VivoPhoneModel> pageRel(VivoPhoneModelParam param) {
+        PageParam<VivoPhoneModel, VivoPhoneModelParam> page = new PageParam<>(param);
+        //page.setDefaultOrder("create_time desc");
+        List<VivoPhoneModel> list = baseMapper.selectPageRel(page, param);
+        return new PageResult<>(list, page.getTotal());
+    }
+
+    @Override
+    public List<VivoPhoneModel> listRel(VivoPhoneModelParam param) {
+        List<VivoPhoneModel> list = baseMapper.selectListRel(param);
+        // 排序
+        PageParam<VivoPhoneModel, VivoPhoneModelParam> page = new PageParam<>();
+        page.setDefaultOrder("create_time desc");
+        return page.sortRecords(list);
+    }
+
+    @Override
+    public VivoPhoneModel getByIdRel(Integer id) {
+        VivoPhoneModelParam param = new VivoPhoneModelParam();
+        param.setId(id);
+        return param.getOne(baseMapper.selectListRel(param));
+    }
+
+    @Override
+    public VivoPhoneModel getModelByCode(String code) {
+        return getOne(
+                new LambdaQueryWrapper<VivoPhoneModel>()
+                        .eq(VivoPhoneModel::getCode, code)
+        );
+    }
+
+    @Override
+    public VivoPhoneModel getModelByName(String name) {
+        return getOne(
+                new LambdaQueryWrapper<VivoPhoneModel>()
+                        .eq(VivoPhoneModel::getName, name)
+        );
+    }
+
+}
diff --git a/src/main/java/com/gxwebsoft/vivo/service/impl/VivoStoreServiceImpl.java b/src/main/java/com/gxwebsoft/vivo/service/impl/VivoStoreServiceImpl.java
new file mode 100644
index 0000000..b5cb27b
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/vivo/service/impl/VivoStoreServiceImpl.java
@@ -0,0 +1,64 @@
+package com.gxwebsoft.vivo.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gxwebsoft.vivo.mapper.VivoStoreMapper;
+import com.gxwebsoft.vivo.service.VivoStoreService;
+import com.gxwebsoft.vivo.entity.VivoStore;
+import com.gxwebsoft.vivo.param.VivoStoreParam;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 门店Service实现
+ *
+ * @author 科技小王子
+ * @since 2024-03-13 15:31:21
+ */
+@Service
+public class VivoStoreServiceImpl extends ServiceImpl<VivoStoreMapper, VivoStore> implements VivoStoreService {
+
+    @Override
+    public PageResult<VivoStore> pageRel(VivoStoreParam param) {
+        PageParam<VivoStore, VivoStoreParam> page = new PageParam<>(param);
+        //page.setDefaultOrder("create_time desc");
+        List<VivoStore> list = baseMapper.selectPageRel(page, param);
+        return new PageResult<>(list, page.getTotal());
+    }
+
+    @Override
+    public List<VivoStore> listRel(VivoStoreParam param) {
+        List<VivoStore> list = baseMapper.selectListRel(param);
+        // 排序
+        PageParam<VivoStore, VivoStoreParam> page = new PageParam<>();
+        //page.setDefaultOrder("create_time desc");
+        return page.sortRecords(list);
+    }
+
+    @Override
+    public VivoStore getByIdRel(Integer id) {
+        VivoStoreParam param = new VivoStoreParam();
+        param.setId(id);
+        return param.getOne(baseMapper.selectListRel(param));
+    }
+
+    @Override
+    public VivoStore getByName(String storeName) {
+        return getOne(
+                new LambdaQueryWrapper<VivoStore>()
+                        .eq(VivoStore::getName, storeName)
+        );
+    }
+
+    @Override
+    public List<VivoStore> listByCity(String city) {
+        return list(
+                new LambdaQueryWrapper<VivoStore>()
+                        .eq(VivoStore::getCity, city)
+        );
+    }
+
+}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 7645dae..c07eadb 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -3,9 +3,9 @@
 # 数据源配置
 spring:
   datasource:
-    url: jdbc:mysql://1.14.159.185:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
-    username: tower
-    password: FXFZrhHbs3pma6Zh
+    url: jdbc:mysql://127.0.0.1:3306/vivo?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
+    username: root
+    password: root
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
 
@@ -19,6 +19,11 @@ logging:
 # 框架配置
 config:
   # 开发环境接口
-  server-url: http://localhost:10041/api
-  upload-path: /Users/gxwebsoft/Documents/uploads/
+  server-url: http://localhost:10051/api
+  #  upload-path: /Users/gxwebsoft/Documents/uploads/
+  upload-path: /Users/liangxin/Project/JAVA/vivo-java/
+
+wxpay:
+  private-key-path: /Users/liangxin/Project/JAVA/vivo-java/src/main/resources/cert/apiclient_key.pem
+  cert-path: /Users/liangxin/Project/JAVA/vivo-java/src/main/resources/cert/apiclient_cert.pem
 
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 18b5ab5..8ee34df 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -3,9 +3,9 @@
 # 数据源配置
 spring:
   datasource:
-    url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
-    username: tower
-    password: FXFZrhHbs3pma6Zh
+    url: jdbc:mysql://127.0.0.1:3308/vivo?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
+    username: vivo
+    password: 2ZawPZEL8Eh6NCTY
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
 
@@ -21,7 +21,11 @@ logging:
 # 框架配置
 config:
   # 开发环境接口
-  server-url: https://tower.gxwebsoft.com/api
-  upload-path: /www/wwwroot/api.tower.gxwebsoft.com/
-  file-server: https://tower.gxwebsoft.com
+  server-url: https://vivo-server.gxwebsoft.com/api
+  upload-path: /www/wwwroot/vivo.gxwebsoft.com/
+  file-server: https://vivo-server.gxwebsoft.com
+
+wxpay:
+  private-key-path: /www/wwwroot/vivo.gxwebsoft.com/cert/apiclient_key.pem
+  cert-path: /www/wwwroot/vivo.gxwebsoft.com/cert/wechatpay_4A3231584E93B6AE77820074D07EADEACCB7E223.pem
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 724ae45..f2c7c44 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 # 端口
 server:
-  port: 10041
+  port: 10051
 
 # 多环境配置
 spring:
@@ -87,13 +87,20 @@ config:
   swagger-version: 1.0
   token-key: WLgNsWJ8rPjRtnjzX/Gx2RGS80Kwnm/ZeLbvIL+NrBs=
   server-url: https://server.gxwebsoft.com/api
-  file-server: http://localhost:10041
+  file-server: http://localhost:10051
   upload-path: /Users/liangxin/Project/JAVA/tower-java/
   local-upload-path: /Users/gxwebsoft/Documents/uploads/
 
 wx:
   miniapp:
     configs:
-      - appid: wx74f04ad0cdb862ef
-        secret: 4b31d6be04439f1b56042d9bfabd62d6
+      - appid: wx7bdcb7c68d53062b
+        secret: 8d747742fa81da3211da1d504e494531
         msgDataFormat: JSON
+
+wxpay:
+  mch-id: 1671085472
+  mch-serial-no: 5C2A0F9A72DC3F290CC90C9D8B7DB7E1319A964E
+  api-v3-key: websoft_nanningshiwangsukeji1688
+  notify-domain: https://vivo-server.gxwebsoft.com/api/shop/wx-pay/notify
+  app-id: wx7bdcb7c68d53062b
diff --git a/src/main/resources/cert/alipayPublicCert.crt b/src/main/resources/cert/alipayPublicCert.crt
deleted file mode 100644
index 157614d..0000000
--- a/src/main/resources/cert/alipayPublicCert.crt
+++ /dev/null
@@ -1,38 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDqDCCApCgAwIBAgIQICISFUe9Mqj+pWqb2fs9jDANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UE
-BhMCQ04xGzAZBgNVBAoMEkFudCBGaW5hbmNpYWwgdGVzdDElMCMGA1UECwwcQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkgdGVzdDE+MDwGA1UEAww1QW50IEZpbmFuY2lhbCBDZXJ0aWZpY2F0aW9uIEF1
-dGhvcml0eSBDbGFzcyAyIFIxIHRlc3QwHhcNMjIxMjE1MDExMjA0WhcNMjMxMjE1MDExMjA0WjB6
-MQswCQYDVQQGEwJDTjEVMBMGA1UECgwM5rKZ566x546v5aKDMQ8wDQYDVQQLDAZBbGlwYXkxQzBB
-BgNVBAMMOuaUr+S7mOWunSjkuK3lm70p572R57uc5oqA5pyv5pyJ6ZmQ5YWs5Y+4LTIwODgxMDIx
-NzUyMDcyOTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQwLlj0xdcIy4rQLNg73Nl
-zjSqKV7cjE1aieYpEQ/0aNZxVBqm0wxSiXgDR+NjyuD2VadER6caFDhB9bO2lLroI9xHjc1Griwc
-4XAN9JA2kh/3irzQxKCBzrW0/6gpEIIVFSK+reCAmD0vtMTLOIChUhl4OSDYWLpUzFmICa9tRNGD
-hPUSr08JFn2DhXW3eUnOzJEkf4qxn3HIDlKwBb50CJhjkuCIWxKBxRe1oQy2zEd6tezp00xvW4DQ
-OqkSHEW641sUbA7ntckdOF7X5FQGKqKqwrFxTSblixk/mkBxAkIj7dM+k9AqFtrhnzn01sP21MYx
-PPOhddGk3indwe9DAgMBAAGjEjAQMA4GA1UdDwEB/wQEAwIE8DANBgkqhkiG9w0BAQsFAAOCAQEA
-xJXsNQ5rDQBwn8BXYuSaj1Hkw8W3wKRr55Y2fDoQIx2kek9kI53PRvIVAdxlrLxZ6z+lTFrkThJ/
-rsH84ffkDvfSTca3QCB6c01jveQ+qGvGQSx/HPu92DMT/hJ0V8LstLlq6Q1r8hTvcjHOPyE9l3vF
-I0Ozbe2F3TCOFFjtEjHHOw9bo+tB8gtiY/bfidPbTtCClTTyPRTE8MuzQqDABhGl3khL4aue9h8g
-x0i0yAn15VBf9ruqlTrTnhuI5ak7AOwdxjKaMwVbTCy838rQjt4xKMD80h2go/6MLRGidnbeiTU2
-Uq3PVgEJo2kxE8ZSD7x4JtskZD07YCSA5DZtuw==
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDszCCApugAwIBAgIQIBkIGbgVxq210KxLJ+YA/TANBgkqhkiG9w0BAQsFADCBhDELMAkGA1UE
-BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxJTAjBgNVBAsMHENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5IHRlc3QxNjA0BgNVBAMMLUFudCBGaW5hbmNpYWwgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkgUjEgdGVzdDAeFw0xOTA4MTkxMTE2MDBaFw0yNDA4MDExMTE2MDBaMIGRMQswCQYDVQQGEwJD
-TjEbMBkGA1UECgwSQW50IEZpbmFuY2lhbCB0ZXN0MSUwIwYDVQQLDBxDZXJ0aWZpY2F0aW9uIEF1
-dGhvcml0eSB0ZXN0MT4wPAYDVQQDDDVBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9y
-aXR5IENsYXNzIDIgUjEgdGVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMh4FKYO
-ZyRQHD6eFbPKZeSAnrfjfU7xmS9Yoozuu+iuqZlb6Z0SPLUqqTZAFZejOcmr07ln/pwZxluqplxC
-5+B48End4nclDMlT5HPrDr3W0frs6Xsa2ZNcyil/iKNB5MbGll8LRAxntsKvZZj6vUTMb705gYgm
-VUMILwi/ZxKTQqBtkT/kQQ5y6nOZsj7XI5rYdz6qqOROrpvS/d7iypdHOMIM9Iz9DlL1mrCykbBi
-t25y+gTeXmuisHUwqaRpwtCGK4BayCqxRGbNipe6W73EK9lBrrzNtTr9NaysesT/v+l25JHCL9tG
-wpNr1oWFzk4IHVOg0ORiQ6SUgxZUTYcCAwEAAaMSMBAwDgYDVR0PAQH/BAQDAgTwMA0GCSqGSIb3
-DQEBCwUAA4IBAQBWThEoIaQoBX2YeRY/I8gu6TYnFXtyuCljANnXnM38ft+ikhE5mMNgKmJYLHvT
-yWWWgwHoSAWEuml7EGbE/2AK2h3k0MdfiWLzdmpPCRG/RJHk6UB1pMHPilI+c0MVu16OPpKbg5Vf
-LTv7dsAB40AzKsvyYw88/Ezi1osTXo6QQwda7uefvudirtb8FcQM9R66cJxl3kt1FXbpYwheIm/p
-j1mq64swCoIYu4NrsUYtn6CV542DTQMI5QdXkn+PzUUly8F6kDp+KpMNd0avfWNL5+O++z+F5Szy
-1CPta1D7EQ/eYmMP+mOQ35oifWIoFCpN6qQVBS/Hob1J/UUyg7BW
------END CERTIFICATE-----
diff --git a/src/main/resources/cert/alipayRootCert.crt b/src/main/resources/cert/alipayRootCert.crt
deleted file mode 100644
index 76417c5..0000000
--- a/src/main/resources/cert/alipayRootCert.crt
+++ /dev/null
@@ -1,88 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBszCCAVegAwIBAgIIaeL+wBcKxnswDAYIKoEcz1UBg3UFADAuMQswCQYDVQQG
-EwJDTjEOMAwGA1UECgwFTlJDQUMxDzANBgNVBAMMBlJPT1RDQTAeFw0xMjA3MTQw
-MzExNTlaFw00MjA3MDcwMzExNTlaMC4xCzAJBgNVBAYTAkNOMQ4wDAYDVQQKDAVO
-UkNBQzEPMA0GA1UEAwwGUk9PVENBMFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAE
-MPCca6pmgcchsTf2UnBeL9rtp4nw+itk1Kzrmbnqo05lUwkwlWK+4OIrtFdAqnRT
-V7Q9v1htkv42TsIutzd126NdMFswHwYDVR0jBBgwFoAUTDKxl9kzG8SmBcHG5Yti
-W/CXdlgwDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFEwysZfZ
-MxvEpgXBxuWLYlvwl3ZYMAwGCCqBHM9VAYN1BQADSAAwRQIgG1bSLeOXp3oB8H7b
-53W+CKOPl2PknmWEq/lMhtn25HkCIQDaHDgWxWFtnCrBjH16/W3Ezn7/U/Vjo5xI
-pDoiVhsLwg==
------END CERTIFICATE-----
-
------BEGIN CERTIFICATE-----
-MIIF0zCCA7ugAwIBAgIIH8+hjWpIDREwDQYJKoZIhvcNAQELBQAwejELMAkGA1UE
-BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5MTEwLwYDVQQDDChBbnQgRmluYW5jaWFsIENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5IFIxMB4XDTE4MDMyMTEzNDg0MFoXDTM4MDIyODEzNDg0
-MFowejELMAkGA1UEBhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNV
-BAsMF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MTEwLwYDVQQDDChBbnQgRmluYW5j
-aWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFIxMIICIjANBgkqhkiG9w0BAQEF
-AAOCAg8AMIICCgKCAgEAtytTRcBNuur5h8xuxnlKJetT65cHGemGi8oD+beHFPTk
-rUTlFt9Xn7fAVGo6QSsPb9uGLpUFGEdGmbsQ2q9cV4P89qkH04VzIPwT7AywJdt2
-xAvMs+MgHFJzOYfL1QkdOOVO7NwKxH8IvlQgFabWomWk2Ei9WfUyxFjVO1LVh0Bp
-dRBeWLMkdudx0tl3+21t1apnReFNQ5nfX29xeSxIhesaMHDZFViO/DXDNW2BcTs6
-vSWKyJ4YIIIzStumD8K1xMsoaZBMDxg4itjWFaKRgNuPiIn4kjDY3kC66Sl/6yTl
-YUz8AybbEsICZzssdZh7jcNb1VRfk79lgAprm/Ktl+mgrU1gaMGP1OE25JCbqli1
-Pbw/BpPynyP9+XulE+2mxFwTYhKAwpDIDKuYsFUXuo8t261pCovI1CXFzAQM2w7H
-DtA2nOXSW6q0jGDJ5+WauH+K8ZSvA6x4sFo4u0KNCx0ROTBpLif6GTngqo3sj+98
-SZiMNLFMQoQkjkdN5Q5g9N6CFZPVZ6QpO0JcIc7S1le/g9z5iBKnifrKxy0TQjtG
-PsDwc8ubPnRm/F82RReCoyNyx63indpgFfhN7+KxUIQ9cOwwTvemmor0A+ZQamRe
-9LMuiEfEaWUDK+6O0Gl8lO571uI5onYdN1VIgOmwFbe+D8TcuzVjIZ/zvHrAGUcC
-AwEAAaNdMFswCwYDVR0PBAQDAgEGMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFF90
-tATATwda6uWx2yKjh0GynOEBMB8GA1UdIwQYMBaAFF90tATATwda6uWx2yKjh0Gy
-nOEBMA0GCSqGSIb3DQEBCwUAA4ICAQCVYaOtqOLIpsrEikE5lb+UARNSFJg6tpkf
-tJ2U8QF/DejemEHx5IClQu6ajxjtu0Aie4/3UnIXop8nH/Q57l+Wyt9T7N2WPiNq
-JSlYKYbJpPF8LXbuKYG3BTFTdOVFIeRe2NUyYh/xs6bXGr4WKTXb3qBmzR02FSy3
-IODQw5Q6zpXj8prYqFHYsOvGCEc1CwJaSaYwRhTkFedJUxiyhyB5GQwoFfExCVHW
-05ZFCAVYFldCJvUzfzrWubN6wX0DD2dwultgmldOn/W/n8at52mpPNvIdbZb2F41
-T0YZeoWnCJrYXjq/32oc1cmifIHqySnyMnavi75DxPCdZsCOpSAT4j4lAQRGsfgI
-kkLPGQieMfNNkMCKh7qjwdXAVtdqhf0RVtFILH3OyEodlk1HYXqX5iE5wlaKzDop
-PKwf2Q3BErq1xChYGGVS+dEvyXc/2nIBlt7uLWKp4XFjqekKbaGaLJdjYP5b2s7N
-1dM0MXQ/f8XoXKBkJNzEiM3hfsU6DOREgMc1DIsFKxfuMwX3EkVQM1If8ghb6x5Y
-jXayv+NLbidOSzk4vl5QwngO/JYFMkoc6i9LNwEaEtR9PhnrdubxmrtM+RjfBm02
-77q3dSWFESFQ4QxYWew4pHE0DpWbWy/iMIKQ6UZ5RLvB8GEcgt8ON7BBJeMc+Dyi
-kT9qhqn+lw==
------END CERTIFICATE-----
-
------BEGIN CERTIFICATE-----
-MIICiDCCAgygAwIBAgIIQX76UsB/30owDAYIKoZIzj0EAwMFADB6MQswCQYDVQQG
-EwJDTjEWMBQGA1UECgwNQW50IEZpbmFuY2lhbDEgMB4GA1UECwwXQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkxMTAvBgNVBAMMKEFudCBGaW5hbmNpYWwgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgRTEwHhcNMTkwNDI4MTYyMDQ0WhcNNDkwNDIwMTYyMDQ0
-WjB6MQswCQYDVQQGEwJDTjEWMBQGA1UECgwNQW50IEZpbmFuY2lhbDEgMB4GA1UE
-CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxMTAvBgNVBAMMKEFudCBGaW5hbmNp
-YWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRTEwdjAQBgcqhkjOPQIBBgUrgQQA
-IgNiAASCCRa94QI0vR5Up9Yr9HEupz6hSoyjySYqo7v837KnmjveUIUNiuC9pWAU
-WP3jwLX3HkzeiNdeg22a0IZPoSUCpasufiLAnfXh6NInLiWBrjLJXDSGaY7vaokt
-rpZvAdmjXTBbMAsGA1UdDwQEAwIBBjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBRZ
-4ZTgDpksHL2qcpkFkxD2zVd16TAfBgNVHSMEGDAWgBRZ4ZTgDpksHL2qcpkFkxD2
-zVd16TAMBggqhkjOPQQDAwUAA2gAMGUCMQD4IoqT2hTUn0jt7oXLdMJ8q4vLp6sg
-wHfPiOr9gxreb+e6Oidwd2LDnC4OUqCWiF8CMAzwKs4SnDJYcMLf2vpkbuVE4dTH
-Rglz+HGcTLWsFs4KxLsq7MuU+vJTBUeDJeDjdA==
------END CERTIFICATE-----
-
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIUEMdk6dVgOEIS2cCP0Q43P90Ps5YwDQYJKoZIhvcNAQEF
-BQAwajELMAkGA1UEBhMCQ04xEzARBgNVBAoMCmlUcnVzQ2hpbmExHDAaBgNVBAsM
-E0NoaW5hIFRydXN0IE5ldHdvcmsxKDAmBgNVBAMMH2lUcnVzQ2hpbmEgQ2xhc3Mg
-MiBSb290IENBIC0gRzMwHhcNMTMwNDE4MDkzNjU2WhcNMzMwNDE4MDkzNjU2WjBq
-MQswCQYDVQQGEwJDTjETMBEGA1UECgwKaVRydXNDaGluYTEcMBoGA1UECwwTQ2hp
-bmEgVHJ1c3QgTmV0d29yazEoMCYGA1UEAwwfaVRydXNDaGluYSBDbGFzcyAyIFJv
-b3QgQ0EgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOPPShpV
-nJbMqqCw6Bz1kehnoPst9pkr0V9idOwU2oyS47/HjJXk9Rd5a9xfwkPO88trUpz5
-4GmmwspDXjVFu9L0eFaRuH3KMha1Ak01citbF7cQLJlS7XI+tpkTGHEY5pt3EsQg
-wykfZl/A1jrnSkspMS997r2Gim54cwz+mTMgDRhZsKK/lbOeBPpWtcFizjXYCqhw
-WktvQfZBYi6o4sHCshnOswi4yV1p+LuFcQ2ciYdWvULh1eZhLxHbGXyznYHi0dGN
-z+I9H8aXxqAQfHVhbdHNzi77hCxFjOy+hHrGsyzjrd2swVQ2iUWP8BfEQqGLqM1g
-KgWKYfcTGdbPB1MCAwEAAaNjMGEwHQYDVR0OBBYEFG/oAMxTVe7y0+408CTAK8hA
-uTyRMB8GA1UdIwQYMBaAFG/oAMxTVe7y0+408CTAK8hAuTyRMA8GA1UdEwEB/wQF
-MAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBLnUTfW7hp
-emMbuUGCk7RBswzOT83bDM6824EkUnf+X0iKS95SUNGeeSWK2o/3ALJo5hi7GZr3
-U8eLaWAcYizfO99UXMRBPw5PRR+gXGEronGUugLpxsjuynoLQu8GQAeysSXKbN1I
-UugDo9u8igJORYA+5ms0s5sCUySqbQ2R5z/GoceyI9LdxIVa1RjVX8pYOj8JFwtn
-DJN3ftSFvNMYwRuILKuqUYSHc2GPYiHVflDh5nDymCMOQFcFG3WsEuB+EYQPFgIU
-1DHmdZcz7Llx8UOZXX2JupWCYzK1XhJb+r4hK5ncf/w8qGtYlmyJpxk3hr1TfUJX
-Yf4Zr0fJsGuv
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/src/main/resources/cert/apiclient_cert.p12 b/src/main/resources/cert/apiclient_cert.p12
new file mode 100644
index 0000000000000000000000000000000000000000..c561841b0faa5f31ce3bff6badafae2835e6dbb9
GIT binary patch
literal 2718
zcmY+Ec{tRI8pnS#Cd_DtGGrMBV-Hyp#?r`=eQC0XVM39zXHO$!P4*0vwa_>S8H_Ah
zCM}ZeCX&MGWGVZ4o#(mto_qiJKJW8>zVGw?`B5an^1&b$MH1{PD^xb#D1H+TVgnVC
zU^WmE%=!qME0Q1s|5U6+BuK{*qJu%e(P;dq0V$$bVgLSc9K@=KfUr*iB;2V>Qe$8+
zI}k&H+&?yZl622OL7Z*qhl8@NMX8qAuQ)4a1Q6ZT&QMNnvKC&jjW}G2G;(V9b6kOX
zMQXW@z~`nQel&QNPnYij5Uv>+AvB=RLhp!n%zvSAL4(2QHw^rCBE*Pw#dh}>EUr;D
z^8njr_ed{8Ra%Z$!dR;g`*=by_d~^reA7i+&etkIloz^W9S4ZS=rpM0{&0x7#EF5`
zwkxO`@gL-NU}Af?RLS6R8*`!h%_}+UwrKXWj?I;XzN?NH+JnN3q-W*Z4h{xbWBL9{
z(=Yg*5+5DD#F@_B+HSQ7Wsq2z?l+YtoMgREihW49r&iu{C_G2MROn&s<*Lz<d#leH
z)6!gK$qyCs^f$Ax(T239=;v2BwPtr~I>O2et0hOO`q{;XqQlA4MfS3M2|PHMz2(Is
z4m3cyT7tZwt{$HDs_{d1ltB0R4zIA@NU0-_Oq^iYPEB)`y-C`}1lLk0=K>?hOHDAW
zV57IYJahdS%L`TyZ}%9A_@=yQqm8gTZw^_#uv2L|w#z;wZbcl?xfN9H0rGPHy~pp(
zy1s>cskn`5qKIWzEDgnZP%)%e@-&WX2q<da#c7|mk-%^LTU<cR($JEhuv7T#7fb!4
z$KH@}ti(h_fz(f{Yy{4DGc_7$y_mn#$U$i(fh9xPeppjVH*(mkDW;-wKb$Zzr5#$V
z91cpc*Z`sCTrN_KZMR?WR=}UxwrN_F<`QxI8;t^IYRWHl#MrBj1e^~6Zh_u&)PqCD
znpf-2vmu{I$0g%art?0kVm)o{oolAHaoPQhdn`Q69a}jxx;AMY+`<{QPzHf<FUdR8
zp_T`j_$PUoaa)^levbxAnH}w(ed(qsp1Q?cv!@o@cn_`Nu}dmt1!Sc=)u_}cT|sE~
z^25=|=DoqMr8NBWc00RpXKll@LHJ|`zR9{mx5K+-ZQ!}3PV7?Dg#+Z8KJA&fk#z5$
z>?VV=X8kYpjVyT*ajO&pE7(bcA=LS9%-{GX-#|FBO1<fYEEH|uEwBO*I&e+YY--t{
zBFn7L7ajhX)QoB@T^Yp5nAHt&;{6<jHJE?LaWawU?c)Y`+8ZVG&Sk|`JfMJ;0*#ry
z?buIkiJ1@Z_qb_Xn&$>9EZAn&(3M<kULIVSgXlpO;HlMW(!==@NY^bc_3<}*Aih=e
z=Pa%kQcKZy&u9~V=LU>R{bX+V4%5EpC+_4=F{c&>4WRbBZpLs}%UPpbA5cfLBfPpC
z*^^7Q;;*aPh<gK>L|jPL<S_j1;b7D-0dF_q%g(;`&1|N@N4E@-j;}*guyb46qlbU2
zNH!-FmbEat?#f-2Qq~&Il)nNNBP^&7E`Kq#du~NdGwOzZax@iv(5u}teO-k9R2qeU
z#>#auV6G?EkEn}Kp)q9MIG=eJm>$H)=61lNV#i7lsOv={9lVp<La(n_Xy%0CbniWc
zSA^2R(rPOJFYZ^*&}umO$zgL=)r?;lKLeFRhykqS#d2o4wyWX~(V<CV-z&(207I5T
zFo;9X(<C{|TbjcfXRk;)7V<yhDk2^8f{>08kFe`eoLD*jqcIo=eB`^OBhmf&e|BT}
z+iuHC3eHQn-8}xb8-xU56w>>)%0I9yIjzXs<@Ab8$$h3@Dx&?~ZFVwu$!bFJFAcgu
zd(>**HiRF5G#ezZMR5#R&ofI>d9+4f7IbkjyPM0H5wAvIbE-(Ie20(mL%OO+ib`K>
zno4aje3eCM28o>W8}t2aQg-f2Vz=1Bgqz;2$FM^4%5{S{M21cHazqXEG}nys6Vv0z
zqE8W@m`Qs9EAFF0IH7Dwcd|g?ZH+paJ@X8V_G>d`|JeM<Z(=OmL<-@qxd0<rWs90c
zSdOQ6ubr2CO>f;D_Ajh&2`U^DMWGCwe3E<THAvrrvrm8S^RMr}gFf$KGMVJhf9pCX
zDbUSOwed$s;h<P(-suPXdHG#+cO)Tu$l4Po#jR>^nKTf5wnb%YVYy1e0G+IP$+T0r
zbZy{p|As&<r1m+3od7eT6wpv1nJ0YXl;<y>u_@uphGH`Wi+;T|MYsz0G@SStQdvKU
zF4Zs<^GR{CE}o7oYup#|C^}TxRHml6a3_W8={FmWMb&4v%egg4^)$Zw2sN#}^{Rgv
zf3R^=(iVObWmr(6nF-0<ycnSVo!nQxJ3kg3v)_7p9T&!}(PPl~`%a&kEHSjfNO~++
zL*x$I$k#akEz>|OCIg-Sld~<!t3RruQlq`Wmk~YEX?1ID*{0=k{S6GR3H<c%K+5<}
zt-ngz<lFk&$SkrnB>Nxh0+)X_k<{sp5pqN85>Lv0e4*wO?L$^lV(c$qf7RUUYy&yS
zX*2t)z+~DPEKd@sZ%=dJX$(HaF#h5G%LsJx%8fkcu&1N9GC?o!E5&N)-u)nH+qL)d
zD{V7WDuORzZ7Xnf={w)RryiBL#|xX_E!iOU=x%b)aX?Zvgs1%VI>kbu{k_&4OxX8s
z4CGPUwt?mPtcls;#Q_$fO?XPC4r5=a;rzt4^iPuR1Hno9&T8zHZ3<Og$BVB|yu4jJ
zl)t^WzIDmndoIiF=16nV$hGll&nZSy<4aL-(Bw&`P_colNI>EH$yNHcaYja_FIv~^
zeoOQ3OSd0k0s>q&Vtz1*=g%^0%w8vOr_M_YKPU*fGJ3obQ-SP^o`6URsC+o}?W+iT
z-)dka;uNvyEwR^~5CuM+{Iy($O*RFSm@s$Sc_Gp)m0&%c-Lb5Hi_W1%oe-jtZ%T*_
z?*C<uyNcKTDHxoeu4)t@D!>>1Hseg<fQlif9ovbs?@@uD&dc4;=YzVSJCk)htRnuP
zuNf#Qpk8%*W730JrG(_-`*Iv);Bb+*jEUA;nUL&3KH{l2Op&u%+c#tc6s&l0YO_*j
zEB!J?H8Unprw2Lvvyx2i^4(Wsv!#lXhehYU3!XQU0b#f`#+quUbzt*L8u3MU6BpHh
z;&{1Uy+~c;CB?H$nO2@!?@u4_>Hd~7SEa#m4LVcAmp<pj62DC#^oPrCZqge})&qoj
zTM0D`e$^p&xz$}F&ZUlAKqReZ{FTaoyEp}%)Mg$>D>l3kK>d98IA;-6I7GPSqh@bu
z^|jOtg|@|aPhIRj#_&8#cU(;K@zrKNdS8>@#*lhwX-V@C)owi)YBCl0dhQ3_pHa#a
zR>i@*Zh8)cV;k|#domUgx7NG!VU_^M&$Dp8-8>m~=z6knmd(qtPF5W5YGtA1sEGNm
z9ico*ybz>wG*{glPu)X4cdf@~zh7&We$RNLsPfMdQb|%+9Jma405<_YzzqlkL;$^`
zEdU4tt^=M&As*2nz(Y}9QB)Didh9fU1uSq3fFK9(t5e(u)o8BHfMKftV+Cnni4h1p
N|LpHgN4M+1zX0Zq<>vqZ

literal 0
HcmV?d00001

diff --git a/src/main/resources/cert/apiclient_cert.pem b/src/main/resources/cert/apiclient_cert.pem
new file mode 100644
index 0000000..6880e1f
--- /dev/null
+++ b/src/main/resources/cert/apiclient_cert.pem
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIID8zCCAtugAwIBAgIUXCoPmnLcPykMyQydi3234TGalk4wDQYJKoZIhvcNAQEL
+BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
+FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
+Q0EwHhcNMjIwNDA4MDQ1MjAxWhcNMjcwNDA3MDQ1MjAxWjCBhDETMBEGA1UEAwwK
+MTYxNTczOTM4NDEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMTAwLgYDVQQL
+DCfljZflroHluILnvZHlrr/kv6Hmga/np5HmioDmnInpmZDlhazlj7gxCzAJBgNV
+BAYMAkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAKp/F0BGSkAlJYZz19iGg0sKrF7uHxZhBxaO1Jxbm626HkhahF+B
+6GG5qKbFyw9eNiZjrGz6q71ScHfAUN/5AoE/Ae6TSnFMUDsXSaG7VCYUlgo4P+BQ
+nUCtsGfqJOLKNkcvkyoO2GUHulJALe62r9J/MQdvB6YjOY/XCP2sz5ww2GWJW0tS
+M3IYPz1DwYWxVMnOnQhUChruUQymj37rXKqyz/pRWluzCKxB36lO3HsVBTKjn2x2
+9Y/hXCNOueRGfoNzJKdr8Nk8Kd39baRF5Ru8PXvcdBQFEQT/ilvoDs+RuNvJWIed
+Ax0T416PJMJx/3hi/Tn/BobuHZZKkHmq4HMCAwEAAaOBgTB/MAkGA1UdEwQCMAAw
+CwYDVR0PBAQDAgTwMGUGA1UdHwReMFwwWqBYoFaGVGh0dHA6Ly9ldmNhLml0cnVz
+LmNvbS5jbi9wdWJsaWMvaXRydXNjcmw/Q0E9MUJENDIyMEU1MERCQzA0QjA2QUQz
+OTc1NDk4NDZDMDFDM0U4RUJEMjANBgkqhkiG9w0BAQsFAAOCAQEAbl5p24AlmfVq
+ppjO+EuQ2/3B94ThjKd6tx9tXSTbwHoBzYHF+qR/k2uflECJaSOs/az9iegTDSal
+oJ+mK+OHxlvGKNlDtff22KYDpeO0FRrEP5x5tOVpvd8n9t3aGG8r90I23yoxAy0A
+dDzzysHaw8d8CmV4UfbDR368BzlWEDByAWbu9kE4+4/A/0MmTZuivUEOvvNG5JBM
+kU/P5eKI8MNZ/RrriuW7vCaODI5QVYNwc7lBZyolEjFyPBLfyXL8XbmKMjTd+zEE
+4wmktem2hJLrMb7Q5A/XQmFFyk/JtcXbQCDFeA476xQ92w3pmJ218D4iolThzed6
+CpV7eWJ27A==
+-----END CERTIFICATE-----
diff --git a/src/main/resources/cert/apiclient_key.pem b/src/main/resources/cert/apiclient_key.pem
new file mode 100644
index 0000000..88e170f
--- /dev/null
+++ b/src/main/resources/cert/apiclient_key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCqfxdARkpAJSWG
+c9fYhoNLCqxe7h8WYQcWjtScW5utuh5IWoRfgehhuaimxcsPXjYmY6xs+qu9UnB3
+wFDf+QKBPwHuk0pxTFA7F0mhu1QmFJYKOD/gUJ1ArbBn6iTiyjZHL5MqDthlB7pS
+QC3utq/SfzEHbwemIzmP1wj9rM+cMNhliVtLUjNyGD89Q8GFsVTJzp0IVAoa7lEM
+po9+61yqss/6UVpbswisQd+pTtx7FQUyo59sdvWP4VwjTrnkRn6DcySna/DZPCnd
+/W2kReUbvD173HQUBREE/4pb6A7PkbjbyViHnQMdE+NejyTCcf94Yv05/waG7h2W
+SpB5quBzAgMBAAECggEAN+7RtehZW4nUMbO3T/VxBSFPQyVjVXgnVyMsZM8411mD
+rcDkRGDd15GM3oltAHGr2hRA8M+bn9R3yRFydse+JqCBBb+UYG7ksz4EjeZiyMtg
+HaIucmx/6kQQ50ZNK4mjHN9irB2KqDpMycb8Sp/sNmY7s3CdVcegjqvA61fSFC74
++w2HEDm0b2tDb0nU5v1BXsVL1i+kRqIpK9s7IrErjJG5YCn1ttqvtRTRZaWkgAkw
+WHHtK30r1Stc3QYeGkO2Cjjunv41eSvrhcBSHSuQPrzJa6BkX6Oe1JfFeQ/4Spyc
+eYcsRBBV2YNklsCwFVPhOA176EeB8iJ+c6FtXSwk4QKBgQDRVicrl0qd335ocrw3
+4eFfB1NTS8AnL7B1HbG8ryWNGTdRLRnF6Faz1xlSf6qq0s8DCc8cjsDRGDJ8tTWC
+s8rxHvX7Veih6YUkVl2QaYvxfshgbHtOZ4jOpFkJSsb+OTI6zSTTwUBwhOKq6al6
+UMN+Ll2RF5GxDlF/iDFsFyJI7wKBgQDQgISAOJ3XqrRJQhuofjVO0tV22K8yDKW8
+51TCEkHzOIvCyrNj3Ee5wkqfnOmP8Mpo02f+302PRN+qy/AHINbNwy94YbJPwOFO
+kjMhmvZf5D1BmQCnLHYuXww2eMAUCJLxAWgChYhqR37sm4IW9s1WbMHi8fLnVfsm
+3WBVgYV4vQKBgA/jSAnI68LbqY5n1t0u6Zn6xlo2D5lpxyy8WjcF3AW/ejFRCPm6
+TopLswJN6jgY09lZLzztoLi962cHoc4Ps0FlpimzNXrEbHR7kZJaUGK9ypt24Ezt
+ErcMRi2sXToCQUuxMjBYJHnlvAZYwaIk6xFyl2thrI8RlSHmxkl74ABFAoGBALO7
+dXzKUVZN8qeL8yel0/Ik0JpoY22zdVOH3oqFDpDJV8EM1uLoSnQYxhcdPkE0gmcm
+hekxOTydVGl472pVppUtAki1fu49CHugj68SU/uJVjyr1eJF84I5sN9r67fZREG4
+wp4Z2eQzyXfQ/a0qBwvPKLuncYp1ldCE2LwcsJ/JAoGAecsQKQFx5+apuPHTBihi
+MhiZEdO+5wLJiF+X8S78zCH3kvQhGvQvrUncBaKG1pOMJw+ewrJDtL4Y/++17gPL
+chQuScdIwG72lMWV4T7AItu0YiM6I+UZA77FADpX1icWfd2s4QKJTgpJiZYJMuNF
+OAN6OLXWbQZlD5CPVjS4wK4=
+-----END PRIVATE KEY-----
diff --git a/src/main/resources/cert/backup/apiclient_cert.p12 b/src/main/resources/cert/backup/apiclient_cert.p12
new file mode 100755
index 0000000000000000000000000000000000000000..b597ba5cd05ab98b564a7849c499caeb94c4158c
GIT binary patch
literal 2774
zcmY+^c{~(~76<T|F^d_prOCd8u@pwcL=++<WY5lI$!;*X5k^g}buQT&TiN%0%Ti=#
zgph1S6tZO*>*Tqg&wKB__s991&-tD6Ie&i91jHx^NQWjM(xGq(q84%g91sS~CLm(L
z1jL_b@iR050{dqL%_e{k&;;-<2naZ9>;G(kXdWoy-yax(P&5;mUU7d>;&dr34+NqI
zgb~2+sDZ(z_Yy>Pf)ry*f>;)7TRzu%9nP=0G|Rs5mpp;xtir2>E^u|-+qKAT{<O_c
z`rXKqdpQKI?jSQlA6MJ6TPoED<}q2<g>~H9M6&^nw9zEK>~$hGGz!-WZqu8J=h)$_
zbY{9F)2A$7AOQikygz_)UpL!Zjv1;SJr}l{7LsuRBO0hr)88@Um`v5^iYaP7Wo{Hm
zmp(BV|7y(HpEUB;DU<Q7ly#4?Z7m>OKN1^?MzInPw3Si{>O;*?S!oRub%ZFJP)f-c
zAzS6}PaELk@=HIQ#!qUPLP<BW0>@5{yCo&zk;N^EF8sIcW*c4*R_Dz*!C9j<EZk$E
zAN?Mb?>UYln;s~iwsR@+lhPRI)WNDt)uR)ocG)2nEXVagj9LYDkf?S0fj|6~?t+dh
z!{{O#ri-A$meoo;yu-HNV(4alIO8FBZ9=PuQECl6QKBZW>Y<nDE&vEU{h+U7?MlEc
zSknwdYb@_$@sHiu+*&{xM>M|fp6d{mcF>w%#wBYh{a@__b>y|bc)Ncq?~FdM9P9=<
z*VT!QyDV98C#rvhj5-a%6M|P0in#YXLr$l3C;B)2D8eV6^PZ)1aX0(!VKJ^J@=vyb
zgu0H&QV!2Bjr~0&6{Q8kkb)9Tts+z|@|2<nz{VUo<gjjfUX1>0dvHiUodU}d+x;JR
ziIV27Mxx;st(uXAhy2sch&Q``WZp`-#O^x`k|M==e>sHr89NDfxhYMwc?YVd*g?^P
znO~GsMwV`pcuXu512H%T>I&nn=a==29)^BlQE{BA&;HS@;=ekQx)@>s;$)XL%%}Nz
zG1anjTX;J`ZM6U>)Jr9kL#3MBCNEVUdj>W0u`V8#hqQMOfr`;D->*Tm>^!I#ld>hs
zr}?oif8}Q>{<9v>_kcHxVxh2Xo7cWG(8J&C3K?5J$_Tzq-<G00^RnG^zdx$(-R8G@
zS7Bc!J{=e}T$sf3<qa8tXvm~rmuMW;)P{^0@bUi|Hm1(~{vO?D4w#bDOMADDboJt}
zf}>aho^AVW5f#dpE81`xLCERkEWz1cu}T0w($)#;GzP=&j+)-%v^Q8X;x0e-J2l})
zu^$qsq!emcna;Y_tOC!DSXr6}xE;Ak3-1K;CCQ*Nv^F{wC&1|EsHev}j)o0)YFJDa
z<GGB-na9#wk3532JG{WP5}=g)REySpIg@wA0dugqflBcs%(vDlX+0}NV%v4v?y>;d
z!65;E5Y4KM;iy&(vAB2nsJuGW!E)j~OiVa3sMp-HME#{hWLk3-udat&Ux6X<f;9BJ
zv(CWh;$Wm;asaM0;}ytgEcK{+_-C4OYXnZSv@WdvBu%>n35KX8K<Sh1v6Iu?hBdGH
zI-IUk<hiXF@$I0yj3H7l$K!Pc;`H&%k_fXv5kDHfosFX%CHzM{c#!_a%J+adtWC8v
zSH`Z|SM<xcu&Vmf6P2Cj(u=I#cO!v@1|dAJ2ODd-nU(g;qh2|v5bX1?L;#iKbG)Q1
zQp2p@<8-35*@QGw_~?Rj4j{w_M7J3sC8AGQqR2mpZ&$Na>e9)EMJ^ej^oWO&$u!XU
zQ{(*!1L3y&w)Kw8{pk&Fea<Mv{||WC1c)=30KuNcwr6DtW%v(&2q5Up$&E80SN~5%
zy1!K%vSpJ@61Q3TTSYJd+^f!Qn>Q&vDH{ulyESsrsYSEQR&VY5<D3%IN-l`+0=(DN
zID6%ag23aks^DX_UWVAU8tT*U2?$6pk`5JyHh%<^ITfh?X`jmA_}~MR_%KglBFxac
zKJE|A`1LN^ICAG3PN^Fev~V;<Z=>S8*P|=w`8JW*)>(<^V%(>)*dT|2jWB($Ux(2F
zafwBSV#f7PM8Za$9mCUKAB!JW4&`f5hQg$ymt>gBF*2l!PMzcni%R(=DLzNqm25{V
zx8qWi9Z31Oo3S5m2lZE7ZimbS^7|HI^sQ6g553?O$RmBGdr!^kOEL{;;_xVVRI!@5
z-k3k?(Vdi+uYq&!bao5x=M)(B^OybT(Eq2roUkm`odcVpkY*j(=;}Up#0h47Of|Ei
zhM5MxQ2bq-4ni?%zF$rr-%g6y!_K82a0jS~cc}@9<&IriaeR}d5M+6!JX-w`{MVZ;
z;LvwW*?hr1&D!u>Op~!20~er2o=whrO2DjK_(?Heu9exrd<%2Yx`@GQ2a!~QJ^zO*
znMbaAMzruK9*KB>hfc|S;1KiaOGSU66j=t~_apB#ZnLANjHH@YGr}xC$6xZSOzd{g
zBTHQkuN7ZFezG2x81$#j+}(Cbm~D1D`lfTWUuJBFxNh&~GP7mo>Hg-Mn7*n|;Su#^
zNt*X*rppE_XDr}mbi&Xi(sNL5j>nlX7xF^=4o5*5gkyz=%~QW>$aq?NRjc)LvQ&hM
z7ig!WT9pbMu*(`xU_B1S8WC2*$u*{VN|+c{c6(r*s6q9eg51Yz549kUBjLfSH?nDT
zK?FG?N)3s*{I5gUA}`8XjGm`=RN#=m$OmN7x2Ip(mrELH;+<>U`tq};VZp9C$fQ6#
z6p|J|I}jruU>1hbT-*hG%_2`)7W?O`HhP`1?CBmqU)Y|qpKT&<x8&dh`@BU=G)?^o
z{sxN_jU2}`%RY!0)o5K5)}ZE+D`G>(+Oz?jGr}S4DLG?<o4&T0FfiAviJoZN71fxI
zV@}pT)x?j2jpVO%=d8vo%cPVmx2kz0mofXtXfyMN{?yv-{oS}-*BccG(Q+;i=1rY0
z`&8?xu4T1vZV*2FLpXwWks>5EuDW<5H00?EW>RBk&t2VT<g1zA%xvQ&E}UfLkIYk+
zd`IxmwY(>_0OVJji_bn5zA&9clL+xbLx2%7>5G{5olQ-Oq8h9dhG>AFTW!UNQ+(y;
zxf5n)#Krw>x&?1<R{9KI#1G*z&HJxIf81wMP9h&k>f|*_mMBHe4y!MFcR=<qpk{Mf
zjs8myBUU?q74P^G=O?=GbT~-$!t-)tZ~41hGi+>apudtupO#)tMnvTJks1s)KQwqf
zdWv6^V;Qg+mrWn>D6mRS^Z~@{_0N?Id=9bZr|{?Rex#?VhCbsqIyL<&=*$}X6m2<G
za}BRsqX)+?KfNs_%M|`Id^x_`o0?T#!T*M=IvH^13hVGKcVzmsbRb97wc0Fq-m5~a
z^EGzYpJYSN#}FQ*ia=fAJ<pdsb>^((P>5`o^Ys&>?zSi{=ENS46X5$cEyOjG7RJo{
z5gWeqV2aSpfsdz-(QE{*@GD>Q^G)lY$T9~J=$4B7w%*s>1<|Adu|7bRn2ZHl=)XF`
zFUTOl>_4Ge;`dc-BYO5!KW=GiY~V7BX3(<#9I?xw_=Ew*07rl)z#Cu>2m%NI)Xydy
zzz^^U;B;2lv(yjZh?YbPqTx`;WhOch7X$!iziUG0b1vPcUSecPKkA-NsW$jz9ZbJ-
LKx`6qPE!3BJysGA

literal 0
HcmV?d00001

diff --git a/src/main/resources/cert/backup/apiclient_cert.pem b/src/main/resources/cert/backup/apiclient_cert.pem
new file mode 100755
index 0000000..a2c2df2
--- /dev/null
+++ b/src/main/resources/cert/backup/apiclient_cert.pem
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIEKzCCAxOgAwIBAgIUY2ZU9GvIGE/T4LjKpdDlRIMEIaswDQYJKoZIhvcNAQEL
+BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
+FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
+Q0EwHhcNMjMwNzI0MTM0ODM3WhcNMjgwNzIyMTM0ODM3WjCBhDETMBEGA1UEAwwK
+MTI0NjYxMDEwMTEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMTAwLgYDVQQL
+DCfljZflroHluILnvZHlrr/kv6Hmga/np5HmioDmnInpmZDlhazlj7gxCzAJBgNV
+BAYMAkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBALb2qbByODjQWx8Z+eRmwO3YqwzoqbeTeVL53/zJY9MfTZKOX8Xd
+giOWM7nUE0KlFsB6Yc2tAEvOTz6baTywyKPzSIbhdDvqYjr/KJ8VLJyPEj7d4z8p
+5RjkwEMBs5dX0UxtS0zLyKNtWOXsiw+tTMoWCbFZCcaA6JNqw9Us6yo1JXsCJQcb
+fwU9AMML+CQRqraZ8NkOIKVis1yfMnPuEoWP+/wmpit3/PJuQkXeFlRS7U946xiu
+FexzLhFTmX/vR9VLbegn3ewmhEiAlZGHZn/9q+mQT7j4g8k063ccFr2kXrLepJQ2
+zyv07lznpCOdzsvVm2cJHvRAI/UKQqWwDuMCAwEAAaOBuTCBtjAJBgNVHRMEAjAA
+MAsGA1UdDwQEAwID+DCBmwYDVR0fBIGTMIGQMIGNoIGKoIGHhoGEaHR0cDovL2V2
+Y2EuaXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJD
+MDRCMDZBRDM5NzU0OTg0NkMwMUMzRThFQkQyJnNnPUhBQ0M0NzFCNjU0MjJFMTJC
+MjdBOUQzM0E4N0FEMUNERjU5MjZFMTQwMzcxMA0GCSqGSIb3DQEBCwUAA4IBAQA4
+/45dk0japlJEgE6p0LoLrYU8m3cZgth+XJGVmf4PfqYX25RayIIwpwiNXUvwul5H
+nW+ePNhuZqRXTVZsrsyG+Id/r46HDUu8zFsm3Bp8PpU2EazJiJgzNNxQxVPrM06m
+CU/zwLmFsyLyNL8VedGErFWsl2TI+Z6cD5d3NCPZNsOlvluInRe14+89ZQaljT5Q
+BabUy+ug0v19TfYVXEoQc+QxQbtR6x4uxiGBCWoHRXKrGsssCbBZSSM+YtkwPcX4
+cJer4Nf3ZIom5eA7yAV4sRWU9HTXgiECGI2CWA+B+VGgSLpu4VthTDwHwIpC2m/C
+MjtMuHD7RHxUMhf6GWng
+-----END CERTIFICATE-----
diff --git a/src/main/resources/cert/backup/apiclient_key.pem b/src/main/resources/cert/backup/apiclient_key.pem
new file mode 100755
index 0000000..3cbd6d2
--- /dev/null
+++ b/src/main/resources/cert/backup/apiclient_key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC29qmwcjg40Fsf
+GfnkZsDt2KsM6Km3k3lS+d/8yWPTH02Sjl/F3YIjljO51BNCpRbAemHNrQBLzk8+
+m2k8sMij80iG4XQ76mI6/yifFSycjxI+3eM/KeUY5MBDAbOXV9FMbUtMy8ijbVjl
+7IsPrUzKFgmxWQnGgOiTasPVLOsqNSV7AiUHG38FPQDDC/gkEaq2mfDZDiClYrNc
+nzJz7hKFj/v8JqYrd/zybkJF3hZUUu1PeOsYrhXscy4RU5l/70fVS23oJ93sJoRI
+gJWRh2Z//avpkE+4+IPJNOt3HBa9pF6y3qSUNs8r9O5c56Qjnc7L1ZtnCR70QCP1
+CkKlsA7jAgMBAAECggEBAJf7B3PJPUh8UuTf6ANBE4u/Cj872RbjyskRRW0vQNuz
+yfUujQHIgXzcHPWE48bdaavTPQDjbzaJFqxz3hQK6W++/AUGrE3E4XoOUAjtRtR5
+x/cuy8DBJUvrYIWImUzjJrmso/sT4ANZJpo/RjhshTfs3HpT8tnQZOFns2qV2HaC
+raIasa69LZpM6mA+1+pDDTFCYRqNZTFSAIawiEPz5C6YRoSLoSkJLVnwh10MGQJb
+Z2RWIt9kcvpUT2bYirYG1HgZJjuygCu80JMHFLhxOWAEQXknILYs5YfJcS7QjFrH
+7q5YYe/SKoRgMGUUL6src/mHan5yzLK4bXlW4vU627kCgYEA2jIlLMjVPx5N3iy9
+6dLa+Od5NhXCo+Cd3tr0EJGOpXquiw5wkSX6av6DNsObmMW9gkSwRKah8Iw+dQR7
+r5xYI8quT0tVqZLaL6j2xh3FSzGFSdF5a/IoKq4UrhmA05PwS2BtAwJTnMxBNoF9
+cSdoLUHVgRNmfI0Yk/vys23gy98CgYEA1qnSnG8hI/eIE46hHs3Cgx8AhACgm9Wy
+bg3qeH9eu+pZ6Na3HQRtGGzeBug1P3ezBYjx6eol55TGIpocn8Ujm28Q3Zng61Tx
+luV8LwTThVs+dvndEX0BTXbKx/dcbmpA4W6Kg/dzq6FXT2ryZPw96VUXMl8MAe/M
+rRGMT96z3X0CgYAE82RSitAD2Z0ssFkyx/z97sqaRo4fB8atOsyU36ib6pexQged
+033GFbZGdNO/+KSfIw3Y0OsVuSjloM9poaOCVGP2GqB784AN2siWoDBMz3fVv/IA
+WAM/TKnddWit5Epse2idy9y3zw6fvPpqqdk8RaUhg54sr0rieLH+Dj0ugwKBgGtt
+pcdAHle/o0wWTy/5TWUNeNaW8cnLUnadZEBVjfWBPOm3uwA8nNRid2MBhtRydRdK
+B7dGxR12aQocEkMrB7zcApbEUbm0UwtvYYyuX6UXmtU0Cpyb8LDxyF32vz1K05l+
+FrggeLTmE6ndHd3IFrvVJ7y/sGSvu8DJTW0TSPSJAoGBAKKj3/21zJZZWMW0Hzdn
+d7gKb8ros7SkWkN+xa7PeaScujA3MyE8r9/gsvC/5qLqa+3xAp7FA5MFY24d0vAf
+cA1QAic1eCNZsHA0Qy+/VEyTSE/alKYEDvj5NV0WcC3mlmfZ+uRTL3HwXYqSbM4F
+aI+vUhQJuXHpkybb3fM1ncwg
+-----END PRIVATE KEY-----
diff --git a/src/main/resources/cert/wechatpay_0BC92BA528729B58B39CC69E58D3855EACFF9DC4.pem b/src/main/resources/cert/wechatpay_0BC92BA528729B58B39CC69E58D3855EACFF9DC4.pem
new file mode 100644
index 0000000..bc98d23
--- /dev/null
+++ b/src/main/resources/cert/wechatpay_0BC92BA528729B58B39CC69E58D3855EACFF9DC4.pem
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIID8TCCAtmgAwIBAgIUC8krpShym1iznMaeWNOFXqz/ncQwDQYJKoZIhvcNAQEL
+BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
+FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
+Q0EwHhcNMTgxMDAyMDQ1OTQwWhcNMjMxMDAxMDQ1OTQwWjCBgjEYMBYGA1UEAwwP
+VGVucGF5LmNvbSBzaWduMRMwEQYDVQQKDApUZW5wYXkuY29tMR0wGwYDVQQLDBRU
+ZW5wYXkuY29tIENBIENlbnRlcjELMAkGA1UEBgwCQ04xEjAQBgNVBAgMCUd1YW5n
+RG9uZzERMA8GA1UEBwwIU2hlblpoZW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDSTNiV/fluUKBKHf2SmeulAsPXwhSBP4N5QzLQD95fx07yUjBFCXz7
+RSh2dSozgyic994HAps6MqAIEMJG6UBgzDEyL3dL2cbYs4DuZpnZsaOoHj+aabVP
+2zE9Sdp4xE4F4VCvhI8AQwHhEM0qXAEHHXN549E1bB5jFgSJTxsOKYgO7xGek1iO
+GGb08yLNZEGmtvXaVlu9JaSmSVxxH8ZjbHNq3cVF5Grum5rtC3o4qHifcki/JwvX
+oS9t7F+AJmsIEXujodclHbjS1gmOVq2R90qqteX5nif/Gp8mDpnme6g8lwEdjO5n
+JzQzSPpfDsh2+HLPKQUGadSrgMfWFrMZAgMBAAGjgYEwfzAJBgNVHRMEAjAAMAsG
+A1UdDwQEAwIE8DBlBgNVHR8EXjBcMFqgWKBWhlRodHRwOi8vZXZjYS5pdHJ1cy5j
+b20uY24vcHVibGljL2l0cnVzY3JsP0NBPTFCRDQyMjBFNTBEQkMwNEIwNkFEMzk3
+NTQ5ODQ2QzAxQzNFOEVCRDIwDQYJKoZIhvcNAQELBQADggEBADmXaYGIbV9iV3HT
+FMGABfdASY085vGP4G5qqItcIPUt3N8Rv4dmPCyPCUQtXVD3mpE+V/FnRRSelf2R
+rWIGV0tlIaAXpLnJ+rg9fvCH/lf2Dv0PSMg2ye4OW8YbrPcXs2AGqhaRGQyerJxw
+fEaALL/89Ri5H/2bb6YenvJ+U8xpkU0+yMRSQF0lhR96CeqRVajBEjb3oi1daeFx
+GBuDLTD8SDxf/XntREek20MLOupkplvTdudtSOOpD7iSXa21dw/rFXvDaGQ/wj6D
+tG8xDA55V1JYPJcdEsdVOvj9L+loyaltYjCBoUg/ah9ihjDJlYwhHnVAcqqi8r2o
+Hse2KNE=
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/src/main/resources/cert/wechatpay_4A3231584E93B6AE77820074D07EADEACCB7E223.pem b/src/main/resources/cert/wechatpay_4A3231584E93B6AE77820074D07EADEACCB7E223.pem
new file mode 100644
index 0000000..50afe22
--- /dev/null
+++ b/src/main/resources/cert/wechatpay_4A3231584E93B6AE77820074D07EADEACCB7E223.pem
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEFDCCAvygAwIBAgIUSjIxWE6Ttq53ggB00H6t6sy34iMwDQYJKoZIhvcNAQEL
+BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
+FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
+Q0EwHhcNMjMwOTE5MTUxNTQ4WhcNMjgwOTE3MTUxNTQ4WjBuMRgwFgYDVQQDDA9U
+ZW5wYXkuY29tIHNpZ24xEzARBgNVBAoMClRlbnBheS5jb20xHTAbBgNVBAsMFFRl
+bnBheS5jb20gQ0EgQ2VudGVyMQswCQYDVQQGDAJDTjERMA8GA1UEBwwIU2hlblpo
+ZW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5AOeoNuRReVPfOodE
+TTE/wq96OK/7MI1lkwgtRlOIqwFGbGPxPx+wiLweWOWAeGrd0h+YuktIZezLhMhB
+8pkJBzxz4U+zoQ9n3yY4CgDUBeAO8eNHhEQTTOTFUIvIlRxyr0EVuTHNP7pIkxA6
+gUvajWjJFbvU393vDHA9RflWrBNw1qVjkPPUx6axizD3wS8f77bwuspEWGTza/pS
+g96HWUwFh9OSlQNPOjPG4km2YRQwGhoRMlLeZsUB+a0PtV0HI/B0TbY5u2EmPt0R
+uNZLmcwImtiANYmySww6gp5uo4+im0P/kHKynPrW1SkS+8M9JP5T7Xck3bnHNv4S
+9UOPAgMBAAGjgbkwgbYwCQYDVR0TBAIwADALBgNVHQ8EBAMCA/gwgZsGA1UdHwSB
+kzCBkDCBjaCBiqCBh4aBhGh0dHA6Ly9ldmNhLml0cnVzLmNvbS5jbi9wdWJsaWMv
+aXRydXNjcmw/Q0E9MUJENDIyMEU1MERCQzA0QjA2QUQzOTc1NDk4NDZDMDFDM0U4
+RUJEMiZzZz1IQUNDNDcxQjY1NDIyRTEyQjI3QTlEMzNBODdBRDFDREY1OTI2RTE0
+MDM3MTANBgkqhkiG9w0BAQsFAAOCAQEAHd42YyvxvvjYEIkCURHweCSQpWQrdsnP
+AU2rcVzOx0kDxjq7+W2HkIkYeAZfE8pyBs5c39tgK+qospiDsKa9WYeBNyIRcCvN
+q9ObLqSV4Cy/8lQMNh4Q37cdc3X+pAlTr7MtKka8ZcXYvbMBqus0dfJZayZvW7Ak
+nnaXXJ4k7urgHOGYsZlZ+HC+DC/sYoN3DXzvg3XPlL0SNEQH0cWrRbaQnpOKVMk5
+TptbeNHKJfUxVW5jh4GtBFqvLeiOruY+gFYg7UkCKWo9ZIYe7/mEvJeHYh3acTTl
+DOl3L0fR5KR7vqFMwZEUZxVOs6K2ANSCr57OQPBV++MG4DPr3yOhCQ==
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/src/test/java/com/gxwebsoft/TestMain.java b/src/test/java/com/gxwebsoft/TestMain.java
index c9152da..c9cb393 100644
--- a/src/test/java/com/gxwebsoft/TestMain.java
+++ b/src/test/java/com/gxwebsoft/TestMain.java
@@ -1,13 +1,5 @@
 package com.gxwebsoft;
 
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.extra.qrcode.QrCodeException;
-import cn.hutool.extra.qrcode.QrCodeUtil;
-import cn.hutool.extra.qrcode.QrConfig;
-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;
@@ -38,10 +30,6 @@ public class TestMain {
   @Resource
   private OrderMapper orderMapper;
   @Resource
-  private TestDataService testDataService;
-  @Resource
-  private HualalaService hualalaService;
-  @Resource
   private SettingService settingService;
   @Resource
   private UserService userService;
diff --git a/src/test/java/com/gxwebsoft/generator/ShopGenerator.java b/src/test/java/com/gxwebsoft/generator/ShopGenerator.java
index da55e7b..de0b11d 100644
--- a/src/test/java/com/gxwebsoft/generator/ShopGenerator.java
+++ b/src/test/java/com/gxwebsoft/generator/ShopGenerator.java
@@ -31,10 +31,10 @@ public class ShopGenerator {
     // 是否在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_URL = "jdbc:mysql://127.0.0.1:3306/vivo?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 DB_USERNAME = "root";
+    private static final String DB_PASSWORD = "root";
     // 包名
     private static final String PACKAGE_NAME = "com.gxwebsoft";
     // 模块名
@@ -76,8 +76,8 @@ public class ShopGenerator {
 //        "shop_recharge_plan",
 //        "shop_user_balance_log"
 //      "shop_user_referee",
-        "shop_order_refund",
-        "shop_order_refund_address"
+//        "shop_goods_phone_model",
+        "shop_goods_price",
 
     };
     // 需要去除的表前缀
diff --git a/src/test/java/com/gxwebsoft/generator/SysGenerator.java b/src/test/java/com/gxwebsoft/generator/SysGenerator.java
index 26fc8b4..ffcf5d4 100644
--- a/src/test/java/com/gxwebsoft/generator/SysGenerator.java
+++ b/src/test/java/com/gxwebsoft/generator/SysGenerator.java
@@ -31,10 +31,10 @@ public class SysGenerator {
     // 是否在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_URL = "jdbc:mysql://127.0.0.1:3306/vivo?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 DB_USERNAME = "root";
+    private static final String DB_PASSWORD = "root";
     // 包名
     private static final String PACKAGE_NAME = "com.gxwebsoft";
     // 模块名
@@ -49,7 +49,7 @@ public class SysGenerator {
 //      "sys_company",
 //      "sys_industry"
 //      "sys_plug",
-        "sys_company"
+        "sys_area"
 
     };
     // 需要去除的表前缀
diff --git a/src/test/java/com/gxwebsoft/generator/TowerGenerator.java b/src/test/java/com/gxwebsoft/generator/VivoGenerator.java
similarity index 81%
rename from src/test/java/com/gxwebsoft/generator/TowerGenerator.java
rename to src/test/java/com/gxwebsoft/generator/VivoGenerator.java
index 1d28f82..afe937b 100644
--- a/src/test/java/com/gxwebsoft/generator/TowerGenerator.java
+++ b/src/test/java/com/gxwebsoft/generator/VivoGenerator.java
@@ -20,7 +20,7 @@ import java.util.Map;
  * @author WebSoft
  * @since 2021-09-05 00:31:14
  */
-public class TowerGenerator {
+public class VivoGenerator {
     // 输出位置
     private static final String OUTPUT_LOCATION = System.getProperty("user.dir");
 //    private static final String OUTPUT_LOCATION = "";  // 不想生成到项目中可以写磁盘路径
@@ -31,49 +31,17 @@ public class TowerGenerator {
     // 是否在xml中添加二级缓存配置
     private static final boolean ENABLE_CACHE = false;
     // 数据库连接配置
-    private static final String DB_URL = "jdbc:mysql://1.14.159.185:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8";
+    private static final String DB_URL = "jdbc:mysql://127.0.0.1:3306/vivo?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 = "tower";
-    private static final String DB_PASSWORD = "FXFZrhHbs3pma6Zh";
+    private static final String DB_USERNAME = "root";
+    private static final String DB_PASSWORD = "root";
     // 包名
     private static final String PACKAGE_NAME = "com.gxwebsoft";
     // 模块名
-    private static final String MODULE_NAME = "tower";
+    private static final String MODULE_NAME = "vivo";
     // 需要生成的表
     private static final String[] TABLE_NAMES = new String[]{
-//      "tower_equipment",
-//      "tower_warehouse",
-//      "tower_accessory"
-//      "tower_project",
-//        "tower_model"
-//      "tower_contract",
-//      "tower_contract_equipment",
-//      "tower_settle",
-//      "tower_settle_detail",
-//      "tower_history_settle",
-//      "tower_lending",
-//      "tower_lending_settle_list",
-//      "tower_invoicing",
-//      "tower_invoicing_settle",
-//      "tower_income",
-//      "tower_income_equipment",
-//      "tower_contract_final_settle",
-//      "tower_contract_final_settle_lost",
-//      "tower_worksheet",
-//      "tower_worksheet_check",
-//      "tower_worksheet_detail",
-//      "tower_worksheet_parts",
-//      "tower_worksheet_set_up",
-//            "tower_worksheet_audit",
-//            "tower_worksheet_car_dispatch",
-//            "tower_project_building",
-//      "tower_rent",
-//      "tower_purchase",
-//      "tower_security",
-//      "tower_security_record",
-//      "tower_security_plant",
-//        "tower_part_goods",
-//        "tower_part_stock"
+      "vivo_pay_code",
     };
     // 需要去除的表前缀
     private static final String[] TABLE_PREFIX = new String[]{
diff --git a/websoft-api.log b/websoft-api.log
index 74ec4f5..4e7fe56 100644
--- a/websoft-api.log
+++ b/websoft-api.log
@@ -1,21 +1,5 @@
-2024-01-24 17:06:22.617  WARN 21561 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : removeAbandoned is true, not use in production.
-2024-01-24 17:08:48.354  WARN 21561 --- [http-nio-10041-exec-10] c.a.druid.pool.DruidAbstractDataSource   : discard long time none received connection. , jdbcUrl : jdbc:mysql://42.194.212.185:3308/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, version : 1.2.5, lastPacketReceivedIdleMillis : 79374
-2024-01-24 17:08:48.383  WARN 21561 --- [http-nio-10041-exec-10] c.a.druid.pool.DruidAbstractDataSource   : discard long time none received connection. , jdbcUrl : jdbc:mysql://42.194.212.185:3308/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, version : 1.2.5, lastPacketReceivedIdleMillis : 79853
-2024-01-24 17:08:48.410  WARN 21561 --- [http-nio-10041-exec-10] c.a.druid.pool.DruidAbstractDataSource   : discard long time none received connection. , jdbcUrl : jdbc:mysql://42.194.212.185:3308/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, version : 1.2.5, lastPacketReceivedIdleMillis : 144908
-2024-01-24 17:08:48.437  WARN 21561 --- [http-nio-10041-exec-10] c.a.druid.pool.DruidAbstractDataSource   : discard long time none received connection. , jdbcUrl : jdbc:mysql://42.194.212.185:3308/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, version : 1.2.5, lastPacketReceivedIdleMillis : 145248
-2024-01-24 17:08:48.462  WARN 21561 --- [http-nio-10041-exec-10] c.a.druid.pool.DruidAbstractDataSource   : discard long time none received connection. , jdbcUrl : jdbc:mysql://42.194.212.185:3308/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, version : 1.2.5, lastPacketReceivedIdleMillis : 145591
-2024-01-24 17:13:14.173  WARN 21561 --- [http-nio-10041-exec-2] c.a.druid.pool.DruidAbstractDataSource   : discard long time none received connection. , jdbcUrl : jdbc:mysql://42.194.212.185:3308/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, version : 1.2.5, lastPacketReceivedIdleMillis : 82853
-2024-01-24 17:13:14.214  WARN 21561 --- [http-nio-10041-exec-2] c.a.druid.pool.DruidAbstractDataSource   : discard long time none received connection. , jdbcUrl : jdbc:mysql://42.194.212.185:3308/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, version : 1.2.5, lastPacketReceivedIdleMillis : 113691
-2024-01-24 17:17:04.843  WARN 21561 --- [http-nio-10041-exec-9] c.a.druid.pool.DruidAbstractDataSource   : discard long time none received connection. , jdbcUrl : jdbc:mysql://42.194.212.185:3308/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, version : 1.2.5, lastPacketReceivedIdleMillis : 199004
-2024-01-24 17:17:04.867  WARN 21561 --- [http-nio-10041-exec-9] c.a.druid.pool.DruidAbstractDataSource   : discard long time none received connection. , jdbcUrl : jdbc:mysql://42.194.212.185:3308/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, version : 1.2.5, lastPacketReceivedIdleMillis : 199350
-2024-01-24 17:20:08.704  WARN 21561 --- [http-nio-10041-exec-5] c.a.druid.pool.DruidAbstractDataSource   : discard long time none received connection. , jdbcUrl : jdbc:mysql://42.194.212.185:3308/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, version : 1.2.5, lastPacketReceivedIdleMillis : 162243
-2024-01-24 17:20:08.706  WARN 21561 --- [http-nio-10041-exec-6] c.a.druid.pool.DruidAbstractDataSource   : discard long time none received connection. , jdbcUrl : jdbc:mysql://42.194.212.185:3308/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, version : 1.2.5, lastPacketReceivedIdleMillis : 161954
-2024-01-24 17:31:54.903  WARN 21561 --- [http-nio-10041-exec-3] c.a.druid.pool.DruidAbstractDataSource   : discard long time none received connection. , jdbcUrl : jdbc:mysql://42.194.212.185:3308/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, version : 1.2.5, lastPacketReceivedIdleMillis : 198209
-2024-01-24 17:31:54.929  WARN 21561 --- [http-nio-10041-exec-3] c.a.druid.pool.DruidAbstractDataSource   : discard long time none received connection. , jdbcUrl : jdbc:mysql://42.194.212.185:3308/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, version : 1.2.5, lastPacketReceivedIdleMillis : 202974
-2024-01-24 17:31:54.955  WARN 21561 --- [http-nio-10041-exec-3] c.a.druid.pool.DruidAbstractDataSource   : discard long time none received connection. , jdbcUrl : jdbc:mysql://42.194.212.185:3308/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, version : 1.2.5, lastPacketReceivedIdleMillis : 203177
-2024-01-24 17:34:23.401  WARN 23077 --- [main] com.alibaba.druid.pool.DruidDataSource   : removeAbandoned is true, not use in production.
-2024-02-02 15:34:13.377  WARN 31170 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : removeAbandoned is true, not use in production.
-2024-02-02 15:34:13.424 ERROR 31170 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : init datasource error, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
+2024-03-31 23:12:34.477  WARN 38435 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : removeAbandoned is true, not use in production.
+2024-03-31 23:12:34.511 ERROR 38435 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : init datasource error, url: jdbc:mysql://127.0.0.1:3308/vivo?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
 
 com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
 
@@ -34,44 +18,44 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
 	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
 	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:na]
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:na]
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:na]
+	at java.base/java.lang.reflect.Method.invoke(Method.java:566) ~[na:na]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
@@ -79,13 +63,13 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
@@ -95,13 +79,13 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
@@ -111,13 +95,13 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) [spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
 	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
 	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
@@ -130,17 +114,17 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
 	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
 	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
+	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) ~[na:na]
 	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
+	at java.base/java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:140) ~[na:na]
 	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
 	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
 	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
 	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
 	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
+	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) ~[na:na]
 	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
+	at java.base/java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:140) ~[na:na]
 	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
 	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
 	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
@@ -163,18 +147,18 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) ~[spring-boot-2.5.4.jar:2.5.4]
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) ~[spring-boot-2.5.4.jar:2.5.4]
 	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) ~[classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:na]
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:na]
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:na]
+	at java.base/java.lang.reflect.Method.invoke(Method.java:566) ~[na:na]
 	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) ~[spring-boot-devtools-2.5.4.jar:2.5.4]
 Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
 
 The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
+	at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:na]
+	at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:na]
+	at java.base/jdk.internal.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:na]
+	at java.base/java.lang.reflect.Constructor.newInstance(Constructor.java:490) ~[na:na]
 	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
 	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
 	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
@@ -185,17 +169,17 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
 	... 145 common frames omitted
 Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
+	at java.base/java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:na]
+	at java.base/java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:412) ~[na:na]
+	at java.base/java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:255) ~[na:na]
+	at java.base/java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:237) ~[na:na]
+	at java.base/java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:na]
+	at java.base/java.net.Socket.connect(Socket.java:615) ~[na:na]
 	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
 	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
 	... 148 common frames omitted
 
-2024-02-02 15:34:13.428 ERROR 31170 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1} init error
+2024-03-31 23:12:34.514 ERROR 38435 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1} init error
 
 com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
 
@@ -214,44 +198,44 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
 	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
 	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:na]
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:na]
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:na]
+	at java.base/java.lang.reflect.Method.invoke(Method.java:566) ~[na:na]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
@@ -259,13 +243,13 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
@@ -275,13 +259,13 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
@@ -291,13 +275,13 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) [spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
 	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
 	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
@@ -310,17 +294,17 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
 	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
 	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
+	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) ~[na:na]
 	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
+	at java.base/java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:140) ~[na:na]
 	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
 	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
 	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
 	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
 	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
+	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) ~[na:na]
 	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
+	at java.base/java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:140) ~[na:na]
 	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
 	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
 	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
@@ -343,18 +327,18 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) ~[spring-boot-2.5.4.jar:2.5.4]
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) ~[spring-boot-2.5.4.jar:2.5.4]
 	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) ~[classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:na]
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:na]
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:na]
+	at java.base/java.lang.reflect.Method.invoke(Method.java:566) ~[na:na]
 	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) ~[spring-boot-devtools-2.5.4.jar:2.5.4]
 Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
 
 The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
+	at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:na]
+	at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:na]
+	at java.base/jdk.internal.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:na]
+	at java.base/java.lang.reflect.Constructor.newInstance(Constructor.java:490) ~[na:na]
 	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
 	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
 	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
@@ -365,20 +349,20 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
 	... 145 common frames omitted
 Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
+	at java.base/java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:na]
+	at java.base/java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:412) ~[na:na]
+	at java.base/java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:255) ~[na:na]
+	at java.base/java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:237) ~[na:na]
+	at java.base/java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:na]
+	at java.base/java.net.Socket.connect(Socket.java:615) ~[na:na]
 	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
 	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
 	... 148 common frames omitted
 
-2024-02-02 15:34:13.430 ERROR 31170 --- [restartedMain] o.s.b.web.embedded.tomcat.TomcatStarter  : Error starting Tomcat context. Exception: org.springframework.beans.factory.BeanCreationException. Message: Error creating bean with name 'jwtAuthenticationFilter': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
+2024-03-31 23:12:34.516 ERROR 38435 --- [restartedMain] o.s.b.web.embedded.tomcat.TomcatStarter  : Error starting Tomcat context. Exception: org.springframework.beans.factory.BeanCreationException. Message: Error creating bean with name 'jwtAuthenticationFilter': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/liangxin/Project/JAVA/vivo-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
 
 The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-2024-02-02 15:34:13.430 ERROR 31170 --- [Druid-ConnectionPool-Create-1516930446] com.alibaba.druid.pool.DruidDataSource   : create connection SQLException, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, errorCode 0, state 08S01
+2024-03-31 23:12:34.516 ERROR 38435 --- [Druid-ConnectionPool-Create-2113112287] com.alibaba.druid.pool.DruidDataSource   : create connection SQLException, url: jdbc:mysql://127.0.0.1:3308/vivo?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, errorCode 0, state 08S01
 
 com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
 
@@ -400,10 +384,10 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
 
 The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
+	at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:na]
+	at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:na]
+	at java.base/jdk.internal.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:na]
+	at java.base/java.lang.reflect.Constructor.newInstance(Constructor.java:490) ~[na:na]
 	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
 	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
 	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
@@ -414,17 +398,17 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
 	... 11 common frames omitted
 Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
+	at java.base/java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:na]
+	at java.base/java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:412) ~[na:na]
+	at java.base/java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:255) ~[na:na]
+	at java.base/java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:237) ~[na:na]
+	at java.base/java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:na]
+	at java.base/java.net.Socket.connect(Socket.java:615) ~[na:na]
 	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
 	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
 	... 14 common frames omitted
 
-2024-02-02 15:34:13.431 ERROR 31170 --- [Druid-ConnectionPool-Create-1516930446] com.alibaba.druid.pool.DruidDataSource   : create connection SQLException, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, errorCode 0, state 08S01
+2024-03-31 23:12:34.518 ERROR 38435 --- [Druid-ConnectionPool-Create-2113112287] com.alibaba.druid.pool.DruidDataSource   : create connection SQLException, url: jdbc:mysql://127.0.0.1:3308/vivo?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, errorCode 0, state 08S01
 
 com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
 
@@ -446,10 +430,10 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
 
 The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
+	at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:na]
+	at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:na]
+	at java.base/jdk.internal.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:na]
+	at java.base/java.lang.reflect.Constructor.newInstance(Constructor.java:490) ~[na:na]
 	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
 	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
 	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
@@ -460,40 +444,60 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
 	... 11 common frames omitted
 Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
+	at java.base/java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:na]
+	at java.base/java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:412) ~[na:na]
+	at java.base/java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:255) ~[na:na]
+	at java.base/java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:237) ~[na:na]
+	at java.base/java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:na]
+	at java.base/java.net.Socket.connect(Socket.java:615) ~[na:na]
 	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
 	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
 	... 14 common frames omitted
 
-2024-02-02 15:34:13.443  WARN 31170 --- [restartedMain] o.a.c.loader.WebappClassLoaderBase       : The web application [ROOT] appears to have started a thread named [Druid-ConnectionPool-Create-1516930446] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2824)
-2024-02-02 15:34:13.443  WARN 31170 --- [restartedMain] o.a.c.loader.WebappClassLoaderBase       : The web application [ROOT] appears to have started a thread named [Druid-ConnectionPool-Destroy-1516930446] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- com.alibaba.druid.pool.DruidDataSource$DestroyConnectionThread.run(DruidDataSource.java:2876)
-2024-02-02 15:34:13.444  WARN 31170 --- [restartedMain] ConfigServletWebServerApplicationContext : Exception encountered during context initialization - cancelling refresh attempt: org.springframework.context.ApplicationContextException: Unable to start web server; nested exception is org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
-2024-02-02 15:34:13.461 ERROR 31170 --- [restartedMain] o.s.boot.SpringApplication               : Application run failed
+2024-03-31 23:12:34.528  WARN 38435 --- [restartedMain] o.a.c.loader.WebappClassLoaderBase       : The web application [ROOT] appears to have started a thread named [logback-1] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.base@11.0.15/jdk.internal.misc.Unsafe.park(Native Method)
+ java.base@11.0.15/java.util.concurrent.locks.LockSupport.park(LockSupport.java:194)
+ java.base@11.0.15/java.util.concurrent.locks.AbstractQueuedSynchronizer$ConditionObject.await(AbstractQueuedSynchronizer.java:2081)
+ java.base@11.0.15/java.util.concurrent.ScheduledThreadPoolExecutor$DelayedWorkQueue.take(ScheduledThreadPoolExecutor.java:1170)
+ java.base@11.0.15/java.util.concurrent.ScheduledThreadPoolExecutor$DelayedWorkQueue.take(ScheduledThreadPoolExecutor.java:899)
+ java.base@11.0.15/java.util.concurrent.ThreadPoolExecutor.getTask(ThreadPoolExecutor.java:1054)
+ java.base@11.0.15/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1114)
+ java.base@11.0.15/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
+ java.base@11.0.15/java.lang.Thread.run(Thread.java:829)
+2024-03-31 23:12:34.528  WARN 38435 --- [restartedMain] o.a.c.loader.WebappClassLoaderBase       : The web application [ROOT] appears to have started a thread named [logback-2] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.base@11.0.15/jdk.internal.misc.Unsafe.park(Native Method)
+ java.base@11.0.15/java.util.concurrent.locks.LockSupport.park(LockSupport.java:194)
+ java.base@11.0.15/java.util.concurrent.locks.AbstractQueuedSynchronizer$ConditionObject.await(AbstractQueuedSynchronizer.java:2081)
+ java.base@11.0.15/java.util.concurrent.ScheduledThreadPoolExecutor$DelayedWorkQueue.take(ScheduledThreadPoolExecutor.java:1170)
+ java.base@11.0.15/java.util.concurrent.ScheduledThreadPoolExecutor$DelayedWorkQueue.take(ScheduledThreadPoolExecutor.java:899)
+ java.base@11.0.15/java.util.concurrent.ThreadPoolExecutor.getTask(ThreadPoolExecutor.java:1054)
+ java.base@11.0.15/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1114)
+ java.base@11.0.15/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
+ java.base@11.0.15/java.lang.Thread.run(Thread.java:829)
+2024-03-31 23:12:34.528  WARN 38435 --- [restartedMain] o.a.c.loader.WebappClassLoaderBase       : The web application [ROOT] appears to have started a thread named [Druid-ConnectionPool-Create-2113112287] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.base@11.0.15/java.lang.Thread.sleep(Native Method)
+ app//com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2824)
+2024-03-31 23:12:34.528  WARN 38435 --- [restartedMain] o.a.c.loader.WebappClassLoaderBase       : The web application [ROOT] appears to have started a thread named [Druid-ConnectionPool-Destroy-2113112287] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
+ java.base@11.0.15/java.lang.Thread.sleep(Native Method)
+ app//com.alibaba.druid.pool.DruidDataSource$DestroyConnectionThread.run(DruidDataSource.java:2876)
+2024-03-31 23:12:34.529  WARN 38435 --- [restartedMain] ConfigServletWebServerApplicationContext : Exception encountered during context initialization - cancelling refresh attempt: org.springframework.context.ApplicationContextException: Unable to start web server; nested exception is org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
+2024-03-31 23:12:34.540 ERROR 38435 --- [restartedMain] o.s.boot.SpringApplication               : Application run failed
 
 org.springframework.context.ApplicationContextException: Unable to start web server; nested exception is org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
 	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:163) ~[spring-boot-2.5.4.jar:2.5.4]
 	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:577) ~[spring-context-5.3.9.jar:5.3.9]
 	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) [spring-boot-2.5.4.jar:2.5.4]
-	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) [classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) [spring-boot-devtools-2.5.4.jar:2.5.4]
+	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) ~[spring-boot-2.5.4.jar:2.5.4]
+	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) ~[spring-boot-2.5.4.jar:2.5.4]
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) ~[spring-boot-2.5.4.jar:2.5.4]
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) ~[spring-boot-2.5.4.jar:2.5.4]
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) ~[spring-boot-2.5.4.jar:2.5.4]
+	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) ~[classes/:na]
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:na]
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:na]
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:na]
+	at java.base/java.lang.reflect.Method.invoke(Method.java:566) ~[na:na]
+	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) ~[spring-boot-devtools-2.5.4.jar:2.5.4]
 Caused by: org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
 	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:142) ~[spring-boot-2.5.4.jar:2.5.4]
 	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.<init>(TomcatWebServer.java:104) ~[spring-boot-2.5.4.jar:2.5.4]
@@ -502,7 +506,7 @@ Caused by: org.springframework.boot.web.server.WebServerException: Unable to sta
 	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.createWebServer(ServletWebServerApplicationContext.java:182) ~[spring-boot-2.5.4.jar:2.5.4]
 	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:160) ~[spring-boot-2.5.4.jar:2.5.4]
 	... 13 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'jwtAuthenticationFilter': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
+Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'jwtAuthenticationFilter': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/liangxin/Project/JAVA/vivo-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
 
 The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
 	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:321) ~[spring-context-5.3.9.jar:5.3.9]
@@ -525,17 +529,17 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
 	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
 	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
+	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) ~[na:na]
 	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
+	at java.base/java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:140) ~[na:na]
 	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
 	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
 	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
 	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
 	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
+	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) ~[na:na]
 	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
+	at java.base/java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:140) ~[na:na]
 	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
 	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
 	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
@@ -546,7 +550,7 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 	at org.apache.catalina.startup.Tomcat.start(Tomcat.java:486) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
 	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:123) ~[spring-boot-2.5.4.jar:2.5.4]
 	... 18 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
+Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/liangxin/Project/JAVA/vivo-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
 
 The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
 	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:321) ~[spring-context-5.3.9.jar:5.3.9]
@@ -567,7 +571,7 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
 	... 57 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
+Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/liangxin/Project/JAVA/vivo-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
 
 The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
 	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:660) ~[spring-beans-5.3.9.jar:5.3.9]
@@ -591,7 +595,7 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
 	... 73 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
+Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/liangxin/Project/JAVA/vivo-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
 
 The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
 	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1516) ~[spring-beans-5.3.9.jar:5.3.9]
@@ -658,10 +662,10 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
 	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
 	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:na]
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:na]
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:na]
+	at java.base/java.lang.reflect.Method.invoke(Method.java:566) ~[na:na]
 	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) ~[spring-beans-5.3.9.jar:5.3.9]
 	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) ~[spring-beans-5.3.9.jar:5.3.9]
@@ -669,10 +673,10 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
 
 The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
+	at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:na]
+	at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:na]
+	at java.base/jdk.internal.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:na]
+	at java.base/java.lang.reflect.Constructor.newInstance(Constructor.java:490) ~[na:na]
 	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
 	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
 	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
@@ -683,5444 +687,12 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
 	... 145 common frames omitted
 Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 148 common frames omitted
-
-2024-02-02 15:36:07.870  WARN 31419 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : removeAbandoned is true, not use in production.
-2024-02-02 15:36:07.919 ERROR 31419 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : init datasource error, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAdaptableBeans(ServletContextInitializerBeans.java:155) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.<init>(ServletContextInitializerBeans.java:87) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.getServletContextInitializerBeans(ServletWebServerApplicationContext.java:260) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.selfInitialize(ServletWebServerApplicationContext.java:234) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatStarter.onStartup(TomcatStarter.java:53) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5219) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardService.startInternal(StandardService.java:432) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:927) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.startup.Tomcat.start(Tomcat.java:486) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:123) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.<init>(TomcatWebServer.java:104) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getTomcatWebServer(TomcatServletWebServerFactory.java:450) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getWebServer(TomcatServletWebServerFactory.java:199) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.createWebServer(ServletWebServerApplicationContext.java:182) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:160) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:577) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) ~[spring-boot-2.5.4.jar:2.5.4]
-	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) ~[classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) ~[spring-boot-devtools-2.5.4.jar:2.5.4]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 145 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 148 common frames omitted
-
-2024-02-02 15:36:07.923 ERROR 31419 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1} init error
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAdaptableBeans(ServletContextInitializerBeans.java:155) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.<init>(ServletContextInitializerBeans.java:87) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.getServletContextInitializerBeans(ServletWebServerApplicationContext.java:260) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.selfInitialize(ServletWebServerApplicationContext.java:234) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatStarter.onStartup(TomcatStarter.java:53) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5219) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardService.startInternal(StandardService.java:432) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:927) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.startup.Tomcat.start(Tomcat.java:486) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:123) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.<init>(TomcatWebServer.java:104) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getTomcatWebServer(TomcatServletWebServerFactory.java:450) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getWebServer(TomcatServletWebServerFactory.java:199) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.createWebServer(ServletWebServerApplicationContext.java:182) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:160) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:577) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) ~[spring-boot-2.5.4.jar:2.5.4]
-	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) ~[classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) ~[spring-boot-devtools-2.5.4.jar:2.5.4]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 145 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 148 common frames omitted
-
-2024-02-02 15:36:07.925 ERROR 31419 --- [restartedMain] o.s.b.web.embedded.tomcat.TomcatStarter  : Error starting Tomcat context. Exception: org.springframework.beans.factory.BeanCreationException. Message: Error creating bean with name 'jwtAuthenticationFilter': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-2024-02-02 15:36:07.925 ERROR 31419 --- [Druid-ConnectionPool-Create-1677209053] com.alibaba.druid.pool.DruidDataSource   : create connection SQLException, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, errorCode 0, state 08S01
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2801) ~[druid-1.2.6.jar:1.2.6]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 11 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 14 common frames omitted
-
-2024-02-02 15:36:07.926 ERROR 31419 --- [Druid-ConnectionPool-Create-1677209053] com.alibaba.druid.pool.DruidDataSource   : create connection SQLException, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, errorCode 0, state 08S01
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2801) ~[druid-1.2.6.jar:1.2.6]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 11 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 14 common frames omitted
-
-2024-02-02 15:36:07.939  WARN 31419 --- [restartedMain] o.a.c.loader.WebappClassLoaderBase       : The web application [ROOT] appears to have started a thread named [Druid-ConnectionPool-Create-1677209053] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2824)
-2024-02-02 15:36:07.939  WARN 31419 --- [restartedMain] o.a.c.loader.WebappClassLoaderBase       : The web application [ROOT] appears to have started a thread named [Druid-ConnectionPool-Destroy-1677209053] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- com.alibaba.druid.pool.DruidDataSource$DestroyConnectionThread.run(DruidDataSource.java:2876)
-2024-02-02 15:36:07.940  WARN 31419 --- [restartedMain] ConfigServletWebServerApplicationContext : Exception encountered during context initialization - cancelling refresh attempt: org.springframework.context.ApplicationContextException: Unable to start web server; nested exception is org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
-2024-02-02 15:36:07.957 ERROR 31419 --- [restartedMain] o.s.boot.SpringApplication               : Application run failed
-
-org.springframework.context.ApplicationContextException: Unable to start web server; nested exception is org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:163) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:577) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) [spring-boot-2.5.4.jar:2.5.4]
-	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) [classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) [spring-boot-devtools-2.5.4.jar:2.5.4]
-Caused by: org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:142) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.<init>(TomcatWebServer.java:104) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getTomcatWebServer(TomcatServletWebServerFactory.java:450) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getWebServer(TomcatServletWebServerFactory.java:199) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.createWebServer(ServletWebServerApplicationContext.java:182) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:160) ~[spring-boot-2.5.4.jar:2.5.4]
-	... 13 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'jwtAuthenticationFilter': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:321) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAdaptableBeans(ServletContextInitializerBeans.java:155) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.<init>(ServletContextInitializerBeans.java:87) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.getServletContextInitializerBeans(ServletWebServerApplicationContext.java:260) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.selfInitialize(ServletWebServerApplicationContext.java:234) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatStarter.onStartup(TomcatStarter.java:53) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5219) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardService.startInternal(StandardService.java:432) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:927) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.startup.Tomcat.start(Tomcat.java:486) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:123) ~[spring-boot-2.5.4.jar:2.5.4]
-	... 18 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:321) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	... 57 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:660) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	... 73 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1516) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 92 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:800) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 103 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1786) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 116 common frames omitted
-Caused by: com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 127 common frames omitted
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 145 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 148 common frames omitted
-
-2024-02-02 15:40:07.918  WARN 31728 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : removeAbandoned is true, not use in production.
-2024-02-02 15:40:07.968 ERROR 31728 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : init datasource error, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAdaptableBeans(ServletContextInitializerBeans.java:155) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.<init>(ServletContextInitializerBeans.java:87) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.getServletContextInitializerBeans(ServletWebServerApplicationContext.java:260) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.selfInitialize(ServletWebServerApplicationContext.java:234) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatStarter.onStartup(TomcatStarter.java:53) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5219) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardService.startInternal(StandardService.java:432) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:927) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.startup.Tomcat.start(Tomcat.java:486) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:123) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.<init>(TomcatWebServer.java:104) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getTomcatWebServer(TomcatServletWebServerFactory.java:450) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getWebServer(TomcatServletWebServerFactory.java:199) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.createWebServer(ServletWebServerApplicationContext.java:182) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:160) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:577) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) ~[spring-boot-2.5.4.jar:2.5.4]
-	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) ~[classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) ~[spring-boot-devtools-2.5.4.jar:2.5.4]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 145 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 148 common frames omitted
-
-2024-02-02 15:40:07.972 ERROR 31728 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1} init error
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAdaptableBeans(ServletContextInitializerBeans.java:155) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.<init>(ServletContextInitializerBeans.java:87) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.getServletContextInitializerBeans(ServletWebServerApplicationContext.java:260) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.selfInitialize(ServletWebServerApplicationContext.java:234) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatStarter.onStartup(TomcatStarter.java:53) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5219) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardService.startInternal(StandardService.java:432) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:927) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.startup.Tomcat.start(Tomcat.java:486) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:123) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.<init>(TomcatWebServer.java:104) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getTomcatWebServer(TomcatServletWebServerFactory.java:450) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getWebServer(TomcatServletWebServerFactory.java:199) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.createWebServer(ServletWebServerApplicationContext.java:182) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:160) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:577) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) ~[spring-boot-2.5.4.jar:2.5.4]
-	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) ~[classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) ~[spring-boot-devtools-2.5.4.jar:2.5.4]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 145 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 148 common frames omitted
-
-2024-02-02 15:40:07.974 ERROR 31728 --- [restartedMain] o.s.b.web.embedded.tomcat.TomcatStarter  : Error starting Tomcat context. Exception: org.springframework.beans.factory.BeanCreationException. Message: Error creating bean with name 'jwtAuthenticationFilter': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-2024-02-02 15:40:07.974 ERROR 31728 --- [Druid-ConnectionPool-Create-158970396] com.alibaba.druid.pool.DruidDataSource   : create connection SQLException, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, errorCode 0, state 08S01
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2801) ~[druid-1.2.6.jar:1.2.6]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 11 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 14 common frames omitted
-
-2024-02-02 15:40:07.975 ERROR 31728 --- [Druid-ConnectionPool-Create-158970396] com.alibaba.druid.pool.DruidDataSource   : create connection SQLException, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, errorCode 0, state 08S01
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2801) ~[druid-1.2.6.jar:1.2.6]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 11 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 14 common frames omitted
-
-2024-02-02 15:40:07.988  WARN 31728 --- [restartedMain] o.a.c.loader.WebappClassLoaderBase       : The web application [ROOT] appears to have started a thread named [Druid-ConnectionPool-Create-158970396] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2824)
-2024-02-02 15:40:07.988  WARN 31728 --- [restartedMain] o.a.c.loader.WebappClassLoaderBase       : The web application [ROOT] appears to have started a thread named [Druid-ConnectionPool-Destroy-158970396] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- com.alibaba.druid.pool.DruidDataSource$DestroyConnectionThread.run(DruidDataSource.java:2876)
-2024-02-02 15:40:07.989  WARN 31728 --- [restartedMain] ConfigServletWebServerApplicationContext : Exception encountered during context initialization - cancelling refresh attempt: org.springframework.context.ApplicationContextException: Unable to start web server; nested exception is org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
-2024-02-02 15:40:08.005 ERROR 31728 --- [restartedMain] o.s.boot.SpringApplication               : Application run failed
-
-org.springframework.context.ApplicationContextException: Unable to start web server; nested exception is org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:163) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:577) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) [spring-boot-2.5.4.jar:2.5.4]
-	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) [classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) [spring-boot-devtools-2.5.4.jar:2.5.4]
-Caused by: org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:142) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.<init>(TomcatWebServer.java:104) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getTomcatWebServer(TomcatServletWebServerFactory.java:450) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getWebServer(TomcatServletWebServerFactory.java:199) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.createWebServer(ServletWebServerApplicationContext.java:182) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:160) ~[spring-boot-2.5.4.jar:2.5.4]
-	... 13 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'jwtAuthenticationFilter': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:321) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAdaptableBeans(ServletContextInitializerBeans.java:155) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.<init>(ServletContextInitializerBeans.java:87) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.getServletContextInitializerBeans(ServletWebServerApplicationContext.java:260) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.selfInitialize(ServletWebServerApplicationContext.java:234) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatStarter.onStartup(TomcatStarter.java:53) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5219) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardService.startInternal(StandardService.java:432) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:927) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.startup.Tomcat.start(Tomcat.java:486) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:123) ~[spring-boot-2.5.4.jar:2.5.4]
-	... 18 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:321) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	... 57 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:660) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	... 73 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1516) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 92 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:800) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 103 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1786) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 116 common frames omitted
-Caused by: com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 127 common frames omitted
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 145 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 148 common frames omitted
-
-2024-02-02 15:40:47.400  WARN 31851 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : removeAbandoned is true, not use in production.
-2024-02-02 15:40:47.446 ERROR 31851 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : init datasource error, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAdaptableBeans(ServletContextInitializerBeans.java:155) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.<init>(ServletContextInitializerBeans.java:87) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.getServletContextInitializerBeans(ServletWebServerApplicationContext.java:260) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.selfInitialize(ServletWebServerApplicationContext.java:234) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatStarter.onStartup(TomcatStarter.java:53) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5219) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardService.startInternal(StandardService.java:432) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:927) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.startup.Tomcat.start(Tomcat.java:486) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:123) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.<init>(TomcatWebServer.java:104) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getTomcatWebServer(TomcatServletWebServerFactory.java:450) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getWebServer(TomcatServletWebServerFactory.java:199) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.createWebServer(ServletWebServerApplicationContext.java:182) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:160) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:577) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) ~[spring-boot-2.5.4.jar:2.5.4]
-	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) ~[classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) ~[spring-boot-devtools-2.5.4.jar:2.5.4]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 145 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 148 common frames omitted
-
-2024-02-02 15:40:47.450 ERROR 31851 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1} init error
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAdaptableBeans(ServletContextInitializerBeans.java:155) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.<init>(ServletContextInitializerBeans.java:87) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.getServletContextInitializerBeans(ServletWebServerApplicationContext.java:260) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.selfInitialize(ServletWebServerApplicationContext.java:234) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatStarter.onStartup(TomcatStarter.java:53) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5219) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardService.startInternal(StandardService.java:432) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:927) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.startup.Tomcat.start(Tomcat.java:486) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:123) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.<init>(TomcatWebServer.java:104) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getTomcatWebServer(TomcatServletWebServerFactory.java:450) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getWebServer(TomcatServletWebServerFactory.java:199) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.createWebServer(ServletWebServerApplicationContext.java:182) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:160) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:577) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) ~[spring-boot-2.5.4.jar:2.5.4]
-	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) ~[classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) ~[spring-boot-devtools-2.5.4.jar:2.5.4]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 145 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 148 common frames omitted
-
-2024-02-02 15:40:47.452 ERROR 31851 --- [restartedMain] o.s.b.web.embedded.tomcat.TomcatStarter  : Error starting Tomcat context. Exception: org.springframework.beans.factory.BeanCreationException. Message: Error creating bean with name 'jwtAuthenticationFilter': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-2024-02-02 15:40:47.452 ERROR 31851 --- [Druid-ConnectionPool-Create-295634190] com.alibaba.druid.pool.DruidDataSource   : create connection SQLException, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, errorCode 0, state 08S01
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2801) ~[druid-1.2.6.jar:1.2.6]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 11 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 14 common frames omitted
-
-2024-02-02 15:40:47.452 ERROR 31851 --- [Druid-ConnectionPool-Create-295634190] com.alibaba.druid.pool.DruidDataSource   : create connection SQLException, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, errorCode 0, state 08S01
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2801) ~[druid-1.2.6.jar:1.2.6]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 11 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 14 common frames omitted
-
-2024-02-02 15:40:47.464  WARN 31851 --- [restartedMain] o.a.c.loader.WebappClassLoaderBase       : The web application [ROOT] appears to have started a thread named [Druid-ConnectionPool-Create-295634190] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2824)
-2024-02-02 15:40:47.464  WARN 31851 --- [restartedMain] o.a.c.loader.WebappClassLoaderBase       : The web application [ROOT] appears to have started a thread named [Druid-ConnectionPool-Destroy-295634190] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- com.alibaba.druid.pool.DruidDataSource$DestroyConnectionThread.run(DruidDataSource.java:2876)
-2024-02-02 15:40:47.465  WARN 31851 --- [restartedMain] ConfigServletWebServerApplicationContext : Exception encountered during context initialization - cancelling refresh attempt: org.springframework.context.ApplicationContextException: Unable to start web server; nested exception is org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
-2024-02-02 15:40:47.481 ERROR 31851 --- [restartedMain] o.s.boot.SpringApplication               : Application run failed
-
-org.springframework.context.ApplicationContextException: Unable to start web server; nested exception is org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:163) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:577) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) [spring-boot-2.5.4.jar:2.5.4]
-	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) [classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) [spring-boot-devtools-2.5.4.jar:2.5.4]
-Caused by: org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:142) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.<init>(TomcatWebServer.java:104) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getTomcatWebServer(TomcatServletWebServerFactory.java:450) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getWebServer(TomcatServletWebServerFactory.java:199) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.createWebServer(ServletWebServerApplicationContext.java:182) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:160) ~[spring-boot-2.5.4.jar:2.5.4]
-	... 13 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'jwtAuthenticationFilter': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:321) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAdaptableBeans(ServletContextInitializerBeans.java:155) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.<init>(ServletContextInitializerBeans.java:87) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.getServletContextInitializerBeans(ServletWebServerApplicationContext.java:260) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.selfInitialize(ServletWebServerApplicationContext.java:234) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatStarter.onStartup(TomcatStarter.java:53) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5219) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardService.startInternal(StandardService.java:432) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:927) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.startup.Tomcat.start(Tomcat.java:486) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:123) ~[spring-boot-2.5.4.jar:2.5.4]
-	... 18 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:321) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	... 57 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:660) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	... 73 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1516) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 92 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:800) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 103 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1786) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 116 common frames omitted
-Caused by: com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 127 common frames omitted
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 145 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 148 common frames omitted
-
-2024-02-02 15:41:30.442  WARN 31950 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : removeAbandoned is true, not use in production.
-2024-02-02 15:41:30.485 ERROR 31950 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : init datasource error, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAdaptableBeans(ServletContextInitializerBeans.java:155) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.<init>(ServletContextInitializerBeans.java:87) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.getServletContextInitializerBeans(ServletWebServerApplicationContext.java:260) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.selfInitialize(ServletWebServerApplicationContext.java:234) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatStarter.onStartup(TomcatStarter.java:53) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5219) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardService.startInternal(StandardService.java:432) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:927) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.startup.Tomcat.start(Tomcat.java:486) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:123) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.<init>(TomcatWebServer.java:104) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getTomcatWebServer(TomcatServletWebServerFactory.java:450) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getWebServer(TomcatServletWebServerFactory.java:199) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.createWebServer(ServletWebServerApplicationContext.java:182) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:160) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:577) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) ~[spring-boot-2.5.4.jar:2.5.4]
-	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) ~[classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) ~[spring-boot-devtools-2.5.4.jar:2.5.4]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 145 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 148 common frames omitted
-
-2024-02-02 15:41:30.489 ERROR 31950 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1} init error
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAdaptableBeans(ServletContextInitializerBeans.java:155) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.<init>(ServletContextInitializerBeans.java:87) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.getServletContextInitializerBeans(ServletWebServerApplicationContext.java:260) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.selfInitialize(ServletWebServerApplicationContext.java:234) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatStarter.onStartup(TomcatStarter.java:53) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5219) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardService.startInternal(StandardService.java:432) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:927) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.startup.Tomcat.start(Tomcat.java:486) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:123) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.<init>(TomcatWebServer.java:104) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getTomcatWebServer(TomcatServletWebServerFactory.java:450) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getWebServer(TomcatServletWebServerFactory.java:199) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.createWebServer(ServletWebServerApplicationContext.java:182) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:160) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:577) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) ~[spring-boot-2.5.4.jar:2.5.4]
-	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) ~[classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) ~[spring-boot-devtools-2.5.4.jar:2.5.4]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 145 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 148 common frames omitted
-
-2024-02-02 15:41:30.491 ERROR 31950 --- [restartedMain] o.s.b.web.embedded.tomcat.TomcatStarter  : Error starting Tomcat context. Exception: org.springframework.beans.factory.BeanCreationException. Message: Error creating bean with name 'jwtAuthenticationFilter': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-2024-02-02 15:41:30.491 ERROR 31950 --- [Druid-ConnectionPool-Create-1742908399] com.alibaba.druid.pool.DruidDataSource   : create connection SQLException, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, errorCode 0, state 08S01
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2801) ~[druid-1.2.6.jar:1.2.6]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 11 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 14 common frames omitted
-
-2024-02-02 15:41:30.492 ERROR 31950 --- [Druid-ConnectionPool-Create-1742908399] com.alibaba.druid.pool.DruidDataSource   : create connection SQLException, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, errorCode 0, state 08S01
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2801) ~[druid-1.2.6.jar:1.2.6]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 11 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 14 common frames omitted
-
-2024-02-02 15:41:30.504  WARN 31950 --- [restartedMain] o.a.c.loader.WebappClassLoaderBase       : The web application [ROOT] appears to have started a thread named [Druid-ConnectionPool-Create-1742908399] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2824)
-2024-02-02 15:41:30.504  WARN 31950 --- [restartedMain] o.a.c.loader.WebappClassLoaderBase       : The web application [ROOT] appears to have started a thread named [Druid-ConnectionPool-Destroy-1742908399] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- com.alibaba.druid.pool.DruidDataSource$DestroyConnectionThread.run(DruidDataSource.java:2876)
-2024-02-02 15:41:30.505  WARN 31950 --- [restartedMain] ConfigServletWebServerApplicationContext : Exception encountered during context initialization - cancelling refresh attempt: org.springframework.context.ApplicationContextException: Unable to start web server; nested exception is org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
-2024-02-02 15:41:30.522 ERROR 31950 --- [restartedMain] o.s.boot.SpringApplication               : Application run failed
-
-org.springframework.context.ApplicationContextException: Unable to start web server; nested exception is org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:163) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:577) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) [spring-boot-2.5.4.jar:2.5.4]
-	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) [classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) [spring-boot-devtools-2.5.4.jar:2.5.4]
-Caused by: org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:142) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.<init>(TomcatWebServer.java:104) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getTomcatWebServer(TomcatServletWebServerFactory.java:450) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getWebServer(TomcatServletWebServerFactory.java:199) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.createWebServer(ServletWebServerApplicationContext.java:182) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:160) ~[spring-boot-2.5.4.jar:2.5.4]
-	... 13 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'jwtAuthenticationFilter': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:321) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAdaptableBeans(ServletContextInitializerBeans.java:155) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.<init>(ServletContextInitializerBeans.java:87) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.getServletContextInitializerBeans(ServletWebServerApplicationContext.java:260) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.selfInitialize(ServletWebServerApplicationContext.java:234) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatStarter.onStartup(TomcatStarter.java:53) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5219) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardService.startInternal(StandardService.java:432) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:927) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.startup.Tomcat.start(Tomcat.java:486) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:123) ~[spring-boot-2.5.4.jar:2.5.4]
-	... 18 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:321) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	... 57 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:660) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	... 73 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1516) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 92 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:800) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 103 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1786) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 116 common frames omitted
-Caused by: com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 127 common frames omitted
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 145 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 148 common frames omitted
-
-2024-02-02 16:06:44.280  WARN 33302 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : removeAbandoned is true, not use in production.
-2024-02-02 16:06:44.326 ERROR 33302 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : init datasource error, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAdaptableBeans(ServletContextInitializerBeans.java:155) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.<init>(ServletContextInitializerBeans.java:87) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.getServletContextInitializerBeans(ServletWebServerApplicationContext.java:260) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.selfInitialize(ServletWebServerApplicationContext.java:234) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatStarter.onStartup(TomcatStarter.java:53) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5219) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardService.startInternal(StandardService.java:432) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:927) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.startup.Tomcat.start(Tomcat.java:486) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:123) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.<init>(TomcatWebServer.java:104) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getTomcatWebServer(TomcatServletWebServerFactory.java:450) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getWebServer(TomcatServletWebServerFactory.java:199) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.createWebServer(ServletWebServerApplicationContext.java:182) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:160) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:577) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) ~[spring-boot-2.5.4.jar:2.5.4]
-	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) ~[classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) ~[spring-boot-devtools-2.5.4.jar:2.5.4]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 145 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 148 common frames omitted
-
-2024-02-02 16:06:44.331 ERROR 33302 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1} init error
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAdaptableBeans(ServletContextInitializerBeans.java:155) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.<init>(ServletContextInitializerBeans.java:87) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.getServletContextInitializerBeans(ServletWebServerApplicationContext.java:260) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.selfInitialize(ServletWebServerApplicationContext.java:234) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatStarter.onStartup(TomcatStarter.java:53) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5219) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardService.startInternal(StandardService.java:432) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:927) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.startup.Tomcat.start(Tomcat.java:486) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:123) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.<init>(TomcatWebServer.java:104) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getTomcatWebServer(TomcatServletWebServerFactory.java:450) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getWebServer(TomcatServletWebServerFactory.java:199) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.createWebServer(ServletWebServerApplicationContext.java:182) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:160) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:577) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) ~[spring-boot-2.5.4.jar:2.5.4]
-	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) ~[classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) ~[spring-boot-devtools-2.5.4.jar:2.5.4]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 145 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 148 common frames omitted
-
-2024-02-02 16:06:44.333 ERROR 33302 --- [restartedMain] o.s.b.web.embedded.tomcat.TomcatStarter  : Error starting Tomcat context. Exception: org.springframework.beans.factory.BeanCreationException. Message: Error creating bean with name 'jwtAuthenticationFilter': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-2024-02-02 16:06:44.333 ERROR 33302 --- [Druid-ConnectionPool-Create-1516930446] com.alibaba.druid.pool.DruidDataSource   : create connection SQLException, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, errorCode 0, state 08S01
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2801) ~[druid-1.2.6.jar:1.2.6]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 11 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 14 common frames omitted
-
-2024-02-02 16:06:44.334 ERROR 33302 --- [Druid-ConnectionPool-Create-1516930446] com.alibaba.druid.pool.DruidDataSource   : create connection SQLException, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, errorCode 0, state 08S01
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2801) ~[druid-1.2.6.jar:1.2.6]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 11 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 14 common frames omitted
-
-2024-02-02 16:06:44.349  WARN 33302 --- [restartedMain] o.a.c.loader.WebappClassLoaderBase       : The web application [ROOT] appears to have started a thread named [Druid-ConnectionPool-Create-1516930446] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2824)
-2024-02-02 16:06:44.350  WARN 33302 --- [restartedMain] o.a.c.loader.WebappClassLoaderBase       : The web application [ROOT] appears to have started a thread named [Druid-ConnectionPool-Destroy-1516930446] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- com.alibaba.druid.pool.DruidDataSource$DestroyConnectionThread.run(DruidDataSource.java:2876)
-2024-02-02 16:06:44.351  WARN 33302 --- [restartedMain] ConfigServletWebServerApplicationContext : Exception encountered during context initialization - cancelling refresh attempt: org.springframework.context.ApplicationContextException: Unable to start web server; nested exception is org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
-2024-02-02 16:06:44.368 ERROR 33302 --- [restartedMain] o.s.boot.SpringApplication               : Application run failed
-
-org.springframework.context.ApplicationContextException: Unable to start web server; nested exception is org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:163) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:577) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) [spring-boot-2.5.4.jar:2.5.4]
-	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) [classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) [spring-boot-devtools-2.5.4.jar:2.5.4]
-Caused by: org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:142) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.<init>(TomcatWebServer.java:104) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getTomcatWebServer(TomcatServletWebServerFactory.java:450) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getWebServer(TomcatServletWebServerFactory.java:199) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.createWebServer(ServletWebServerApplicationContext.java:182) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:160) ~[spring-boot-2.5.4.jar:2.5.4]
-	... 13 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'jwtAuthenticationFilter': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:321) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAdaptableBeans(ServletContextInitializerBeans.java:155) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.<init>(ServletContextInitializerBeans.java:87) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.getServletContextInitializerBeans(ServletWebServerApplicationContext.java:260) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.selfInitialize(ServletWebServerApplicationContext.java:234) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatStarter.onStartup(TomcatStarter.java:53) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5219) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardService.startInternal(StandardService.java:432) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:927) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.startup.Tomcat.start(Tomcat.java:486) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:123) ~[spring-boot-2.5.4.jar:2.5.4]
-	... 18 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:321) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	... 57 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:660) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	... 73 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1516) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 92 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:800) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 103 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1786) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 116 common frames omitted
-Caused by: com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 127 common frames omitted
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 145 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 148 common frames omitted
-
-2024-02-02 16:06:53.335  WARN 33315 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : removeAbandoned is true, not use in production.
-2024-02-02 16:06:53.380 ERROR 33315 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : init datasource error, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAdaptableBeans(ServletContextInitializerBeans.java:155) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.<init>(ServletContextInitializerBeans.java:87) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.getServletContextInitializerBeans(ServletWebServerApplicationContext.java:260) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.selfInitialize(ServletWebServerApplicationContext.java:234) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatStarter.onStartup(TomcatStarter.java:53) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5219) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardService.startInternal(StandardService.java:432) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:927) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.startup.Tomcat.start(Tomcat.java:486) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:123) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.<init>(TomcatWebServer.java:104) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getTomcatWebServer(TomcatServletWebServerFactory.java:450) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getWebServer(TomcatServletWebServerFactory.java:199) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.createWebServer(ServletWebServerApplicationContext.java:182) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:160) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:577) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) ~[spring-boot-2.5.4.jar:2.5.4]
-	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) ~[classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) ~[spring-boot-devtools-2.5.4.jar:2.5.4]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 145 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 148 common frames omitted
-
-2024-02-02 16:06:53.385 ERROR 33315 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1} init error
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAdaptableBeans(ServletContextInitializerBeans.java:155) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.<init>(ServletContextInitializerBeans.java:87) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.getServletContextInitializerBeans(ServletWebServerApplicationContext.java:260) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.selfInitialize(ServletWebServerApplicationContext.java:234) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatStarter.onStartup(TomcatStarter.java:53) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5219) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardService.startInternal(StandardService.java:432) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:927) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.startup.Tomcat.start(Tomcat.java:486) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:123) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.<init>(TomcatWebServer.java:104) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getTomcatWebServer(TomcatServletWebServerFactory.java:450) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getWebServer(TomcatServletWebServerFactory.java:199) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.createWebServer(ServletWebServerApplicationContext.java:182) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:160) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:577) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) ~[spring-boot-2.5.4.jar:2.5.4]
-	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) ~[classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) ~[spring-boot-devtools-2.5.4.jar:2.5.4]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 145 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 148 common frames omitted
-
-2024-02-02 16:06:53.386 ERROR 33315 --- [restartedMain] o.s.b.web.embedded.tomcat.TomcatStarter  : Error starting Tomcat context. Exception: org.springframework.beans.factory.BeanCreationException. Message: Error creating bean with name 'jwtAuthenticationFilter': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-2024-02-02 16:06:53.386 ERROR 33315 --- [Druid-ConnectionPool-Create-1742908399] com.alibaba.druid.pool.DruidDataSource   : create connection SQLException, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, errorCode 0, state 08S01
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2801) ~[druid-1.2.6.jar:1.2.6]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 11 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 14 common frames omitted
-
-2024-02-02 16:06:53.387 ERROR 33315 --- [Druid-ConnectionPool-Create-1742908399] com.alibaba.druid.pool.DruidDataSource   : create connection SQLException, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, errorCode 0, state 08S01
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2801) ~[druid-1.2.6.jar:1.2.6]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 11 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 14 common frames omitted
-
-2024-02-02 16:06:53.399  WARN 33315 --- [restartedMain] o.a.c.loader.WebappClassLoaderBase       : The web application [ROOT] appears to have started a thread named [Druid-ConnectionPool-Create-1742908399] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2824)
-2024-02-02 16:06:53.399  WARN 33315 --- [restartedMain] o.a.c.loader.WebappClassLoaderBase       : The web application [ROOT] appears to have started a thread named [Druid-ConnectionPool-Destroy-1742908399] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- com.alibaba.druid.pool.DruidDataSource$DestroyConnectionThread.run(DruidDataSource.java:2876)
-2024-02-02 16:06:53.400  WARN 33315 --- [restartedMain] ConfigServletWebServerApplicationContext : Exception encountered during context initialization - cancelling refresh attempt: org.springframework.context.ApplicationContextException: Unable to start web server; nested exception is org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
-2024-02-02 16:06:53.415 ERROR 33315 --- [restartedMain] o.s.boot.SpringApplication               : Application run failed
-
-org.springframework.context.ApplicationContextException: Unable to start web server; nested exception is org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:163) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:577) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) [spring-boot-2.5.4.jar:2.5.4]
-	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) [classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) [spring-boot-devtools-2.5.4.jar:2.5.4]
-Caused by: org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:142) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.<init>(TomcatWebServer.java:104) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getTomcatWebServer(TomcatServletWebServerFactory.java:450) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getWebServer(TomcatServletWebServerFactory.java:199) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.createWebServer(ServletWebServerApplicationContext.java:182) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:160) ~[spring-boot-2.5.4.jar:2.5.4]
-	... 13 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'jwtAuthenticationFilter': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:321) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAdaptableBeans(ServletContextInitializerBeans.java:155) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.<init>(ServletContextInitializerBeans.java:87) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.getServletContextInitializerBeans(ServletWebServerApplicationContext.java:260) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.selfInitialize(ServletWebServerApplicationContext.java:234) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatStarter.onStartup(TomcatStarter.java:53) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5219) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardService.startInternal(StandardService.java:432) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:927) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.startup.Tomcat.start(Tomcat.java:486) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:123) ~[spring-boot-2.5.4.jar:2.5.4]
-	... 18 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:321) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	... 57 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:660) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	... 73 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1516) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 92 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:800) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 103 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1786) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 116 common frames omitted
-Caused by: com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 127 common frames omitted
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 145 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 148 common frames omitted
-
-2024-02-02 16:08:26.459  WARN 33342 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : removeAbandoned is true, not use in production.
-2024-02-02 16:08:26.505 ERROR 33342 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : init datasource error, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAdaptableBeans(ServletContextInitializerBeans.java:155) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.<init>(ServletContextInitializerBeans.java:87) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.getServletContextInitializerBeans(ServletWebServerApplicationContext.java:260) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.selfInitialize(ServletWebServerApplicationContext.java:234) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatStarter.onStartup(TomcatStarter.java:53) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5219) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardService.startInternal(StandardService.java:432) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:927) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.startup.Tomcat.start(Tomcat.java:486) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:123) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.<init>(TomcatWebServer.java:104) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getTomcatWebServer(TomcatServletWebServerFactory.java:450) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getWebServer(TomcatServletWebServerFactory.java:199) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.createWebServer(ServletWebServerApplicationContext.java:182) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:160) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:577) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) ~[spring-boot-2.5.4.jar:2.5.4]
-	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) ~[classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) ~[spring-boot-devtools-2.5.4.jar:2.5.4]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 145 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 148 common frames omitted
-
-2024-02-02 16:08:26.509 ERROR 33342 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1} init error
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAdaptableBeans(ServletContextInitializerBeans.java:155) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.<init>(ServletContextInitializerBeans.java:87) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.getServletContextInitializerBeans(ServletWebServerApplicationContext.java:260) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.selfInitialize(ServletWebServerApplicationContext.java:234) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatStarter.onStartup(TomcatStarter.java:53) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5219) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardService.startInternal(StandardService.java:432) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:927) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.startup.Tomcat.start(Tomcat.java:486) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:123) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.<init>(TomcatWebServer.java:104) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getTomcatWebServer(TomcatServletWebServerFactory.java:450) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getWebServer(TomcatServletWebServerFactory.java:199) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.createWebServer(ServletWebServerApplicationContext.java:182) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:160) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:577) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) ~[spring-boot-2.5.4.jar:2.5.4]
-	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) ~[classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) ~[spring-boot-devtools-2.5.4.jar:2.5.4]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 145 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 148 common frames omitted
-
-2024-02-02 16:08:26.511 ERROR 33342 --- [restartedMain] o.s.b.web.embedded.tomcat.TomcatStarter  : Error starting Tomcat context. Exception: org.springframework.beans.factory.BeanCreationException. Message: Error creating bean with name 'jwtAuthenticationFilter': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-2024-02-02 16:08:26.511 ERROR 33342 --- [Druid-ConnectionPool-Create-1742908399] com.alibaba.druid.pool.DruidDataSource   : create connection SQLException, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, errorCode 0, state 08S01
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2801) ~[druid-1.2.6.jar:1.2.6]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 11 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 14 common frames omitted
-
-2024-02-02 16:08:26.512 ERROR 33342 --- [Druid-ConnectionPool-Create-1742908399] com.alibaba.druid.pool.DruidDataSource   : create connection SQLException, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, errorCode 0, state 08S01
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2801) ~[druid-1.2.6.jar:1.2.6]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 11 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 14 common frames omitted
-
-2024-02-02 16:08:26.524  WARN 33342 --- [restartedMain] o.a.c.loader.WebappClassLoaderBase       : The web application [ROOT] appears to have started a thread named [Druid-ConnectionPool-Create-1742908399] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2824)
-2024-02-02 16:08:26.525  WARN 33342 --- [restartedMain] o.a.c.loader.WebappClassLoaderBase       : The web application [ROOT] appears to have started a thread named [Druid-ConnectionPool-Destroy-1742908399] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- com.alibaba.druid.pool.DruidDataSource$DestroyConnectionThread.run(DruidDataSource.java:2876)
-2024-02-02 16:08:26.526  WARN 33342 --- [restartedMain] ConfigServletWebServerApplicationContext : Exception encountered during context initialization - cancelling refresh attempt: org.springframework.context.ApplicationContextException: Unable to start web server; nested exception is org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
-2024-02-02 16:08:26.542 ERROR 33342 --- [restartedMain] o.s.boot.SpringApplication               : Application run failed
-
-org.springframework.context.ApplicationContextException: Unable to start web server; nested exception is org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:163) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:577) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) [spring-boot-2.5.4.jar:2.5.4]
-	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) [classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) [spring-boot-devtools-2.5.4.jar:2.5.4]
-Caused by: org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:142) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.<init>(TomcatWebServer.java:104) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getTomcatWebServer(TomcatServletWebServerFactory.java:450) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getWebServer(TomcatServletWebServerFactory.java:199) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.createWebServer(ServletWebServerApplicationContext.java:182) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:160) ~[spring-boot-2.5.4.jar:2.5.4]
-	... 13 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'jwtAuthenticationFilter': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:321) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAdaptableBeans(ServletContextInitializerBeans.java:155) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.<init>(ServletContextInitializerBeans.java:87) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.getServletContextInitializerBeans(ServletWebServerApplicationContext.java:260) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.selfInitialize(ServletWebServerApplicationContext.java:234) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatStarter.onStartup(TomcatStarter.java:53) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5219) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardService.startInternal(StandardService.java:432) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:927) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.startup.Tomcat.start(Tomcat.java:486) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:123) ~[spring-boot-2.5.4.jar:2.5.4]
-	... 18 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:321) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	... 57 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:660) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	... 73 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1516) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 92 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:800) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 103 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1786) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 116 common frames omitted
-Caused by: com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 127 common frames omitted
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 145 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 148 common frames omitted
-
-2024-02-02 16:10:26.611  WARN 33400 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : removeAbandoned is true, not use in production.
-2024-02-02 16:10:26.658 ERROR 33400 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : init datasource error, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAdaptableBeans(ServletContextInitializerBeans.java:155) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.<init>(ServletContextInitializerBeans.java:87) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.getServletContextInitializerBeans(ServletWebServerApplicationContext.java:260) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.selfInitialize(ServletWebServerApplicationContext.java:234) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatStarter.onStartup(TomcatStarter.java:53) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5219) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardService.startInternal(StandardService.java:432) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:927) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.startup.Tomcat.start(Tomcat.java:486) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:123) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.<init>(TomcatWebServer.java:104) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getTomcatWebServer(TomcatServletWebServerFactory.java:450) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getWebServer(TomcatServletWebServerFactory.java:199) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.createWebServer(ServletWebServerApplicationContext.java:182) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:160) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:577) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) ~[spring-boot-2.5.4.jar:2.5.4]
-	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) ~[classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) ~[spring-boot-devtools-2.5.4.jar:2.5.4]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 145 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 148 common frames omitted
-
-2024-02-02 16:10:26.662 ERROR 33400 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1} init error
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) [spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAdaptableBeans(ServletContextInitializerBeans.java:155) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.<init>(ServletContextInitializerBeans.java:87) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.getServletContextInitializerBeans(ServletWebServerApplicationContext.java:260) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.selfInitialize(ServletWebServerApplicationContext.java:234) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatStarter.onStartup(TomcatStarter.java:53) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5219) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardService.startInternal(StandardService.java:432) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:927) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.startup.Tomcat.start(Tomcat.java:486) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:123) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.<init>(TomcatWebServer.java:104) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getTomcatWebServer(TomcatServletWebServerFactory.java:450) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getWebServer(TomcatServletWebServerFactory.java:199) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.createWebServer(ServletWebServerApplicationContext.java:182) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:160) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:577) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) ~[spring-boot-2.5.4.jar:2.5.4]
-	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) ~[classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) ~[spring-boot-devtools-2.5.4.jar:2.5.4]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 145 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 148 common frames omitted
-
-2024-02-02 16:10:26.664 ERROR 33400 --- [restartedMain] o.s.b.web.embedded.tomcat.TomcatStarter  : Error starting Tomcat context. Exception: org.springframework.beans.factory.BeanCreationException. Message: Error creating bean with name 'jwtAuthenticationFilter': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-2024-02-02 16:10:26.664 ERROR 33400 --- [Druid-ConnectionPool-Create-1516930446] com.alibaba.druid.pool.DruidDataSource   : create connection SQLException, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, errorCode 0, state 08S01
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2801) ~[druid-1.2.6.jar:1.2.6]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 11 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 14 common frames omitted
-
-2024-02-02 16:10:26.665 ERROR 33400 --- [Druid-ConnectionPool-Create-1516930446] com.alibaba.druid.pool.DruidDataSource   : create connection SQLException, url: jdbc:mysql://127.0.0.1:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, errorCode 0, state 08S01
-
-com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2801) ~[druid-1.2.6.jar:1.2.6]
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 11 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
-	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 14 common frames omitted
-
-2024-02-02 16:10:26.678  WARN 33400 --- [restartedMain] o.a.c.loader.WebappClassLoaderBase       : The web application [ROOT] appears to have started a thread named [Druid-ConnectionPool-Create-1516930446] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- com.alibaba.druid.pool.DruidDataSource$CreateConnectionThread.run(DruidDataSource.java:2824)
-2024-02-02 16:10:26.678  WARN 33400 --- [restartedMain] o.a.c.loader.WebappClassLoaderBase       : The web application [ROOT] appears to have started a thread named [Druid-ConnectionPool-Destroy-1516930446] but has failed to stop it. This is very likely to create a memory leak. Stack trace of thread:
- java.lang.Thread.sleep(Native Method)
- com.alibaba.druid.pool.DruidDataSource$DestroyConnectionThread.run(DruidDataSource.java:2876)
-2024-02-02 16:10:26.679  WARN 33400 --- [restartedMain] ConfigServletWebServerApplicationContext : Exception encountered during context initialization - cancelling refresh attempt: org.springframework.context.ApplicationContextException: Unable to start web server; nested exception is org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
-2024-02-02 16:10:26.697 ERROR 33400 --- [restartedMain] o.s.boot.SpringApplication               : Application run failed
-
-org.springframework.context.ApplicationContextException: Unable to start web server; nested exception is org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:163) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:577) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:754) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:434) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:338) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1343) [spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1332) [spring-boot-2.5.4.jar:2.5.4]
-	at com.gxwebsoft.WebSoftApplication.main(WebSoftApplication.java:26) [classes/:na]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) [spring-boot-devtools-2.5.4.jar:2.5.4]
-Caused by: org.springframework.boot.web.server.WebServerException: Unable to start embedded Tomcat
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:142) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.<init>(TomcatWebServer.java:104) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getTomcatWebServer(TomcatServletWebServerFactory.java:450) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getWebServer(TomcatServletWebServerFactory.java:199) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.createWebServer(ServletWebServerApplicationContext.java:182) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.onRefresh(ServletWebServerApplicationContext.java:160) ~[spring-boot-2.5.4.jar:2.5.4]
-	... 13 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'jwtAuthenticationFilter': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:321) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:213) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.getOrderedBeansOfType(ServletContextInitializerBeans.java:212) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:175) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAsRegistrationBean(ServletContextInitializerBeans.java:170) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.addAdaptableBeans(ServletContextInitializerBeans.java:155) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.ServletContextInitializerBeans.<init>(ServletContextInitializerBeans.java:87) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.getServletContextInitializerBeans(ServletWebServerApplicationContext.java:260) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.selfInitialize(ServletWebServerApplicationContext.java:234) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.springframework.boot.web.embedded.tomcat.TomcatStarter.onStartup(TomcatStarter.java:53) ~[spring-boot-2.5.4.jar:2.5.4]
-	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5219) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:835) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1396) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1386) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_322]
-	at org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:134) ~[na:1.8.0_322]
-	at org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:919) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:263) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardService.startInternal(StandardService.java:432) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:927) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.apache.catalina.startup.Tomcat.start(Tomcat.java:486) ~[tomcat-embed-core-9.0.52.jar:9.0.52]
-	at org.springframework.boot.web.embedded.tomcat.TomcatWebServer.initialize(TomcatWebServer.java:123) ~[spring-boot-2.5.4.jar:2.5.4]
-	... 18 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'userServiceImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:321) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	... 57 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:660) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1413) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.autowireResource(CommonAnnotationBeanPostProcessor.java:521) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.getResource(CommonAnnotationBeanPostProcessor.java:497) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor$ResourceElement.getResourceToInject(CommonAnnotationBeanPostProcessor.java:650) ~[spring-context-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata$InjectedElement.inject(InjectionMetadata.java:228) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:318) ~[spring-context-5.3.9.jar:5.3.9]
-	... 73 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'userRoleMapper' defined in file [/Users/gxwebsoft/JAVA/tower-java/target/classes/com/gxwebsoft/common/system/mapper/UserRoleMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1516) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1399) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:601) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:657) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 92 common frames omitted
-Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Unsatisfied dependency expressed through method 'sqlSessionFactory' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:800) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:541) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1334) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:564) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1501) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 103 common frames omitted
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in class path resource [com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.class]: Invocation of init method failed; nested exception is com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1786) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:524) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1380) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1300) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:887) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:791) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 116 common frames omitted
-Caused by: com.mysql.cj.jdbc.exceptions.CommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at com.mysql.cj.jdbc.exceptions.SQLError.createCommunicationsException(SQLError.java:174) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:64) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:828) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.<init>(ConnectionImpl.java:448) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.getInstance(ConnectionImpl.java:241) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:198) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:156) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterAdapter.connection_connect(FilterAdapter.java:787) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.stat.StatFilter.connection_connect(StatFilter.java:227) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.filter.FilterChainImpl.connection_connect(FilterChainImpl.java:150) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1659) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidAbstractDataSource.createPhysicalConnection(DruidAbstractDataSource.java:1723) ~[druid-1.2.6.jar:1.2.6]
-	at com.alibaba.druid.pool.DruidDataSource.init(DruidDataSource.java:919) ~[druid-1.2.6.jar:1.2.6]
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_322]
-	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_322]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1912) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1854) ~[spring-beans-5.3.9.jar:5.3.9]
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1782) ~[spring-beans-5.3.9.jar:5.3.9]
-	... 127 common frames omitted
-Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
-
-The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[na:1.8.0_322]
-	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[na:1.8.0_322]
-	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[na:1.8.0_322]
-	at java.lang.reflect.Constructor.newInstance(Constructor.java:423) ~[na:1.8.0_322]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:61) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:105) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createException(ExceptionFactory.java:151) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.exceptions.ExceptionFactory.createCommunicationsException(ExceptionFactory.java:167) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:89) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.NativeSession.connect(NativeSession.java:119) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.connectOneTryOnly(ConnectionImpl.java:948) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	at com.mysql.cj.jdbc.ConnectionImpl.createNewIO(ConnectionImpl.java:818) ~[mysql-connector-java-8.0.26.jar:8.0.26]
-	... 145 common frames omitted
-Caused by: java.net.ConnectException: Connection refused (Connection refused)
-	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_322]
-	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_322]
-	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_322]
-	at java.net.Socket.connect(Socket.java:607) ~[na:1.8.0_322]
+	at java.base/java.net.PlainSocketImpl.socketConnect(Native Method) ~[na:na]
+	at java.base/java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:412) ~[na:na]
+	at java.base/java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:255) ~[na:na]
+	at java.base/java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:237) ~[na:na]
+	at java.base/java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:na]
+	at java.base/java.net.Socket.connect(Socket.java:615) ~[na:na]
 	at com.mysql.cj.protocol.StandardSocketFactory.connect(StandardSocketFactory.java:156) ~[mysql-connector-java-8.0.26.jar:8.0.26]
 	at com.mysql.cj.protocol.a.NativeSocketConnection.connect(NativeSocketConnection.java:63) ~[mysql-connector-java-8.0.26.jar:8.0.26]
 	... 148 common frames omitted