From a948bf26ca02fbbf4f9aed041d3dca676ae2065f Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Tue, 17 Dec 2024 16:21:18 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/uiDesigner.xml | 124 +++++++++ .idea/workspace.xml | 309 ++++++++++++++++----- .../controller/CarrentApplyController.java} | 84 +++--- .../modules/carrentApply/entity/CarrentApply.java | 86 ++++++ .../carrentApply/mapper/CarrentApplyMapper.java | 17 ++ .../mapper/xml/CarrentApplyMapper.xml} | 2 +- .../carrentApply/service/ICarrentApplyService.java | 14 + .../service/impl/CarrentApplyServiceImpl.java | 19 ++ .../modules/carrentApply/vue/CarrentApplyList.vue | 217 +++++++++++++++ .../carrentApply/vue/modules/CarrentApplyForm.vue | 139 +++++++++ .../modules/CarrentApplyModal.Style#Drawer.vue} | 8 +- .../vue/modules/CarrentApplyModal.vue} | 8 +- .../vue3/CarrentApply.api.ts} | 14 +- .../modules/carrentApply/vue3/CarrentApply.data.ts | 102 +++++++ .../vue3/CarrentApplyList.vue} | 14 +- .../vue3/components/CarrentApplyModal.vue} | 4 +- .../carrentArea/mapper/CarrentAreaMapper.java | 17 -- .../carrentArea/service/ICarrentAreaService.java | 14 - .../service/impl/CarrentAreaServiceImpl.java | 19 -- .../carrentCar/mapper/CarrentCarMapper.java | 17 -- .../carrentCar/service/ICarrentCarService.java | 14 - .../service/impl/CarrentCarServiceImpl.java | 19 -- .../mapper/CarrentCategoryMapper.java | 17 -- .../service/ICarrentCategoryService.java | 14 - .../service/impl/CarrentCategoryServiceImpl.java | 19 -- .../controller/CarrentCategoryoneController.java} | 84 +++--- .../entity/CarrentCategoryone.java} | 26 +- .../mapper/CarrentCategoryoneMapper.java | 17 ++ .../mapper/xml/CarrentCategoryoneMapper.xml} | 2 +- .../service/ICarrentCategoryoneService.java | 14 + .../impl/CarrentCategoryoneServiceImpl.java | 19 ++ .../vue/CarrentCategoryoneList.vue} | 26 +- .../vue/modules/CarrentCategoryoneForm.vue} | 12 +- .../CarrentCategoryoneModal.Style#Drawer.vue} | 8 +- .../vue/modules/CarrentCategoryoneModal.vue} | 8 +- .../vue3/CarrentCategoryone.api.ts} | 14 +- .../vue3/CarrentCategoryone.data.ts} | 4 +- .../vue3/CarrentCategoryoneList.vue} | 14 +- .../vue3/components/CarrentCategoryoneModal.vue} | 4 +- .../controller/CarrentCategorytwoController.java | 171 ++++++++++++ .../entity/CarrentCategorytwo.java} | 29 +- .../mapper/CarrentCategorytwoMapper.java | 17 ++ .../mapper/xml/CarrentCategorytwoMapper.xml | 5 + .../service/ICarrentCategorytwoService.java | 14 + .../impl/CarrentCategorytwoServiceImpl.java | 19 ++ .../vue/CarrentCategorytwoList.vue} | 35 ++- .../vue/modules/CarrentCategorytwoForm.vue} | 16 +- .../CarrentCategorytwoModal.Style#Drawer.vue | 84 ++++++ .../vue/modules/CarrentCategorytwoModal.vue | 60 ++++ .../vue3/CarrentCategorytwo.api.ts | 61 ++++ .../vue3/CarrentCategorytwo.data.ts} | 21 +- .../vue3/CarrentCategorytwoList.vue | 162 +++++++++++ .../vue3/components/CarrentCategorytwoModal.vue | 58 ++++ .../mapper/CarrentComponentMapper.java | 17 -- .../service/ICarrentComponentService.java | 14 - .../service/impl/CarrentComponentServiceImpl.java | 19 -- .../controller/CarrentConfigController.java} | 84 +++--- .../entity/CarrentConfig.java} | 28 +- .../carrentConfig/mapper/CarrentConfigMapper.java | 17 ++ .../mapper/xml/CarrentConfigMapper.xml} | 2 +- .../service/ICarrentConfigService.java | 14 + .../service/impl/CarrentConfigServiceImpl.java | 19 ++ .../vue/CarrentConfigList.vue} | 40 +-- .../vue/modules/CarrentConfigForm.vue} | 22 +- .../modules/CarrentConfigModal.Style#Drawer.vue} | 8 +- .../vue/modules/CarrentConfigModal.vue} | 8 +- .../vue3/CarrentConfig.api.ts} | 14 +- .../vue3/CarrentConfig.data.ts} | 28 +- .../vue3/CarrentConfigList.vue} | 14 +- .../vue3/components/CarrentConfigModal.vue} | 4 +- .../controller/CarrentGoodsController.java} | 84 +++--- .../entity/CarrentGoods.java} | 87 +++--- .../carrentGoods/mapper/CarrentGoodsMapper.java | 17 ++ .../mapper/xml/CarrentGoodsMapper.xml} | 2 +- .../carrentGoods/service/ICarrentGoodsService.java | 14 + .../service/impl/CarrentGoodsServiceImpl.java | 19 ++ .../vue/CarrentGoodsList.vue} | 109 +++++--- .../vue/modules/CarrentGoodsForm.vue} | 73 +++-- .../modules/CarrentGoodsModal.Style#Drawer.vue} | 8 +- .../vue/modules/CarrentGoodsModal.vue} | 8 +- .../vue3/CarrentGoods.api.ts} | 14 +- .../vue3/CarrentGoods.data.ts} | 146 ++++++---- .../vue3/CarrentGoodsList.vue} | 14 +- .../vue3/components/CarrentGoodsModal.vue} | 4 +- .../mapper/CarrentMileageMapper.java | 17 -- .../service/ICarrentMileageService.java | 14 - .../service/impl/CarrentMileageServiceImpl.java | 19 -- .../controller/CarrentNewsController.java | 2 +- .../modules/carrentNews/entity/CarrentNews.java | 10 +- .../carrentNews/mapper/CarrentNewsMapper.java | 2 +- .../carrentNews/service/ICarrentNewsService.java | 2 +- .../service/impl/CarrentNewsServiceImpl.java | 2 +- .../modules/carrentNews/vue/CarrentNewsList.vue | 16 +- .../carrentNews/vue/modules/CarrentNewsForm.vue | 12 +- .../modules/carrentNews/vue3/CarrentNews.data.ts | 28 +- .../controller/CarrentOrderController.java | 2 +- .../modules/carrentOrder/entity/CarrentOrder.java | 22 +- .../carrentOrder/mapper/CarrentOrderMapper.java | 2 +- .../carrentOrder/service/ICarrentOrderService.java | 2 +- .../service/impl/CarrentOrderServiceImpl.java | 2 +- .../modules/carrentOrder/vue/CarrentOrderList.vue | 8 +- .../carrentOrder/vue/modules/CarrentOrderForm.vue | 8 +- .../modules/carrentOrder/vue3/CarrentOrder.data.ts | 10 +- .../controller/CarrentTypeController.java} | 84 +++--- .../entity/CarrentType.java} | 18 +- .../carrentType/mapper/CarrentTypeMapper.java | 17 ++ .../mapper/xml/CarrentTypeMapper.xml} | 2 +- .../carrentType/service/ICarrentTypeService.java | 14 + .../service/impl/CarrentTypeServiceImpl.java | 19 ++ .../vue/CarrentTypeList.vue} | 26 +- .../vue/modules/CarrentTypeForm.vue} | 12 +- .../vue/modules/CarrentTypeModal.Style#Drawer.vue} | 8 +- .../vue/modules/CarrentTypeModal.vue} | 8 +- .../vue3/CarrentType.api.ts} | 14 +- .../vue3/CarrentType.data.ts} | 4 +- .../vue3/CarrentTypeList.vue} | 14 +- .../vue3/components/CarrentTypeModal.vue} | 4 +- .../api/carrentController/ApplyController.java | 61 ++++ .../api/carrentController/BannerController.java | 32 +++ .../api/carrentController/CarController.java | 38 --- .../api/carrentController/CompanyController.java | 5 +- .../api/carrentController/ConfigController.java | 75 +++++ .../api/carrentController/GoodsController.java | 82 ++++++ .../api/carrentController/LoginApiController.java | 28 +- .../api/carrentController/NewsController.java | 1 - .../api/carrentController/OrderController.java | 19 +- .../api/carrentController/UserController.java | 13 +- .../java/org/jeecg/modules/apiBean/CarBean.java | 38 --- .../java/org/jeecg/modules/apiBean/OrderBean.java | 38 --- .../org/jeecg/modules/apiService/ApplyService.java | 26 ++ .../jeecg/modules/apiService/BannerService.java | 15 + .../org/jeecg/modules/apiService/CarService.java | 24 -- .../jeecg/modules/apiService/CompanyService.java | 5 +- .../jeecg/modules/apiService/ConfigService.java | 57 ++++ .../org/jeecg/modules/apiService/GoodsService.java | 33 +++ .../org/jeecg/modules/apiService/OrderService.java | 7 - .../org/jeecg/modules/apiService/UserService.java | 10 +- .../modules/apiService/impl/ApplyServiceImpl.java | 94 +++++++ .../modules/apiService/impl/BannerServiceImpl.java | 54 ++++ .../modules/apiService/impl/CarServiceImpl.java | 107 ------- .../apiService/impl/CompanyServiceImpl.java | 11 +- .../modules/apiService/impl/ConfigServiceImpl.java | 297 ++++++++++++++++++++ .../modules/apiService/impl/GoodsServiceImpl.java | 149 ++++++++++ .../modules/apiService/impl/NewsServiceImpl.java | 3 - .../modules/apiService/impl/OrderServiceImpl.java | 23 +- .../modules/apiService/impl/UserServiceImpl.java | 24 +- 146 files changed, 3744 insertions(+), 1315 deletions(-) create mode 100644 .idea/uiDesigner.xml rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentCategory/controller/CarrentCategoryController.java => carrentApply/controller/CarrentApplyController.java} (56%) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/entity/CarrentApply.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/mapper/CarrentApplyMapper.java rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentArea/mapper/xml/CarrentAreaMapper.xml => carrentApply/mapper/xml/CarrentApplyMapper.xml} (62%) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/ICarrentApplyService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/impl/CarrentApplyServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/CarrentApplyList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/modules/CarrentApplyForm.vue rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentArea/vue/modules/CarrentAreaModal.Style#Drawer.vue => carrentApply/vue/modules/CarrentApplyModal.Style#Drawer.vue} (87%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentArea/vue/modules/CarrentAreaModal.vue => carrentApply/vue/modules/CarrentApplyModal.vue} (82%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentCar/vue3/CarrentCar.api.ts => carrentApply/vue3/CarrentApply.api.ts} (76%) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue3/CarrentApply.data.ts rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentCar/vue3/CarrentCarList.vue => carrentApply/vue3/CarrentApplyList.vue} (91%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentCar/vue3/components/CarrentCarModal.vue => carrentApply/vue3/components/CarrentApplyModal.vue} (94%) delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/mapper/CarrentAreaMapper.java delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/service/ICarrentAreaService.java delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/service/impl/CarrentAreaServiceImpl.java delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/mapper/CarrentCarMapper.java delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/service/ICarrentCarService.java delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/service/impl/CarrentCarServiceImpl.java delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/mapper/CarrentCategoryMapper.java delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/service/ICarrentCategoryService.java delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/service/impl/CarrentCategoryServiceImpl.java rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentComponent/controller/CarrentComponentController.java => carrentCategoryone/controller/CarrentCategoryoneController.java} (53%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentComponent/entity/CarrentComponent.java => carrentCategoryone/entity/CarrentCategoryone.java} (67%) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/mapper/CarrentCategoryoneMapper.java rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentComponent/mapper/xml/CarrentComponentMapper.xml => carrentCategoryone/mapper/xml/CarrentCategoryoneMapper.xml} (59%) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/service/ICarrentCategoryoneService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/service/impl/CarrentCategoryoneServiceImpl.java rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentComponent/vue/CarrentComponentList.vue => carrentCategoryone/vue/CarrentCategoryoneList.vue} (85%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentComponent/vue/modules/CarrentComponentForm.vue => carrentCategoryone/vue/modules/CarrentCategoryoneForm.vue} (85%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentComponent/vue/modules/CarrentComponentModal.Style#Drawer.vue => carrentCategoryone/vue/modules/CarrentCategoryoneModal.Style#Drawer.vue} (85%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentComponent/vue/modules/CarrentComponentModal.vue => carrentCategoryone/vue/modules/CarrentCategoryoneModal.vue} (80%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentComponent/vue3/CarrentComponent.api.ts => carrentCategoryone/vue3/CarrentCategoryone.api.ts} (72%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentComponent/vue3/CarrentComponent.data.ts => carrentCategoryone/vue3/CarrentCategoryone.data.ts} (88%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentComponent/vue3/CarrentComponentList.vue => carrentCategoryone/vue3/CarrentCategoryoneList.vue} (90%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentComponent/vue3/components/CarrentComponentModal.vue => carrentCategoryone/vue3/components/CarrentCategoryoneModal.vue} (93%) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/controller/CarrentCategorytwoController.java rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentMileage/entity/CarrentMileage.java => carrentCategorytwo/entity/CarrentCategorytwo.java} (64%) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/mapper/CarrentCategorytwoMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/mapper/xml/CarrentCategorytwoMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/service/ICarrentCategorytwoService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/service/impl/CarrentCategorytwoServiceImpl.java rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentArea/vue/CarrentAreaList.vue => carrentCategorytwo/vue/CarrentCategorytwoList.vue} (80%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentMileage/vue/modules/CarrentMileageForm.vue => carrentCategorytwo/vue/modules/CarrentCategorytwoForm.vue} (75%) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue/modules/CarrentCategorytwoModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue/modules/CarrentCategorytwoModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue3/CarrentCategorytwo.api.ts rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentMileage/vue3/CarrentMileage.data.ts => carrentCategorytwo/vue3/CarrentCategorytwo.data.ts} (58%) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue3/CarrentCategorytwoList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue3/components/CarrentCategorytwoModal.vue delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/mapper/CarrentComponentMapper.java delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/service/ICarrentComponentService.java delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/service/impl/CarrentComponentServiceImpl.java rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentMileage/controller/CarrentMileageController.java => carrentConfig/controller/CarrentConfigController.java} (55%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentArea/entity/CarrentArea.java => carrentConfig/entity/CarrentConfig.java} (66%) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/mapper/CarrentConfigMapper.java rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentMileage/mapper/xml/CarrentMileageMapper.xml => carrentConfig/mapper/xml/CarrentConfigMapper.xml} (61%) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/service/ICarrentConfigService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/service/impl/CarrentConfigServiceImpl.java rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentMileage/vue/CarrentMileageList.vue => carrentConfig/vue/CarrentConfigList.vue} (80%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentArea/vue/modules/CarrentAreaForm.vue => carrentConfig/vue/modules/CarrentConfigForm.vue} (69%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentMileage/vue/modules/CarrentMileageModal.Style#Drawer.vue => carrentConfig/vue/modules/CarrentConfigModal.Style#Drawer.vue} (86%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentMileage/vue/modules/CarrentMileageModal.vue => carrentConfig/vue/modules/CarrentConfigModal.vue} (81%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentMileage/vue3/CarrentMileage.api.ts => carrentConfig/vue3/CarrentConfig.api.ts} (75%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentArea/vue3/CarrentArea.data.ts => carrentConfig/vue3/CarrentConfig.data.ts} (50%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentCategory/vue3/CarrentCategoryList.vue => carrentConfig/vue3/CarrentConfigList.vue} (91%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentMileage/vue3/components/CarrentMileageModal.vue => carrentConfig/vue3/components/CarrentConfigModal.vue} (93%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentCar/controller/CarrentCarController.java => carrentGoods/controller/CarrentGoodsController.java} (57%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentCar/entity/CarrentCar.java => carrentGoods/entity/CarrentGoods.java} (57%) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/mapper/CarrentGoodsMapper.java rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentCategory/mapper/xml/CarrentCategoryMapper.xml => carrentGoods/mapper/xml/CarrentGoodsMapper.xml} (61%) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/service/ICarrentGoodsService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/service/impl/CarrentGoodsServiceImpl.java rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentCar/vue/CarrentCarList.vue => carrentGoods/vue/CarrentGoodsList.vue} (70%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentCar/vue/modules/CarrentCarForm.vue => carrentGoods/vue/modules/CarrentGoodsForm.vue} (60%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentCategory/vue/modules/CarrentCategoryModal.Style#Drawer.vue => carrentGoods/vue/modules/CarrentGoodsModal.Style#Drawer.vue} (86%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentCategory/vue/modules/CarrentCategoryModal.vue => carrentGoods/vue/modules/CarrentGoodsModal.vue} (81%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentCategory/vue3/CarrentCategory.api.ts => carrentGoods/vue3/CarrentGoods.api.ts} (74%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentCar/vue3/CarrentCar.data.ts => carrentGoods/vue3/CarrentGoods.data.ts} (57%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentMileage/vue3/CarrentMileageList.vue => carrentGoods/vue3/CarrentGoodsList.vue} (91%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentCategory/vue3/components/CarrentCategoryModal.vue => carrentGoods/vue3/components/CarrentGoodsModal.vue} (93%) delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/mapper/CarrentMileageMapper.java delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/service/ICarrentMileageService.java delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/service/impl/CarrentMileageServiceImpl.java rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentArea/controller/CarrentAreaController.java => carrentType/controller/CarrentTypeController.java} (58%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentCategory/entity/CarrentCategory.java => carrentType/entity/CarrentType.java} (79%) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/mapper/CarrentTypeMapper.java rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentCar/mapper/xml/CarrentCarMapper.xml => carrentType/mapper/xml/CarrentTypeMapper.xml} (63%) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/service/ICarrentTypeService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/service/impl/CarrentTypeServiceImpl.java rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentCategory/vue/CarrentCategoryList.vue => carrentType/vue/CarrentTypeList.vue} (86%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentCategory/vue/modules/CarrentCategoryForm.vue => carrentType/vue/modules/CarrentTypeForm.vue} (88%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentCar/vue/modules/CarrentCarModal.Style#Drawer.vue => carrentType/vue/modules/CarrentTypeModal.Style#Drawer.vue} (87%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentCar/vue/modules/CarrentCarModal.vue => carrentType/vue/modules/CarrentTypeModal.vue} (82%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentArea/vue3/CarrentArea.api.ts => carrentType/vue3/CarrentType.api.ts} (77%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentCategory/vue3/CarrentCategory.data.ts => carrentType/vue3/CarrentType.data.ts} (90%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentArea/vue3/CarrentAreaList.vue => carrentType/vue3/CarrentTypeList.vue} (91%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{carrentArea/vue3/components/CarrentAreaModal.vue => carrentType/vue3/components/CarrentTypeModal.vue} (94%) create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ApplyController.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/BannerController.java delete mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/CarController.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ConfigController.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/GoodsController.java delete mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/CarBean.java delete mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/OrderBean.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ApplyService.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/BannerService.java delete mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CarService.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ConfigService.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/GoodsService.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ApplyServiceImpl.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/BannerServiceImpl.java delete mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CarServiceImpl.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/GoodsServiceImpl.java diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c94fe0a..0aa1bbe 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,34 +1,131 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -37,22 +134,23 @@ - - + + + - - - - + + + + - + + + - - - + + + + + - + @@ -151,9 +254,20 @@ + + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/modules/CarrentApplyForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/modules/CarrentApplyForm.vue new file mode 100644 index 0000000..e0f25f8 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/modules/CarrentApplyForm.vue @@ -0,0 +1,139 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue/modules/CarrentAreaModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/modules/CarrentApplyModal.Style#Drawer.vue similarity index 87% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue/modules/CarrentAreaModal.Style#Drawer.vue rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/modules/CarrentApplyModal.Style#Drawer.vue index 41484b5..a044c5f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue/modules/CarrentAreaModal.Style#Drawer.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/modules/CarrentApplyModal.Style#Drawer.vue @@ -7,7 +7,7 @@ @close="close" destroyOnClose :visible="visible"> - +
关闭 提交 @@ -17,12 +17,12 @@ + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue/modules/CarrentCategorytwoModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue/modules/CarrentCategorytwoModal.vue new file mode 100644 index 0000000..9abbacf --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue/modules/CarrentCategorytwoModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue3/CarrentCategorytwo.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue3/CarrentCategorytwo.api.ts new file mode 100644 index 0000000..833cf8a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue3/CarrentCategorytwo.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/carrentCategorytwo/carrentCategorytwo/list', + save='/carrentCategorytwo/carrentCategorytwo/add', + edit='/carrentCategorytwo/carrentCategorytwo/edit', + deleteOne = '/carrentCategorytwo/carrentCategorytwo/delete', + deleteBatch = '/carrentCategorytwo/carrentCategorytwo/deleteBatch', + importExcel = '/carrentCategorytwo/carrentCategorytwo/importExcel', + exportXls = '/carrentCategorytwo/carrentCategorytwo/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileage.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue3/CarrentCategorytwo.data.ts similarity index 58% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileage.data.ts rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue3/CarrentCategorytwo.data.ts index 3bb3d38..4f860c2 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileage.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue3/CarrentCategorytwo.data.ts @@ -5,14 +5,14 @@ import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '里程范围下限', + title: '二级分类名称', align:"center", - dataIndex: 'rangeLow' + dataIndex: 'name' }, { - title: '里程范围上线', + title: '关联一级分类id', align:"center", - dataIndex: 'rangeUp' + dataIndex: 'categoryoneId_dictText' }, ]; //查询数据 @@ -21,13 +21,16 @@ export const searchFormSchema: FormSchema[] = [ //表单数据 export const formSchema: FormSchema[] = [ { - label: '里程范围下限', - field: 'rangeLow', + label: '二级分类名称', + field: 'name', component: 'Input', }, { - label: '里程范围上线', - field: 'rangeUp', - component: 'Input', + label: '关联一级分类id', + field: 'categoryoneId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"carrent_categoryone,name,id" + }, }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue3/CarrentCategorytwoList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue3/CarrentCategorytwoList.vue new file mode 100644 index 0000000..c7f4288 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue3/CarrentCategorytwoList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue3/components/CarrentCategorytwoModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue3/components/CarrentCategorytwoModal.vue new file mode 100644 index 0000000..9a609ff --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue3/components/CarrentCategorytwoModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/mapper/CarrentComponentMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/mapper/CarrentComponentMapper.java deleted file mode 100644 index 839d4f8..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/mapper/CarrentComponentMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.jeecg.modules.carrentComponent.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.carrentComponent.entity.CarrentComponent; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 设备部件表 - * @Author: jeecg-boot - * @Date: 2024-11-12 - * @Version: V1.0 - */ -public interface CarrentComponentMapper extends BaseMapper { - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/service/ICarrentComponentService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/service/ICarrentComponentService.java deleted file mode 100644 index 4a4b1ea..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/service/ICarrentComponentService.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.jeecg.modules.carrentComponent.service; - -import org.jeecg.modules.carrentComponent.entity.CarrentComponent; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 设备部件表 - * @Author: jeecg-boot - * @Date: 2024-11-12 - * @Version: V1.0 - */ -public interface ICarrentComponentService extends IService { - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/service/impl/CarrentComponentServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/service/impl/CarrentComponentServiceImpl.java deleted file mode 100644 index da0dece..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/service/impl/CarrentComponentServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.jeecg.modules.carrentComponent.service.impl; - -import org.jeecg.modules.carrentComponent.entity.CarrentComponent; -import org.jeecg.modules.carrentComponent.mapper.CarrentComponentMapper; -import org.jeecg.modules.carrentComponent.service.ICarrentComponentService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 设备部件表 - * @Author: jeecg-boot - * @Date: 2024-11-12 - * @Version: V1.0 - */ -@Service -public class CarrentComponentServiceImpl extends ServiceImpl implements ICarrentComponentService { - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/controller/CarrentMileageController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/controller/CarrentConfigController.java similarity index 55% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/controller/CarrentMileageController.java rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/controller/CarrentConfigController.java index 9f05950..d459bd5 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/controller/CarrentMileageController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/controller/CarrentConfigController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.carrentMileage.controller; +package org.jeecg.modules.carrentConfig.controller; import java.util.Arrays; import java.util.List; @@ -12,8 +12,8 @@ import javax.servlet.http.HttpServletResponse; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.carrentMileage.entity.CarrentMileage; -import org.jeecg.modules.carrentMileage.service.ICarrentMileageService; +import org.jeecg.modules.carrentConfig.entity.CarrentConfig; +import org.jeecg.modules.carrentConfig.service.ICarrentConfigService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -37,66 +37,66 @@ import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; /** - * @Description: 里程范围表 + * @Description: 系统配置表 * @Author: jeecg-boot - * @Date: 2024-11-12 + * @Date: 2024-12-12 * @Version: V1.0 */ -@Api(tags="里程范围表") +@Api(tags="系统配置表") @RestController -@RequestMapping("/carrentMileage/carrentMileage") +@RequestMapping("/carrentConfig/carrentConfig") @Slf4j -public class CarrentMileageController extends JeecgController { +public class CarrentConfigController extends JeecgController { @Autowired - private ICarrentMileageService carrentMileageService; + private ICarrentConfigService carrentConfigService; /** * 分页列表查询 * - * @param carrentMileage + * @param carrentConfig * @param pageNo * @param pageSize * @param req * @return */ - //@AutoLog(value = "里程范围表-分页列表查询") - @ApiOperation(value="里程范围表-分页列表查询", notes="里程范围表-分页列表查询") + //@AutoLog(value = "系统配置表-分页列表查询") + @ApiOperation(value="系统配置表-分页列表查询", notes="系统配置表-分页列表查询") @GetMapping(value = "/list") - public Result> queryPageList(CarrentMileage carrentMileage, + public Result> queryPageList(CarrentConfig carrentConfig, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(carrentMileage, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = carrentMileageService.page(page, queryWrapper); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(carrentConfig, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = carrentConfigService.page(page, queryWrapper); return Result.OK(pageList); } /** * 添加 * - * @param carrentMileage + * @param carrentConfig * @return */ - @AutoLog(value = "里程范围表-添加") - @ApiOperation(value="里程范围表-添加", notes="里程范围表-添加") + @AutoLog(value = "系统配置表-添加") + @ApiOperation(value="系统配置表-添加", notes="系统配置表-添加") @PostMapping(value = "/add") - public Result add(@RequestBody CarrentMileage carrentMileage) { - carrentMileageService.save(carrentMileage); + public Result add(@RequestBody CarrentConfig carrentConfig) { + carrentConfigService.save(carrentConfig); return Result.OK("添加成功！"); } /** * 编辑 * - * @param carrentMileage + * @param carrentConfig * @return */ - @AutoLog(value = "里程范围表-编辑") - @ApiOperation(value="里程范围表-编辑", notes="里程范围表-编辑") + @AutoLog(value = "系统配置表-编辑") + @ApiOperation(value="系统配置表-编辑", notes="系统配置表-编辑") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody CarrentMileage carrentMileage) { - carrentMileageService.updateById(carrentMileage); + public Result edit(@RequestBody CarrentConfig carrentConfig) { + carrentConfigService.updateById(carrentConfig); return Result.OK("编辑成功!"); } @@ -106,11 +106,11 @@ public class CarrentMileageController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { - carrentMileageService.removeById(id); + carrentConfigService.removeById(id); return Result.OK("删除成功!"); } @@ -120,11 +120,11 @@ public class CarrentMileageController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.carrentMileageService.removeByIds(Arrays.asList(ids.split(","))); + this.carrentConfigService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } @@ -134,26 +134,26 @@ public class CarrentMileageController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { - CarrentMileage carrentMileage = carrentMileageService.getById(id); - if(carrentMileage==null) { + public Result queryById(@RequestParam(name="id",required=true) String id) { + CarrentConfig carrentConfig = carrentConfigService.getById(id); + if(carrentConfig==null) { return Result.error("未找到对应数据"); } - return Result.OK(carrentMileage); + return Result.OK(carrentConfig); } /** * 导出excel * * @param request - * @param carrentMileage + * @param carrentConfig */ @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, CarrentMileage carrentMileage) { - return super.exportXls(request, carrentMileage, CarrentMileage.class, "里程范围表"); + public ModelAndView exportXls(HttpServletRequest request, CarrentConfig carrentConfig) { + return super.exportXls(request, carrentConfig, CarrentConfig.class, "系统配置表"); } /** @@ -165,7 +165,7 @@ public class CarrentMileageController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, CarrentMileage.class); + return super.importExcel(request, response, CarrentConfig.class); } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/entity/CarrentArea.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/entity/CarrentConfig.java similarity index 66% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/entity/CarrentArea.java rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/entity/CarrentConfig.java index 0303d5c..11c5085 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/entity/CarrentArea.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/entity/CarrentConfig.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.carrentArea.entity; +package org.jeecg.modules.carrentConfig.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; @@ -18,17 +18,17 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - * @Description: 区域表 + * @Description: 系统配置表 * @Author: jeecg-boot - * @Date: 2024-11-12 + * @Date: 2024-12-12 * @Version: V1.0 */ @Data -@TableName("carrent_area") +@TableName("carrent_config") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="carrent_area对象", description="区域表") -public class CarrentArea implements Serializable { +@ApiModel(value="carrent_config对象", description="系统配置表") +public class CarrentConfig implements Serializable { private static final long serialVersionUID = 1L; /**主键*/ @@ -47,8 +47,16 @@ public class CarrentArea implements Serializable { /**更新日期*/ @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; - /**所属区域*/ - @Excel(name = "所属区域", width = 15) - @ApiModelProperty(value = "所属区域") - private java.lang.String area; + /**参数编码*/ + @Excel(name = "参数编码", width = 15) + @ApiModelProperty(value = "参数编码") + private java.lang.String paramCode; + /**参数值*/ + @Excel(name = "参数值", width = 15) + @ApiModelProperty(value = "参数值") + private java.lang.String paramValue; + /**参数描述*/ + @Excel(name = "参数描述", width = 15) + @ApiModelProperty(value = "参数描述") + private java.lang.String paramDescribe; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/mapper/CarrentConfigMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/mapper/CarrentConfigMapper.java new file mode 100644 index 0000000..ef805ab --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/mapper/CarrentConfigMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.carrentConfig.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.carrentConfig.entity.CarrentConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 系统配置表 + * @Author: jeecg-boot + * @Date: 2024-12-12 + * @Version: V1.0 + */ +public interface CarrentConfigMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/mapper/xml/CarrentMileageMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/mapper/xml/CarrentConfigMapper.xml similarity index 61% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/mapper/xml/CarrentMileageMapper.xml rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/mapper/xml/CarrentConfigMapper.xml index bfb14ef..1d35757 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/mapper/xml/CarrentMileageMapper.xml +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/mapper/xml/CarrentConfigMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/service/ICarrentConfigService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/service/ICarrentConfigService.java new file mode 100644 index 0000000..ba06d0f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/service/ICarrentConfigService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.carrentConfig.service; + +import org.jeecg.modules.carrentConfig.entity.CarrentConfig; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 系统配置表 + * @Author: jeecg-boot + * @Date: 2024-12-12 + * @Version: V1.0 + */ +public interface ICarrentConfigService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/service/impl/CarrentConfigServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/service/impl/CarrentConfigServiceImpl.java new file mode 100644 index 0000000..bf509c6 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/service/impl/CarrentConfigServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.carrentConfig.service.impl; + +import org.jeecg.modules.carrentConfig.entity.CarrentConfig; +import org.jeecg.modules.carrentConfig.mapper.CarrentConfigMapper; +import org.jeecg.modules.carrentConfig.service.ICarrentConfigService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 系统配置表 + * @Author: jeecg-boot + * @Date: 2024-12-12 + * @Version: V1.0 + */ +@Service +public class CarrentConfigServiceImpl extends ServiceImpl implements ICarrentConfigService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/CarrentMileageList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue/CarrentConfigList.vue similarity index 80% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/CarrentMileageList.vue rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue/CarrentConfigList.vue index eb7257c..1a53bec 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/CarrentMileageList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue/CarrentConfigList.vue @@ -12,7 +12,7 @@
新增 - 导出 + 导出 导入 @@ -89,7 +89,7 @@
- + @@ -98,17 +98,17 @@ import '@/assets/less/TableExpand.less' import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' - import CarrentMileageModal from './modules/CarrentMileageModal' + import CarrentConfigModal from './modules/CarrentConfigModal' export default { - name: 'CarrentMileageList', + name: 'CarrentConfigList', mixins:[JeecgListMixin, mixinDevice], components: { - CarrentMileageModal + CarrentConfigModal }, data () { return { - description: '里程范围表管理页面', + description: '系统配置表管理页面', // 表头 columns: [ { @@ -122,14 +122,19 @@ } }, { - title:'里程范围下限', + title:'参数编码', align:"center", - dataIndex: 'rangeLow' + dataIndex: 'paramCode' }, { - title:'里程范围上线', + title:'参数值', align:"center", - dataIndex: 'rangeUp' + dataIndex: 'paramValue' + }, + { + title:'参数描述', + align:"center", + dataIndex: 'paramDescribe' }, { title: '操作', @@ -141,11 +146,11 @@ } ], url: { - list: "/carrentMileage/carrentMileage/list", - delete: "/carrentMileage/carrentMileage/delete", - deleteBatch: "/carrentMileage/carrentMileage/deleteBatch", - exportXlsUrl: "/carrentMileage/carrentMileage/exportXls", - importExcelUrl: "carrentMileage/carrentMileage/importExcel", + list: "/carrentConfig/carrentConfig/list", + delete: "/carrentConfig/carrentConfig/delete", + deleteBatch: "/carrentConfig/carrentConfig/deleteBatch", + exportXlsUrl: "/carrentConfig/carrentConfig/exportXls", + importExcelUrl: "carrentConfig/carrentConfig/importExcel", }, dictOptions:{}, @@ -165,8 +170,9 @@ }, getSuperFieldList(){ let fieldList=[]; - fieldList.push({type:'string',value:'rangeLow',text:'里程范围下限',dictCode:''}) - fieldList.push({type:'string',value:'rangeUp',text:'里程范围上线',dictCode:''}) + fieldList.push({type:'string',value:'paramCode',text:'参数编码',dictCode:''}) + fieldList.push({type:'Text',value:'paramValue',text:'参数值',dictCode:''}) + fieldList.push({type:'string',value:'paramDescribe',text:'参数描述',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue/modules/CarrentAreaForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue/modules/CarrentConfigForm.vue similarity index 69% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue/modules/CarrentAreaForm.vue rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue/modules/CarrentConfigForm.vue index c9dc4cf..f0f9b6e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue/modules/CarrentAreaForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue/modules/CarrentConfigForm.vue @@ -4,8 +4,18 @@ - - + + + + + + + + + + + + @@ -20,7 +30,7 @@ import { validateDuplicateValue } from '@/utils/util' export default { - name: 'CarrentAreaForm', + name: 'CarrentConfigForm', components: { }, props: { @@ -47,9 +57,9 @@ validatorRules: { }, url: { - add: "/carrentArea/carrentArea/add", - edit: "/carrentArea/carrentArea/edit", - queryById: "/carrentArea/carrentArea/queryById" + add: "/carrentConfig/carrentConfig/add", + edit: "/carrentConfig/carrentConfig/edit", + queryById: "/carrentConfig/carrentConfig/queryById" } } }, diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue/modules/CarrentConfigModal.Style#Drawer.vue similarity index 86% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageModal.Style#Drawer.vue rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue/modules/CarrentConfigModal.Style#Drawer.vue index 5d739c7..896212a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageModal.Style#Drawer.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue/modules/CarrentConfigModal.Style#Drawer.vue @@ -7,7 +7,7 @@ @close="close" destroyOnClose :visible="visible"> - +
关闭 提交 @@ -17,12 +17,12 @@