From ffee498a51fd85f3d3048fbd656bd114045bab1f Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Tue, 12 Nov 2024 15:29:46 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CarrentAreaController.java | 171 +++++++++++++++ .../modules/carrentArea/entity/CarrentArea.java | 54 +++++ .../carrentArea/mapper/CarrentAreaMapper.java | 17 ++ .../carrentArea/mapper/xml/CarrentAreaMapper.xml | 5 + .../carrentArea/service/ICarrentAreaService.java | 14 ++ .../service/impl/CarrentAreaServiceImpl.java | 19 ++ .../modules/carrentArea/vue/CarrentAreaList.vue | 171 +++++++++++++++ .../carrentArea/vue/modules/CarrentAreaForm.vue | 104 +++++++++ .../vue/modules/CarrentAreaModal.Style#Drawer.vue | 84 ++++++++ .../carrentArea/vue/modules/CarrentAreaModal.vue | 60 ++++++ .../modules/carrentArea/vue3/CarrentArea.api.ts | 61 ++++++ .../modules/carrentArea/vue3/CarrentArea.data.ts | 23 ++ .../modules/carrentArea/vue3/CarrentAreaList.vue | 162 ++++++++++++++ .../vue3/components/CarrentAreaModal.vue | 58 +++++ .../controller/CarrentBannerController.java | 171 +++++++++++++++ .../carrentBanner/entity/CarrentBanner.java | 58 +++++ .../carrentBanner/mapper/CarrentBannerMapper.java | 17 ++ .../mapper/xml/CarrentBannerMapper.xml | 5 + .../service/ICarrentBannerService.java | 14 ++ .../service/impl/CarrentBannerServiceImpl.java | 19 ++ .../carrentBanner/vue/CarrentBannerList.vue | 178 ++++++++++++++++ .../vue/modules/CarrentBannerForm.vue | 109 ++++++++++ .../modules/CarrentBannerModal.Style#Drawer.vue | 84 ++++++++ .../vue/modules/CarrentBannerModal.vue | 60 ++++++ .../carrentBanner/vue3/CarrentBanner.api.ts | 61 ++++++ .../carrentBanner/vue3/CarrentBanner.data.ts | 36 ++++ .../carrentBanner/vue3/CarrentBannerList.vue | 162 ++++++++++++++ .../vue3/components/CarrentBannerModal.vue | 58 +++++ .../controller/CarrentCarController.java | 171 +++++++++++++++ .../modules/carrentCar/entity/CarrentCar.java | 98 +++++++++ .../carrentCar/mapper/CarrentCarMapper.java | 17 ++ .../carrentCar/mapper/xml/CarrentCarMapper.xml | 5 + .../carrentCar/service/ICarrentCarService.java | 14 ++ .../service/impl/CarrentCarServiceImpl.java | 19 ++ .../modules/carrentCar/vue/CarrentCarList.vue | 237 +++++++++++++++++++++ .../carrentCar/vue/modules/CarrentCarForm.vue | 159 ++++++++++++++ .../vue/modules/CarrentCarModal.Style#Drawer.vue | 84 ++++++++ .../carrentCar/vue/modules/CarrentCarModal.vue | 60 ++++++ .../modules/carrentCar/vue3/CarrentCar.api.ts | 61 ++++++ .../modules/carrentCar/vue3/CarrentCar.data.ts | 133 ++++++++++++ .../modules/carrentCar/vue3/CarrentCarList.vue | 162 ++++++++++++++ .../carrentCar/vue3/components/CarrentCarModal.vue | 58 +++++ .../controller/CarrentCategoryController.java | 171 +++++++++++++++ .../carrentCategory/entity/CarrentCategory.java | 54 +++++ .../mapper/CarrentCategoryMapper.java | 17 ++ .../mapper/xml/CarrentCategoryMapper.xml | 5 + .../service/ICarrentCategoryService.java | 14 ++ .../service/impl/CarrentCategoryServiceImpl.java | 19 ++ .../carrentCategory/vue/CarrentCategoryList.vue | 171 +++++++++++++++ .../vue/modules/CarrentCategoryForm.vue | 104 +++++++++ .../modules/CarrentCategoryModal.Style#Drawer.vue | 84 ++++++++ .../vue/modules/CarrentCategoryModal.vue | 60 ++++++ .../carrentCategory/vue3/CarrentCategory.api.ts | 61 ++++++ .../carrentCategory/vue3/CarrentCategory.data.ts | 23 ++ .../carrentCategory/vue3/CarrentCategoryList.vue | 162 ++++++++++++++ .../vue3/components/CarrentCategoryModal.vue | 58 +++++ .../controller/CarrentCompanyController.java | 171 +++++++++++++++ .../carrentCompany/entity/CarrentCompany.java | 79 +++++++ .../mapper/CarrentCompanyMapper.java | 17 ++ .../mapper/xml/CarrentCompanyMapper.xml | 5 + .../service/ICarrentCompanyService.java | 14 ++ .../service/impl/CarrentCompanyServiceImpl.java | 19 ++ .../carrentCompany/vue/CarrentCompanyList.vue | 209 ++++++++++++++++++ .../vue/modules/CarrentCompanyForm.vue | 134 ++++++++++++ .../modules/CarrentCompanyModal.Style#Drawer.vue | 84 ++++++++ .../vue/modules/CarrentCompanyModal.vue | 60 ++++++ .../carrentCompany/vue3/CarrentCompany.api.ts | 61 ++++++ .../carrentCompany/vue3/CarrentCompany.data.ts | 89 ++++++++ .../carrentCompany/vue3/CarrentCompanyList.vue | 162 ++++++++++++++ .../vue3/components/CarrentCompanyModal.vue | 58 +++++ .../controller/CarrentComponentController.java | 171 +++++++++++++++ .../carrentComponent/entity/CarrentComponent.java | 54 +++++ .../mapper/CarrentComponentMapper.java | 17 ++ .../mapper/xml/CarrentComponentMapper.xml | 5 + .../service/ICarrentComponentService.java | 14 ++ .../service/impl/CarrentComponentServiceImpl.java | 19 ++ .../carrentComponent/vue/CarrentComponentList.vue | 171 +++++++++++++++ .../vue/modules/CarrentComponentForm.vue | 104 +++++++++ .../modules/CarrentComponentModal.Style#Drawer.vue | 84 ++++++++ .../vue/modules/CarrentComponentModal.vue | 60 ++++++ .../carrentComponent/vue3/CarrentComponent.api.ts | 61 ++++++ .../carrentComponent/vue3/CarrentComponent.data.ts | 23 ++ .../carrentComponent/vue3/CarrentComponentList.vue | 162 ++++++++++++++ .../vue3/components/CarrentComponentModal.vue | 58 +++++ .../controller/CarrentMileageController.java | 171 +++++++++++++++ .../carrentMileage/entity/CarrentMileage.java | 58 +++++ .../mapper/CarrentMileageMapper.java | 17 ++ .../mapper/xml/CarrentMileageMapper.xml | 5 + .../service/ICarrentMileageService.java | 14 ++ .../service/impl/CarrentMileageServiceImpl.java | 19 ++ .../carrentMileage/vue/CarrentMileageList.vue | 177 +++++++++++++++ .../vue/modules/CarrentMileageForm.vue | 109 ++++++++++ .../modules/CarrentMileageModal.Style#Drawer.vue | 84 ++++++++ .../vue/modules/CarrentMileageModal.vue | 60 ++++++ .../carrentMileage/vue3/CarrentMileage.api.ts | 61 ++++++ .../carrentMileage/vue3/CarrentMileage.data.ts | 33 +++ .../carrentMileage/vue3/CarrentMileageList.vue | 162 ++++++++++++++ .../vue3/components/CarrentMileageModal.vue | 58 +++++ .../controller/CarrentNewsController.java | 171 +++++++++++++++ .../modules/carrentNews/entity/CarrentNews.java | 58 +++++ .../carrentNews/mapper/CarrentNewsMapper.java | 17 ++ .../carrentNews/mapper/xml/CarrentNewsMapper.xml | 5 + .../carrentNews/service/ICarrentNewsService.java | 14 ++ .../service/impl/CarrentNewsServiceImpl.java | 19 ++ .../modules/carrentNews/vue/CarrentNewsList.vue | 177 +++++++++++++++ .../carrentNews/vue/modules/CarrentNewsForm.vue | 109 ++++++++++ .../vue/modules/CarrentNewsModal.Style#Drawer.vue | 84 ++++++++ .../carrentNews/vue/modules/CarrentNewsModal.vue | 60 ++++++ .../modules/carrentNews/vue3/CarrentNews.api.ts | 61 ++++++ .../modules/carrentNews/vue3/CarrentNews.data.ts | 33 +++ .../modules/carrentNews/vue3/CarrentNewsList.vue | 162 ++++++++++++++ .../vue3/components/CarrentNewsModal.vue | 58 +++++ .../controller/CarrentUserController.java | 171 +++++++++++++++ .../modules/carrentUser/entity/CarrentUser.java | 71 ++++++ .../carrentUser/mapper/CarrentUserMapper.java | 17 ++ .../carrentUser/mapper/xml/CarrentUserMapper.xml | 5 + .../carrentUser/service/ICarrentUserService.java | 14 ++ .../service/impl/CarrentUserServiceImpl.java | 19 ++ .../modules/carrentUser/vue/CarrentUserList.vue | 197 +++++++++++++++++ .../carrentUser/vue/modules/CarrentUserForm.vue | 124 +++++++++++ .../vue/modules/CarrentUserModal.Style#Drawer.vue | 84 ++++++++ .../carrentUser/vue/modules/CarrentUserModal.vue | 60 ++++++ .../modules/carrentUser/vue3/CarrentUser.api.ts | 61 ++++++ .../modules/carrentUser/vue3/CarrentUser.data.ts | 69 ++++++ .../modules/carrentUser/vue3/CarrentUserList.vue | 162 ++++++++++++++ .../vue3/components/CarrentUserModal.vue | 58 +++++ .../controller/CarrrentOrderController.java | 171 +++++++++++++++ .../carrrentOrder/entity/CarrrentOrder.java | 76 +++++++ .../carrrentOrder/mapper/CarrrentOrderMapper.java | 17 ++ .../mapper/xml/CarrrentOrderMapper.xml | 5 + .../service/ICarrrentOrderService.java | 14 ++ .../service/impl/CarrrentOrderServiceImpl.java | 19 ++ .../carrrentOrder/vue/CarrrentOrderList.vue | 202 ++++++++++++++++++ .../vue/modules/CarrrentOrderForm.vue | 129 +++++++++++ .../modules/CarrrentOrderModal.Style#Drawer.vue | 84 ++++++++ .../vue/modules/CarrrentOrderModal.vue | 60 ++++++ .../carrrentOrder/vue3/CarrrentOrder.api.ts | 61 ++++++ .../carrrentOrder/vue3/CarrrentOrder.data.ts | 79 +++++++ .../carrrentOrder/vue3/CarrrentOrderList.vue | 162 ++++++++++++++ .../vue3/components/CarrrentOrderModal.vue | 58 +++++ 140 files changed, 10786 insertions(+) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/controller/CarrentAreaController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/entity/CarrentArea.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/mapper/CarrentAreaMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/mapper/xml/CarrentAreaMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/service/ICarrentAreaService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/service/impl/CarrentAreaServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue/CarrentAreaList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue/modules/CarrentAreaForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue/modules/CarrentAreaModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue/modules/CarrentAreaModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue3/CarrentArea.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue3/CarrentArea.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue3/CarrentAreaList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue3/components/CarrentAreaModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/controller/CarrentBannerController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/entity/CarrentBanner.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/mapper/CarrentBannerMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/mapper/xml/CarrentBannerMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/service/ICarrentBannerService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/service/impl/CarrentBannerServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue/CarrentBannerList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue/modules/CarrentBannerForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue/modules/CarrentBannerModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue/modules/CarrentBannerModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue3/CarrentBanner.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue3/CarrentBanner.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue3/CarrentBannerList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue3/components/CarrentBannerModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/controller/CarrentCarController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/entity/CarrentCar.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/mapper/CarrentCarMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/mapper/xml/CarrentCarMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/service/ICarrentCarService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/service/impl/CarrentCarServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue/CarrentCarList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue/modules/CarrentCarForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue/modules/CarrentCarModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue/modules/CarrentCarModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue3/CarrentCar.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue3/CarrentCar.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue3/CarrentCarList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue3/components/CarrentCarModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/controller/CarrentCategoryController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/entity/CarrentCategory.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/mapper/CarrentCategoryMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/mapper/xml/CarrentCategoryMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/service/ICarrentCategoryService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/service/impl/CarrentCategoryServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue/CarrentCategoryList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue/modules/CarrentCategoryForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue/modules/CarrentCategoryModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue/modules/CarrentCategoryModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue3/CarrentCategory.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue3/CarrentCategory.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue3/CarrentCategoryList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue3/components/CarrentCategoryModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/controller/CarrentCompanyController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/entity/CarrentCompany.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/mapper/CarrentCompanyMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/mapper/xml/CarrentCompanyMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/ICarrentCompanyService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/impl/CarrentCompanyServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/CarrentCompanyList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/modules/CarrentCompanyForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/modules/CarrentCompanyModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/modules/CarrentCompanyModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue3/CarrentCompany.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue3/CarrentCompany.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue3/CarrentCompanyList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue3/components/CarrentCompanyModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/controller/CarrentComponentController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/entity/CarrentComponent.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/mapper/CarrentComponentMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/mapper/xml/CarrentComponentMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/service/ICarrentComponentService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/service/impl/CarrentComponentServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue/CarrentComponentList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue/modules/CarrentComponentForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue/modules/CarrentComponentModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue/modules/CarrentComponentModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue3/CarrentComponent.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue3/CarrentComponent.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue3/CarrentComponentList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue3/components/CarrentComponentModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/controller/CarrentMileageController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/entity/CarrentMileage.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/mapper/CarrentMileageMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/mapper/xml/CarrentMileageMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/service/ICarrentMileageService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/service/impl/CarrentMileageServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/CarrentMileageList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileage.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileage.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileageList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/components/CarrentMileageModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/controller/CarrentNewsController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/entity/CarrentNews.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/mapper/CarrentNewsMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/mapper/xml/CarrentNewsMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/service/ICarrentNewsService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/service/impl/CarrentNewsServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue/CarrentNewsList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue/modules/CarrentNewsForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue/modules/CarrentNewsModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue/modules/CarrentNewsModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue3/CarrentNews.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue3/CarrentNews.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue3/CarrentNewsList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue3/components/CarrentNewsModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/controller/CarrentUserController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/entity/CarrentUser.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/mapper/CarrentUserMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/mapper/xml/CarrentUserMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/ICarrentUserService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/impl/CarrentUserServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/CarrentUserList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUser.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUser.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUserList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/components/CarrentUserModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/controller/CarrrentOrderController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/entity/CarrrentOrder.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/mapper/CarrrentOrderMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/mapper/xml/CarrrentOrderMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/service/ICarrrentOrderService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/service/impl/CarrrentOrderServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/CarrrentOrderList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/modules/CarrrentOrderForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/modules/CarrrentOrderModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/modules/CarrrentOrderModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue3/CarrrentOrder.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue3/CarrrentOrder.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue3/CarrrentOrderList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue3/components/CarrrentOrderModal.vue diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/controller/CarrentAreaController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/controller/CarrentAreaController.java new file mode 100644 index 0000000..02d1ee7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/controller/CarrentAreaController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.carrentArea.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +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.carrentArea.entity.CarrentArea; +import org.jeecg.modules.carrentArea.service.ICarrentAreaService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 区域表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +@Api(tags="区域表") +@RestController +@RequestMapping("/carrentArea/carrentArea") +@Slf4j +public class CarrentAreaController extends JeecgController { + @Autowired + private ICarrentAreaService carrentAreaService; + + /** + * 分页列表查询 + * + * @param carrentArea + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "区域表-分页列表查询") + @ApiOperation(value="区域表-分页列表查询", notes="区域表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CarrentArea carrentArea, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(carrentArea, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = carrentAreaService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param carrentArea + * @return + */ + @AutoLog(value = "区域表-添加") + @ApiOperation(value="区域表-添加", notes="区域表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CarrentArea carrentArea) { + carrentAreaService.save(carrentArea); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param carrentArea + * @return + */ + @AutoLog(value = "区域表-编辑") + @ApiOperation(value="区域表-编辑", notes="区域表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CarrentArea carrentArea) { + carrentAreaService.updateById(carrentArea); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "区域表-通过id删除") + @ApiOperation(value="区域表-通过id删除", notes="区域表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + carrentAreaService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "区域表-批量删除") + @ApiOperation(value="区域表-批量删除", notes="区域表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.carrentAreaService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "区域表-通过id查询") + @ApiOperation(value="区域表-通过id查询", notes="区域表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + CarrentArea carrentArea = carrentAreaService.getById(id); + if(carrentArea==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(carrentArea); + } + + /** + * 导出excel + * + * @param request + * @param carrentArea + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CarrentArea carrentArea) { + return super.exportXls(request, carrentArea, CarrentArea.class, "区域表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, CarrentArea.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/carrentArea/entity/CarrentArea.java new file mode 100644 index 0000000..0303d5c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/entity/CarrentArea.java @@ -0,0 +1,54 @@ +package org.jeecg.modules.carrentArea.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 区域表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +@Data +@TableName("carrent_area") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="carrent_area对象", description="区域表") +public class CarrentArea implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**所属区域*/ + @Excel(name = "所属区域", width = 15) + @ApiModelProperty(value = "所属区域") + private java.lang.String area; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/mapper/CarrentAreaMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/mapper/CarrentAreaMapper.java new file mode 100644 index 0000000..ed1c668 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/mapper/CarrentAreaMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.carrentArea.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.carrentArea.entity.CarrentArea; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 区域表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +public interface CarrentAreaMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/mapper/xml/CarrentAreaMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/mapper/xml/CarrentAreaMapper.xml new file mode 100644 index 0000000..bc1e961 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/mapper/xml/CarrentAreaMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/service/ICarrentAreaService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/service/ICarrentAreaService.java new file mode 100644 index 0000000..7cba54f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/service/ICarrentAreaService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.carrentArea.service; + +import org.jeecg.modules.carrentArea.entity.CarrentArea; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 区域表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +public interface ICarrentAreaService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/service/impl/CarrentAreaServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/service/impl/CarrentAreaServiceImpl.java new file mode 100644 index 0000000..991d90f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/service/impl/CarrentAreaServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.carrentArea.service.impl; + +import org.jeecg.modules.carrentArea.entity.CarrentArea; +import org.jeecg.modules.carrentArea.mapper.CarrentAreaMapper; +import org.jeecg.modules.carrentArea.service.ICarrentAreaService; +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 CarrentAreaServiceImpl extends ServiceImpl implements ICarrentAreaService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue/CarrentAreaList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue/CarrentAreaList.vue new file mode 100644 index 0000000..46700c7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue/CarrentAreaList.vue @@ -0,0 +1,171 @@ + + + + \ 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/CarrentAreaForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue/modules/CarrentAreaForm.vue new file mode 100644 index 0000000..c9dc4cf --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue/modules/CarrentAreaForm.vue @@ -0,0 +1,104 @@ + + + \ 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/carrentArea/vue/modules/CarrentAreaModal.Style#Drawer.vue new file mode 100644 index 0000000..41484b5 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue/modules/CarrentAreaModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ 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.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue/modules/CarrentAreaModal.vue new file mode 100644 index 0000000..03bbfe9 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue/modules/CarrentAreaModal.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/carrentArea/vue3/CarrentArea.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue3/CarrentArea.api.ts new file mode 100644 index 0000000..185b5fa --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue3/CarrentArea.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/carrentArea/carrentArea/list', + save='/carrentArea/carrentArea/add', + edit='/carrentArea/carrentArea/edit', + deleteOne = '/carrentArea/carrentArea/delete', + deleteBatch = '/carrentArea/carrentArea/deleteBatch', + importExcel = '/carrentArea/carrentArea/importExcel', + exportXls = '/carrentArea/carrentArea/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/carrentArea/vue3/CarrentArea.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue3/CarrentArea.data.ts new file mode 100644 index 0000000..9eebc25 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue3/CarrentArea.data.ts @@ -0,0 +1,23 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '所属区域', + align:"center", + dataIndex: 'area' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '所属区域', + field: 'area', + component: 'Input', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue3/CarrentAreaList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue3/CarrentAreaList.vue new file mode 100644 index 0000000..26ef27f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue3/CarrentAreaList.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/carrentArea/vue3/components/CarrentAreaModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue3/components/CarrentAreaModal.vue new file mode 100644 index 0000000..82619be --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue3/components/CarrentAreaModal.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/carrentBanner/controller/CarrentBannerController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/controller/CarrentBannerController.java new file mode 100644 index 0000000..15f25af --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/controller/CarrentBannerController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.carrentBanner.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +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.carrentBanner.entity.CarrentBanner; +import org.jeecg.modules.carrentBanner.service.ICarrentBannerService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 轮播图表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +@Api(tags="轮播图表") +@RestController +@RequestMapping("/carrentBanner/carrentBanner") +@Slf4j +public class CarrentBannerController extends JeecgController { + @Autowired + private ICarrentBannerService carrentBannerService; + + /** + * 分页列表查询 + * + * @param carrentBanner + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "轮播图表-分页列表查询") + @ApiOperation(value="轮播图表-分页列表查询", notes="轮播图表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CarrentBanner carrentBanner, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(carrentBanner, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = carrentBannerService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param carrentBanner + * @return + */ + @AutoLog(value = "轮播图表-添加") + @ApiOperation(value="轮播图表-添加", notes="轮播图表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CarrentBanner carrentBanner) { + carrentBannerService.save(carrentBanner); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param carrentBanner + * @return + */ + @AutoLog(value = "轮播图表-编辑") + @ApiOperation(value="轮播图表-编辑", notes="轮播图表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CarrentBanner carrentBanner) { + carrentBannerService.updateById(carrentBanner); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "轮播图表-通过id删除") + @ApiOperation(value="轮播图表-通过id删除", notes="轮播图表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + carrentBannerService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "轮播图表-批量删除") + @ApiOperation(value="轮播图表-批量删除", notes="轮播图表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.carrentBannerService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "轮播图表-通过id查询") + @ApiOperation(value="轮播图表-通过id查询", notes="轮播图表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + CarrentBanner carrentBanner = carrentBannerService.getById(id); + if(carrentBanner==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(carrentBanner); + } + + /** + * 导出excel + * + * @param request + * @param carrentBanner + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CarrentBanner carrentBanner) { + return super.exportXls(request, carrentBanner, CarrentBanner.class, "轮播图表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, CarrentBanner.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/entity/CarrentBanner.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/entity/CarrentBanner.java new file mode 100644 index 0000000..1754722 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/entity/CarrentBanner.java @@ -0,0 +1,58 @@ +package org.jeecg.modules.carrentBanner.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 轮播图表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +@Data +@TableName("carrent_banner") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="carrent_banner对象", description="轮播图表") +public class CarrentBanner implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**图片名称*/ + @Excel(name = "图片名称", width = 15) + @ApiModelProperty(value = "图片名称") + private java.lang.String name; + /**图片内容*/ + @Excel(name = "图片内容", width = 15) + @ApiModelProperty(value = "图片内容") + private java.lang.String image; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/mapper/CarrentBannerMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/mapper/CarrentBannerMapper.java new file mode 100644 index 0000000..d6c1270 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/mapper/CarrentBannerMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.carrentBanner.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.carrentBanner.entity.CarrentBanner; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 轮播图表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +public interface CarrentBannerMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/mapper/xml/CarrentBannerMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/mapper/xml/CarrentBannerMapper.xml new file mode 100644 index 0000000..b6b6528 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/mapper/xml/CarrentBannerMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/service/ICarrentBannerService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/service/ICarrentBannerService.java new file mode 100644 index 0000000..aa4b9f9 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/service/ICarrentBannerService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.carrentBanner.service; + +import org.jeecg.modules.carrentBanner.entity.CarrentBanner; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 轮播图表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +public interface ICarrentBannerService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/service/impl/CarrentBannerServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/service/impl/CarrentBannerServiceImpl.java new file mode 100644 index 0000000..426d58d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/service/impl/CarrentBannerServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.carrentBanner.service.impl; + +import org.jeecg.modules.carrentBanner.entity.CarrentBanner; +import org.jeecg.modules.carrentBanner.mapper.CarrentBannerMapper; +import org.jeecg.modules.carrentBanner.service.ICarrentBannerService; +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 CarrentBannerServiceImpl extends ServiceImpl implements ICarrentBannerService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue/CarrentBannerList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue/CarrentBannerList.vue new file mode 100644 index 0000000..0bdebf7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue/CarrentBannerList.vue @@ -0,0 +1,178 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue/modules/CarrentBannerForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue/modules/CarrentBannerForm.vue new file mode 100644 index 0000000..dccb1fa --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue/modules/CarrentBannerForm.vue @@ -0,0 +1,109 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue/modules/CarrentBannerModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue/modules/CarrentBannerModal.Style#Drawer.vue new file mode 100644 index 0000000..3c3bc61 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue/modules/CarrentBannerModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue/modules/CarrentBannerModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue/modules/CarrentBannerModal.vue new file mode 100644 index 0000000..a06e39b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue/modules/CarrentBannerModal.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/carrentBanner/vue3/CarrentBanner.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue3/CarrentBanner.api.ts new file mode 100644 index 0000000..8af04df --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue3/CarrentBanner.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/carrentBanner/carrentBanner/list', + save='/carrentBanner/carrentBanner/add', + edit='/carrentBanner/carrentBanner/edit', + deleteOne = '/carrentBanner/carrentBanner/delete', + deleteBatch = '/carrentBanner/carrentBanner/deleteBatch', + importExcel = '/carrentBanner/carrentBanner/importExcel', + exportXls = '/carrentBanner/carrentBanner/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/carrentBanner/vue3/CarrentBanner.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue3/CarrentBanner.data.ts new file mode 100644 index 0000000..23f814e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue3/CarrentBanner.data.ts @@ -0,0 +1,36 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '图片名称', + align:"center", + dataIndex: 'name' + }, + { + title: '图片内容', + align:"center", + dataIndex: 'image', + customRender:render.renderAvatar, + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '图片名称', + field: 'name', + component: 'Input', + }, + { + label: '图片内容', + field: 'image', + component: 'JImageUpload', + componentProps:{ + }, + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue3/CarrentBannerList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue3/CarrentBannerList.vue new file mode 100644 index 0000000..42275df --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue3/CarrentBannerList.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/carrentBanner/vue3/components/CarrentBannerModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue3/components/CarrentBannerModal.vue new file mode 100644 index 0000000..0584b5b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentBanner/vue3/components/CarrentBannerModal.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/carrentCar/controller/CarrentCarController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/controller/CarrentCarController.java new file mode 100644 index 0000000..e6fdea4 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/controller/CarrentCarController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.carrentCar.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +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.carrentCar.entity.CarrentCar; +import org.jeecg.modules.carrentCar.service.ICarrentCarService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 车辆信息表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +@Api(tags="车辆信息表") +@RestController +@RequestMapping("/carrentCar/carrentCar") +@Slf4j +public class CarrentCarController extends JeecgController { + @Autowired + private ICarrentCarService carrentCarService; + + /** + * 分页列表查询 + * + * @param carrentCar + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "车辆信息表-分页列表查询") + @ApiOperation(value="车辆信息表-分页列表查询", notes="车辆信息表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CarrentCar carrentCar, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(carrentCar, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = carrentCarService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param carrentCar + * @return + */ + @AutoLog(value = "车辆信息表-添加") + @ApiOperation(value="车辆信息表-添加", notes="车辆信息表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CarrentCar carrentCar) { + carrentCarService.save(carrentCar); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param carrentCar + * @return + */ + @AutoLog(value = "车辆信息表-编辑") + @ApiOperation(value="车辆信息表-编辑", notes="车辆信息表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CarrentCar carrentCar) { + carrentCarService.updateById(carrentCar); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "车辆信息表-通过id删除") + @ApiOperation(value="车辆信息表-通过id删除", notes="车辆信息表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + carrentCarService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "车辆信息表-批量删除") + @ApiOperation(value="车辆信息表-批量删除", notes="车辆信息表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.carrentCarService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "车辆信息表-通过id查询") + @ApiOperation(value="车辆信息表-通过id查询", notes="车辆信息表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + CarrentCar carrentCar = carrentCarService.getById(id); + if(carrentCar==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(carrentCar); + } + + /** + * 导出excel + * + * @param request + * @param carrentCar + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CarrentCar carrentCar) { + return super.exportXls(request, carrentCar, CarrentCar.class, "车辆信息表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, CarrentCar.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/entity/CarrentCar.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/entity/CarrentCar.java new file mode 100644 index 0000000..43a347e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/entity/CarrentCar.java @@ -0,0 +1,98 @@ +package org.jeecg.modules.carrentCar.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 车辆信息表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +@Data +@TableName("carrent_car") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="carrent_car对象", description="车辆信息表") +public class CarrentCar implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**车辆名称*/ + @Excel(name = "车辆名称", width = 15) + @ApiModelProperty(value = "车辆名称") + private java.lang.String name; + /**车辆图片*/ + @Excel(name = "车辆图片", width = 15) + @ApiModelProperty(value = "车辆图片") + private java.lang.String image; + /**车辆价格*/ + @Excel(name = "车辆价格", width = 15) + @ApiModelProperty(value = "车辆价格") + private java.math.BigDecimal price; + /**车辆公里数*/ + @Excel(name = "车辆公里数", width = 15) + @ApiModelProperty(value = "车辆公里数") + private java.lang.Integer mileage; + /**车辆类型*/ + @Excel(name = "车辆类型", width = 15) + @ApiModelProperty(value = "车辆类型") + private java.lang.String type; + /**车辆标签*/ + @Excel(name = "车辆标签", width = 15) + @ApiModelProperty(value = "车辆标签") + private java.lang.String tag; + /**服务*/ + @Excel(name = "服务", width = 15) + @ApiModelProperty(value = "服务") + private java.lang.String services; + /**材质*/ + @Excel(name = "材质", width = 15) + @ApiModelProperty(value = "材质") + private java.lang.String material; + /**尺寸*/ + @Excel(name = "尺寸", width = 15) + @ApiModelProperty(value = "尺寸") + private java.lang.String size; + /**商品库存*/ + @Excel(name = "商品库存", width = 15) + @ApiModelProperty(value = "商品库存") + private java.lang.Integer inventory; + /**已售商品数量*/ + @Excel(name = "已售商品数量", width = 15) + @ApiModelProperty(value = "已售商品数量") + private java.lang.Integer saleNumber; + /**商品详情*/ + @Excel(name = "商品详情", width = 15) + @ApiModelProperty(value = "商品详情") + private java.lang.String detail; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/mapper/CarrentCarMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/mapper/CarrentCarMapper.java new file mode 100644 index 0000000..61104cd --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/mapper/CarrentCarMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.carrentCar.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.carrentCar.entity.CarrentCar; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 车辆信息表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +public interface CarrentCarMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/mapper/xml/CarrentCarMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/mapper/xml/CarrentCarMapper.xml new file mode 100644 index 0000000..e2ffe50 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/mapper/xml/CarrentCarMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/service/ICarrentCarService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/service/ICarrentCarService.java new file mode 100644 index 0000000..fd6ff60 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/service/ICarrentCarService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.carrentCar.service; + +import org.jeecg.modules.carrentCar.entity.CarrentCar; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 车辆信息表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +public interface ICarrentCarService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/service/impl/CarrentCarServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/service/impl/CarrentCarServiceImpl.java new file mode 100644 index 0000000..9003af0 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/service/impl/CarrentCarServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.carrentCar.service.impl; + +import org.jeecg.modules.carrentCar.entity.CarrentCar; +import org.jeecg.modules.carrentCar.mapper.CarrentCarMapper; +import org.jeecg.modules.carrentCar.service.ICarrentCarService; +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 CarrentCarServiceImpl extends ServiceImpl implements ICarrentCarService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue/CarrentCarList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue/CarrentCarList.vue new file mode 100644 index 0000000..548d278 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue/CarrentCarList.vue @@ -0,0 +1,237 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue/modules/CarrentCarForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue/modules/CarrentCarForm.vue new file mode 100644 index 0000000..37fc00b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue/modules/CarrentCarForm.vue @@ -0,0 +1,159 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue/modules/CarrentCarModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue/modules/CarrentCarModal.Style#Drawer.vue new file mode 100644 index 0000000..37b5590 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue/modules/CarrentCarModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue/modules/CarrentCarModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue/modules/CarrentCarModal.vue new file mode 100644 index 0000000..7005392 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue/modules/CarrentCarModal.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/carrentCar/vue3/CarrentCar.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue3/CarrentCar.api.ts new file mode 100644 index 0000000..8c87e09 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue3/CarrentCar.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/carrentCar/carrentCar/list', + save='/carrentCar/carrentCar/add', + edit='/carrentCar/carrentCar/edit', + deleteOne = '/carrentCar/carrentCar/delete', + deleteBatch = '/carrentCar/carrentCar/deleteBatch', + importExcel = '/carrentCar/carrentCar/importExcel', + exportXls = '/carrentCar/carrentCar/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/carrentCar/vue3/CarrentCar.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue3/CarrentCar.data.ts new file mode 100644 index 0000000..0d89c27 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue3/CarrentCar.data.ts @@ -0,0 +1,133 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '车辆名称', + align:"center", + dataIndex: 'name' + }, + { + title: '车辆图片', + align:"center", + dataIndex: 'image' + }, + { + title: '车辆价格', + align:"center", + dataIndex: 'price' + }, + { + title: '车辆公里数', + align:"center", + dataIndex: 'mileage' + }, + { + title: '车辆类型', + align:"center", + dataIndex: 'type' + }, + { + title: '车辆标签', + align:"center", + dataIndex: 'tag' + }, + { + title: '服务', + align:"center", + dataIndex: 'services' + }, + { + title: '材质', + align:"center", + dataIndex: 'material' + }, + { + title: '尺寸', + align:"center", + dataIndex: 'size' + }, + { + title: '商品库存', + align:"center", + dataIndex: 'inventory' + }, + { + title: '已售商品数量', + align:"center", + dataIndex: 'saleNumber' + }, + { + title: '商品详情', + align:"center", + dataIndex: 'detail' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '车辆名称', + field: 'name', + component: 'Input', + }, + { + label: '车辆图片', + field: 'image', + component: 'Input', + }, + { + label: '车辆价格', + field: 'price', + component: 'InputNumber', + }, + { + label: '车辆公里数', + field: 'mileage', + component: 'InputNumber', + }, + { + label: '车辆类型', + field: 'type', + component: 'Input', + }, + { + label: '车辆标签', + field: 'tag', + component: 'Input', + }, + { + label: '服务', + field: 'services', + component: 'Input', + }, + { + label: '材质', + field: 'material', + component: 'Input', + }, + { + label: '尺寸', + field: 'size', + component: 'Input', + }, + { + label: '商品库存', + field: 'inventory', + component: 'InputNumber', + }, + { + label: '已售商品数量', + field: 'saleNumber', + component: 'InputNumber', + }, + { + label: '商品详情', + field: 'detail', + component: 'Input', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue3/CarrentCarList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue3/CarrentCarList.vue new file mode 100644 index 0000000..09577ae --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue3/CarrentCarList.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/carrentCar/vue3/components/CarrentCarModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue3/components/CarrentCarModal.vue new file mode 100644 index 0000000..832e30e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue3/components/CarrentCarModal.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/carrentCategory/controller/CarrentCategoryController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/controller/CarrentCategoryController.java new file mode 100644 index 0000000..f447d93 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/controller/CarrentCategoryController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.carrentCategory.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +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.carrentCategory.entity.CarrentCategory; +import org.jeecg.modules.carrentCategory.service.ICarrentCategoryService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 分类表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +@Api(tags="分类表") +@RestController +@RequestMapping("/carrentCategory/carrentCategory") +@Slf4j +public class CarrentCategoryController extends JeecgController { + @Autowired + private ICarrentCategoryService carrentCategoryService; + + /** + * 分页列表查询 + * + * @param carrentCategory + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "分类表-分页列表查询") + @ApiOperation(value="分类表-分页列表查询", notes="分类表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CarrentCategory carrentCategory, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(carrentCategory, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = carrentCategoryService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param carrentCategory + * @return + */ + @AutoLog(value = "分类表-添加") + @ApiOperation(value="分类表-添加", notes="分类表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CarrentCategory carrentCategory) { + carrentCategoryService.save(carrentCategory); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param carrentCategory + * @return + */ + @AutoLog(value = "分类表-编辑") + @ApiOperation(value="分类表-编辑", notes="分类表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CarrentCategory carrentCategory) { + carrentCategoryService.updateById(carrentCategory); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "分类表-通过id删除") + @ApiOperation(value="分类表-通过id删除", notes="分类表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + carrentCategoryService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "分类表-批量删除") + @ApiOperation(value="分类表-批量删除", notes="分类表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.carrentCategoryService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "分类表-通过id查询") + @ApiOperation(value="分类表-通过id查询", notes="分类表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + CarrentCategory carrentCategory = carrentCategoryService.getById(id); + if(carrentCategory==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(carrentCategory); + } + + /** + * 导出excel + * + * @param request + * @param carrentCategory + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CarrentCategory carrentCategory) { + return super.exportXls(request, carrentCategory, CarrentCategory.class, "分类表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, CarrentCategory.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/entity/CarrentCategory.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/entity/CarrentCategory.java new file mode 100644 index 0000000..4ab89cf --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/entity/CarrentCategory.java @@ -0,0 +1,54 @@ +package org.jeecg.modules.carrentCategory.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 分类表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +@Data +@TableName("carrent_category") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="carrent_category对象", description="分类表") +public class CarrentCategory implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**分类名称*/ + @Excel(name = "分类名称", width = 15) + @ApiModelProperty(value = "分类名称") + private java.lang.String name; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/mapper/CarrentCategoryMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/mapper/CarrentCategoryMapper.java new file mode 100644 index 0000000..d052a4d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/mapper/CarrentCategoryMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.carrentCategory.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.carrentCategory.entity.CarrentCategory; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 分类表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +public interface CarrentCategoryMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/mapper/xml/CarrentCategoryMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/mapper/xml/CarrentCategoryMapper.xml new file mode 100644 index 0000000..de96a74 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/mapper/xml/CarrentCategoryMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/service/ICarrentCategoryService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/service/ICarrentCategoryService.java new file mode 100644 index 0000000..3c0b12d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/service/ICarrentCategoryService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.carrentCategory.service; + +import org.jeecg.modules.carrentCategory.entity.CarrentCategory; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 分类表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +public interface ICarrentCategoryService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/service/impl/CarrentCategoryServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/service/impl/CarrentCategoryServiceImpl.java new file mode 100644 index 0000000..ce8fc00 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/service/impl/CarrentCategoryServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.carrentCategory.service.impl; + +import org.jeecg.modules.carrentCategory.entity.CarrentCategory; +import org.jeecg.modules.carrentCategory.mapper.CarrentCategoryMapper; +import org.jeecg.modules.carrentCategory.service.ICarrentCategoryService; +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 CarrentCategoryServiceImpl extends ServiceImpl implements ICarrentCategoryService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue/CarrentCategoryList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue/CarrentCategoryList.vue new file mode 100644 index 0000000..a3d53b8 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue/CarrentCategoryList.vue @@ -0,0 +1,171 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue/modules/CarrentCategoryForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue/modules/CarrentCategoryForm.vue new file mode 100644 index 0000000..678ce64 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue/modules/CarrentCategoryForm.vue @@ -0,0 +1,104 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue/modules/CarrentCategoryModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue/modules/CarrentCategoryModal.Style#Drawer.vue new file mode 100644 index 0000000..68edbc5 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue/modules/CarrentCategoryModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue/modules/CarrentCategoryModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue/modules/CarrentCategoryModal.vue new file mode 100644 index 0000000..9e6a44a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue/modules/CarrentCategoryModal.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/carrentCategory/vue3/CarrentCategory.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue3/CarrentCategory.api.ts new file mode 100644 index 0000000..03c3f19 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue3/CarrentCategory.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/carrentCategory/carrentCategory/list', + save='/carrentCategory/carrentCategory/add', + edit='/carrentCategory/carrentCategory/edit', + deleteOne = '/carrentCategory/carrentCategory/delete', + deleteBatch = '/carrentCategory/carrentCategory/deleteBatch', + importExcel = '/carrentCategory/carrentCategory/importExcel', + exportXls = '/carrentCategory/carrentCategory/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/carrentCategory/vue3/CarrentCategory.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue3/CarrentCategory.data.ts new file mode 100644 index 0000000..1df3a89 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue3/CarrentCategory.data.ts @@ -0,0 +1,23 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '分类名称', + align:"center", + dataIndex: 'name' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '分类名称', + field: 'name', + component: 'Input', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue3/CarrentCategoryList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue3/CarrentCategoryList.vue new file mode 100644 index 0000000..d612195 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue3/CarrentCategoryList.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/carrentCategory/vue3/components/CarrentCategoryModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue3/components/CarrentCategoryModal.vue new file mode 100644 index 0000000..7fc2a3c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue3/components/CarrentCategoryModal.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/carrentCompany/controller/CarrentCompanyController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/controller/CarrentCompanyController.java new file mode 100644 index 0000000..177bf89 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/controller/CarrentCompanyController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.carrentCompany.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +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.carrentCompany.entity.CarrentCompany; +import org.jeecg.modules.carrentCompany.service.ICarrentCompanyService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 企业信息表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +@Api(tags="企业信息表") +@RestController +@RequestMapping("/carrentCompany/carrentCompany") +@Slf4j +public class CarrentCompanyController extends JeecgController { + @Autowired + private ICarrentCompanyService carrentCompanyService; + + /** + * 分页列表查询 + * + * @param carrentCompany + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "企业信息表-分页列表查询") + @ApiOperation(value="企业信息表-分页列表查询", notes="企业信息表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CarrentCompany carrentCompany, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(carrentCompany, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = carrentCompanyService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param carrentCompany + * @return + */ + @AutoLog(value = "企业信息表-添加") + @ApiOperation(value="企业信息表-添加", notes="企业信息表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CarrentCompany carrentCompany) { + carrentCompanyService.save(carrentCompany); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param carrentCompany + * @return + */ + @AutoLog(value = "企业信息表-编辑") + @ApiOperation(value="企业信息表-编辑", notes="企业信息表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CarrentCompany carrentCompany) { + carrentCompanyService.updateById(carrentCompany); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "企业信息表-通过id删除") + @ApiOperation(value="企业信息表-通过id删除", notes="企业信息表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + carrentCompanyService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "企业信息表-批量删除") + @ApiOperation(value="企业信息表-批量删除", notes="企业信息表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.carrentCompanyService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "企业信息表-通过id查询") + @ApiOperation(value="企业信息表-通过id查询", notes="企业信息表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + CarrentCompany carrentCompany = carrentCompanyService.getById(id); + if(carrentCompany==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(carrentCompany); + } + + /** + * 导出excel + * + * @param request + * @param carrentCompany + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CarrentCompany carrentCompany) { + return super.exportXls(request, carrentCompany, CarrentCompany.class, "企业信息表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, CarrentCompany.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/entity/CarrentCompany.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/entity/CarrentCompany.java new file mode 100644 index 0000000..3eb2cf3 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/entity/CarrentCompany.java @@ -0,0 +1,79 @@ +package org.jeecg.modules.carrentCompany.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 企业信息表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +@Data +@TableName("carrent_company") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="carrent_company对象", description="企业信息表") +public class CarrentCompany implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**用户名*/ + @Excel(name = "用户名", width = 15) + @ApiModelProperty(value = "用户名") + private java.lang.String userName; + /**公司名称*/ + @Excel(name = "公司名称", width = 15) + @ApiModelProperty(value = "公司名称") + private java.lang.String companyName; + /**税收编码*/ + @Excel(name = "税收编码", width = 15) + @ApiModelProperty(value = "税收编码") + private java.lang.String taxCode; + /**公司地址*/ + @Excel(name = "公司地址", width = 15) + @ApiModelProperty(value = "公司地址") + private java.lang.String address; + /**联系电话*/ + @Excel(name = "联系电话", width = 15) + @ApiModelProperty(value = "联系电话") + private java.lang.String phone; + /**营业执照*/ + @Excel(name = "营业执照", width = 15) + @ApiModelProperty(value = "营业执照") + private java.lang.String businessLicense; + /**关联用户*/ + @Excel(name = "关联用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @ApiModelProperty(value = "关联用户") + private java.lang.String userId; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/mapper/CarrentCompanyMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/mapper/CarrentCompanyMapper.java new file mode 100644 index 0000000..c7d6927 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/mapper/CarrentCompanyMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.carrentCompany.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.carrentCompany.entity.CarrentCompany; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 企业信息表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +public interface CarrentCompanyMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/mapper/xml/CarrentCompanyMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/mapper/xml/CarrentCompanyMapper.xml new file mode 100644 index 0000000..b24ffc1 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/mapper/xml/CarrentCompanyMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/ICarrentCompanyService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/ICarrentCompanyService.java new file mode 100644 index 0000000..80f5057 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/ICarrentCompanyService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.carrentCompany.service; + +import org.jeecg.modules.carrentCompany.entity.CarrentCompany; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 企业信息表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +public interface ICarrentCompanyService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/impl/CarrentCompanyServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/impl/CarrentCompanyServiceImpl.java new file mode 100644 index 0000000..e6f31c8 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/impl/CarrentCompanyServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.carrentCompany.service.impl; + +import org.jeecg.modules.carrentCompany.entity.CarrentCompany; +import org.jeecg.modules.carrentCompany.mapper.CarrentCompanyMapper; +import org.jeecg.modules.carrentCompany.service.ICarrentCompanyService; +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 CarrentCompanyServiceImpl extends ServiceImpl implements ICarrentCompanyService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/CarrentCompanyList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/CarrentCompanyList.vue new file mode 100644 index 0000000..372ab3a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/CarrentCompanyList.vue @@ -0,0 +1,209 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/modules/CarrentCompanyForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/modules/CarrentCompanyForm.vue new file mode 100644 index 0000000..bd18b4d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/modules/CarrentCompanyForm.vue @@ -0,0 +1,134 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/modules/CarrentCompanyModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/modules/CarrentCompanyModal.Style#Drawer.vue new file mode 100644 index 0000000..81700b8 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/modules/CarrentCompanyModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/modules/CarrentCompanyModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/modules/CarrentCompanyModal.vue new file mode 100644 index 0000000..d41a18a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/modules/CarrentCompanyModal.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/carrentCompany/vue3/CarrentCompany.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue3/CarrentCompany.api.ts new file mode 100644 index 0000000..1e99783 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue3/CarrentCompany.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/carrentCompany/carrentCompany/list', + save='/carrentCompany/carrentCompany/add', + edit='/carrentCompany/carrentCompany/edit', + deleteOne = '/carrentCompany/carrentCompany/delete', + deleteBatch = '/carrentCompany/carrentCompany/deleteBatch', + importExcel = '/carrentCompany/carrentCompany/importExcel', + exportXls = '/carrentCompany/carrentCompany/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/carrentCompany/vue3/CarrentCompany.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue3/CarrentCompany.data.ts new file mode 100644 index 0000000..d5cb3bc --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue3/CarrentCompany.data.ts @@ -0,0 +1,89 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '用户名', + align:"center", + dataIndex: 'userName' + }, + { + title: '公司名称', + align:"center", + dataIndex: 'companyName' + }, + { + title: '税收编码', + align:"center", + dataIndex: 'taxCode' + }, + { + title: '公司地址', + align:"center", + dataIndex: 'address' + }, + { + title: '联系电话', + align:"center", + dataIndex: 'phone' + }, + { + title: '营业执照', + align:"center", + dataIndex: 'businessLicense', + customRender:render.renderAvatar, + }, + { + title: '关联用户', + align:"center", + dataIndex: 'userId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '用户名', + field: 'userName', + component: 'Input', + }, + { + label: '公司名称', + field: 'companyName', + component: 'Input', + }, + { + label: '税收编码', + field: 'taxCode', + component: 'Input', + }, + { + label: '公司地址', + field: 'address', + component: 'Input', + }, + { + label: '联系电话', + field: 'phone', + component: 'Input', + }, + { + label: '营业执照', + field: 'businessLicense', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '关联用户', + field: 'userId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"han_hai_member,nick_name,id" + }, + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue3/CarrentCompanyList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue3/CarrentCompanyList.vue new file mode 100644 index 0000000..1a3579f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue3/CarrentCompanyList.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/carrentCompany/vue3/components/CarrentCompanyModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue3/components/CarrentCompanyModal.vue new file mode 100644 index 0000000..93348bc --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue3/components/CarrentCompanyModal.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/controller/CarrentComponentController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/controller/CarrentComponentController.java new file mode 100644 index 0000000..170da75 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/controller/CarrentComponentController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.carrentComponent.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +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.carrentComponent.entity.CarrentComponent; +import org.jeecg.modules.carrentComponent.service.ICarrentComponentService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 设备部件表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +@Api(tags="设备部件表") +@RestController +@RequestMapping("/carrentComponent/carrentComponent") +@Slf4j +public class CarrentComponentController extends JeecgController { + @Autowired + private ICarrentComponentService carrentComponentService; + + /** + * 分页列表查询 + * + * @param carrentComponent + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "设备部件表-分页列表查询") + @ApiOperation(value="设备部件表-分页列表查询", notes="设备部件表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CarrentComponent carrentComponent, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(carrentComponent, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = carrentComponentService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param carrentComponent + * @return + */ + @AutoLog(value = "设备部件表-添加") + @ApiOperation(value="设备部件表-添加", notes="设备部件表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CarrentComponent carrentComponent) { + carrentComponentService.save(carrentComponent); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param carrentComponent + * @return + */ + @AutoLog(value = "设备部件表-编辑") + @ApiOperation(value="设备部件表-编辑", notes="设备部件表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CarrentComponent carrentComponent) { + carrentComponentService.updateById(carrentComponent); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "设备部件表-通过id删除") + @ApiOperation(value="设备部件表-通过id删除", notes="设备部件表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + carrentComponentService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "设备部件表-批量删除") + @ApiOperation(value="设备部件表-批量删除", notes="设备部件表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.carrentComponentService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "设备部件表-通过id查询") + @ApiOperation(value="设备部件表-通过id查询", notes="设备部件表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + CarrentComponent carrentComponent = carrentComponentService.getById(id); + if(carrentComponent==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(carrentComponent); + } + + /** + * 导出excel + * + * @param request + * @param carrentComponent + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CarrentComponent carrentComponent) { + return super.exportXls(request, carrentComponent, CarrentComponent.class, "设备部件表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, CarrentComponent.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/entity/CarrentComponent.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/entity/CarrentComponent.java new file mode 100644 index 0000000..3dbac30 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/entity/CarrentComponent.java @@ -0,0 +1,54 @@ +package org.jeecg.modules.carrentComponent.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 设备部件表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +@Data +@TableName("carrent_component") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="carrent_component对象", description="设备部件表") +public class CarrentComponent implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**部件名称*/ + @Excel(name = "部件名称", width = 15) + @ApiModelProperty(value = "部件名称") + private java.lang.String name; +} 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 new file mode 100644 index 0000000..839d4f8 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/mapper/CarrentComponentMapper.java @@ -0,0 +1,17 @@ +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/mapper/xml/CarrentComponentMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/mapper/xml/CarrentComponentMapper.xml new file mode 100644 index 0000000..9087c31 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/mapper/xml/CarrentComponentMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file 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 new file mode 100644 index 0000000..4a4b1ea --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/service/ICarrentComponentService.java @@ -0,0 +1,14 @@ +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 new file mode 100644 index 0000000..da0dece --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/service/impl/CarrentComponentServiceImpl.java @@ -0,0 +1,19 @@ +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/carrentComponent/vue/CarrentComponentList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue/CarrentComponentList.vue new file mode 100644 index 0000000..4c89dc8 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue/CarrentComponentList.vue @@ -0,0 +1,171 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue/modules/CarrentComponentForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue/modules/CarrentComponentForm.vue new file mode 100644 index 0000000..3edc7b1 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue/modules/CarrentComponentForm.vue @@ -0,0 +1,104 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue/modules/CarrentComponentModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue/modules/CarrentComponentModal.Style#Drawer.vue new file mode 100644 index 0000000..ff2b35d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue/modules/CarrentComponentModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue/modules/CarrentComponentModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue/modules/CarrentComponentModal.vue new file mode 100644 index 0000000..66c40b5 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue/modules/CarrentComponentModal.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/carrentComponent/vue3/CarrentComponent.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue3/CarrentComponent.api.ts new file mode 100644 index 0000000..a95e842 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue3/CarrentComponent.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/carrentComponent/carrentComponent/list', + save='/carrentComponent/carrentComponent/add', + edit='/carrentComponent/carrentComponent/edit', + deleteOne = '/carrentComponent/carrentComponent/delete', + deleteBatch = '/carrentComponent/carrentComponent/deleteBatch', + importExcel = '/carrentComponent/carrentComponent/importExcel', + exportXls = '/carrentComponent/carrentComponent/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/carrentComponent/vue3/CarrentComponent.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue3/CarrentComponent.data.ts new file mode 100644 index 0000000..55d9d52 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue3/CarrentComponent.data.ts @@ -0,0 +1,23 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '部件名称', + align:"center", + dataIndex: 'name' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '部件名称', + field: 'name', + component: 'Input', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue3/CarrentComponentList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue3/CarrentComponentList.vue new file mode 100644 index 0000000..de7ecf7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue3/CarrentComponentList.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/carrentComponent/vue3/components/CarrentComponentModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue3/components/CarrentComponentModal.vue new file mode 100644 index 0000000..3076558 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue3/components/CarrentComponentModal.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/carrentMileage/controller/CarrentMileageController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/controller/CarrentMileageController.java new file mode 100644 index 0000000..9f05950 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/controller/CarrentMileageController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.carrentMileage.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 里程范围表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +@Api(tags="里程范围表") +@RestController +@RequestMapping("/carrentMileage/carrentMileage") +@Slf4j +public class CarrentMileageController extends JeecgController { + @Autowired + private ICarrentMileageService carrentMileageService; + + /** + * 分页列表查询 + * + * @param carrentMileage + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "里程范围表-分页列表查询") + @ApiOperation(value="里程范围表-分页列表查询", notes="里程范围表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CarrentMileage carrentMileage, + @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); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param carrentMileage + * @return + */ + @AutoLog(value = "里程范围表-添加") + @ApiOperation(value="里程范围表-添加", notes="里程范围表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CarrentMileage carrentMileage) { + carrentMileageService.save(carrentMileage); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param carrentMileage + * @return + */ + @AutoLog(value = "里程范围表-编辑") + @ApiOperation(value="里程范围表-编辑", notes="里程范围表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CarrentMileage carrentMileage) { + carrentMileageService.updateById(carrentMileage); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "里程范围表-通过id删除") + @ApiOperation(value="里程范围表-通过id删除", notes="里程范围表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + carrentMileageService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "里程范围表-批量删除") + @ApiOperation(value="里程范围表-批量删除", notes="里程范围表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.carrentMileageService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "里程范围表-通过id查询") + @ApiOperation(value="里程范围表-通过id查询", notes="里程范围表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + CarrentMileage carrentMileage = carrentMileageService.getById(id); + if(carrentMileage==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(carrentMileage); + } + + /** + * 导出excel + * + * @param request + * @param carrentMileage + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CarrentMileage carrentMileage) { + return super.exportXls(request, carrentMileage, CarrentMileage.class, "里程范围表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, CarrentMileage.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/entity/CarrentMileage.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/entity/CarrentMileage.java new file mode 100644 index 0000000..c38d45e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/entity/CarrentMileage.java @@ -0,0 +1,58 @@ +package org.jeecg.modules.carrentMileage.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 里程范围表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +@Data +@TableName("carrent_mileage") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="carrent_mileage对象", description="里程范围表") +public class CarrentMileage implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**里程范围下限*/ + @Excel(name = "里程范围下限", width = 15) + @ApiModelProperty(value = "里程范围下限") + private java.lang.String rangeLow; + /**里程范围上线*/ + @Excel(name = "里程范围上线", width = 15) + @ApiModelProperty(value = "里程范围上线") + private java.lang.String rangeUp; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/mapper/CarrentMileageMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/mapper/CarrentMileageMapper.java new file mode 100644 index 0000000..ab77e11 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/mapper/CarrentMileageMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.carrentMileage.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.carrentMileage.entity.CarrentMileage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 里程范围表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +public interface CarrentMileageMapper 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/carrentMileage/mapper/xml/CarrentMileageMapper.xml new file mode 100644 index 0000000..bfb14ef --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/mapper/xml/CarrentMileageMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/service/ICarrentMileageService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/service/ICarrentMileageService.java new file mode 100644 index 0000000..695dfdd --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/service/ICarrentMileageService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.carrentMileage.service; + +import org.jeecg.modules.carrentMileage.entity.CarrentMileage; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 里程范围表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +public interface ICarrentMileageService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/service/impl/CarrentMileageServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/service/impl/CarrentMileageServiceImpl.java new file mode 100644 index 0000000..7a086c9 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/service/impl/CarrentMileageServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.carrentMileage.service.impl; + +import org.jeecg.modules.carrentMileage.entity.CarrentMileage; +import org.jeecg.modules.carrentMileage.mapper.CarrentMileageMapper; +import org.jeecg.modules.carrentMileage.service.ICarrentMileageService; +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 CarrentMileageServiceImpl extends ServiceImpl implements ICarrentMileageService { + +} 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/carrentMileage/vue/CarrentMileageList.vue new file mode 100644 index 0000000..eb7257c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/CarrentMileageList.vue @@ -0,0 +1,177 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageForm.vue new file mode 100644 index 0000000..ffa6acc --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageForm.vue @@ -0,0 +1,109 @@ + + + \ No newline at end of file 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/carrentMileage/vue/modules/CarrentMileageModal.Style#Drawer.vue new file mode 100644 index 0000000..5d739c7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageModal.vue new file mode 100644 index 0000000..24de20f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageModal.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/carrentMileage/vue3/CarrentMileage.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileage.api.ts new file mode 100644 index 0000000..cbdba11 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileage.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/carrentMileage/carrentMileage/list', + save='/carrentMileage/carrentMileage/add', + edit='/carrentMileage/carrentMileage/edit', + deleteOne = '/carrentMileage/carrentMileage/delete', + deleteBatch = '/carrentMileage/carrentMileage/deleteBatch', + importExcel = '/carrentMileage/carrentMileage/importExcel', + exportXls = '/carrentMileage/carrentMileage/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/carrentMileage/vue3/CarrentMileage.data.ts new file mode 100644 index 0000000..3bb3d38 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileage.data.ts @@ -0,0 +1,33 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '里程范围下限', + align:"center", + dataIndex: 'rangeLow' + }, + { + title: '里程范围上线', + align:"center", + dataIndex: 'rangeUp' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '里程范围下限', + field: 'rangeLow', + component: 'Input', + }, + { + label: '里程范围上线', + field: 'rangeUp', + component: 'Input', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileageList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileageList.vue new file mode 100644 index 0000000..48fecf3 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileageList.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/carrentMileage/vue3/components/CarrentMileageModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/components/CarrentMileageModal.vue new file mode 100644 index 0000000..927f941 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/components/CarrentMileageModal.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/carrentNews/controller/CarrentNewsController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/controller/CarrentNewsController.java new file mode 100644 index 0000000..ad4b642 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/controller/CarrentNewsController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.carrentNews.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +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.carrentNews.entity.CarrentNews; +import org.jeecg.modules.carrentNews.service.ICarrentNewsService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 新闻信息表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +@Api(tags="新闻信息表") +@RestController +@RequestMapping("/carrentNews/carrentNews") +@Slf4j +public class CarrentNewsController extends JeecgController { + @Autowired + private ICarrentNewsService carrentNewsService; + + /** + * 分页列表查询 + * + * @param carrentNews + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "新闻信息表-分页列表查询") + @ApiOperation(value="新闻信息表-分页列表查询", notes="新闻信息表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CarrentNews carrentNews, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(carrentNews, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = carrentNewsService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param carrentNews + * @return + */ + @AutoLog(value = "新闻信息表-添加") + @ApiOperation(value="新闻信息表-添加", notes="新闻信息表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CarrentNews carrentNews) { + carrentNewsService.save(carrentNews); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param carrentNews + * @return + */ + @AutoLog(value = "新闻信息表-编辑") + @ApiOperation(value="新闻信息表-编辑", notes="新闻信息表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CarrentNews carrentNews) { + carrentNewsService.updateById(carrentNews); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "新闻信息表-通过id删除") + @ApiOperation(value="新闻信息表-通过id删除", notes="新闻信息表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + carrentNewsService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "新闻信息表-批量删除") + @ApiOperation(value="新闻信息表-批量删除", notes="新闻信息表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.carrentNewsService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "新闻信息表-通过id查询") + @ApiOperation(value="新闻信息表-通过id查询", notes="新闻信息表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + CarrentNews carrentNews = carrentNewsService.getById(id); + if(carrentNews==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(carrentNews); + } + + /** + * 导出excel + * + * @param request + * @param carrentNews + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CarrentNews carrentNews) { + return super.exportXls(request, carrentNews, CarrentNews.class, "新闻信息表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, CarrentNews.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/entity/CarrentNews.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/entity/CarrentNews.java new file mode 100644 index 0000000..ae10fa5 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/entity/CarrentNews.java @@ -0,0 +1,58 @@ +package org.jeecg.modules.carrentNews.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 新闻信息表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +@Data +@TableName("carrent_news") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="carrent_news对象", description="新闻信息表") +public class CarrentNews implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**新闻标题*/ + @Excel(name = "新闻标题", width = 15) + @ApiModelProperty(value = "新闻标题") + private java.lang.String title; + /**新闻内容*/ + @Excel(name = "新闻内容", width = 15) + @ApiModelProperty(value = "新闻内容") + private java.lang.String content; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/mapper/CarrentNewsMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/mapper/CarrentNewsMapper.java new file mode 100644 index 0000000..75a4793 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/mapper/CarrentNewsMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.carrentNews.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.carrentNews.entity.CarrentNews; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 新闻信息表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +public interface CarrentNewsMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/mapper/xml/CarrentNewsMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/mapper/xml/CarrentNewsMapper.xml new file mode 100644 index 0000000..9098d7d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/mapper/xml/CarrentNewsMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/service/ICarrentNewsService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/service/ICarrentNewsService.java new file mode 100644 index 0000000..baa8765 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/service/ICarrentNewsService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.carrentNews.service; + +import org.jeecg.modules.carrentNews.entity.CarrentNews; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 新闻信息表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +public interface ICarrentNewsService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/service/impl/CarrentNewsServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/service/impl/CarrentNewsServiceImpl.java new file mode 100644 index 0000000..bd57c4e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/service/impl/CarrentNewsServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.carrentNews.service.impl; + +import org.jeecg.modules.carrentNews.entity.CarrentNews; +import org.jeecg.modules.carrentNews.mapper.CarrentNewsMapper; +import org.jeecg.modules.carrentNews.service.ICarrentNewsService; +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 CarrentNewsServiceImpl extends ServiceImpl implements ICarrentNewsService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue/CarrentNewsList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue/CarrentNewsList.vue new file mode 100644 index 0000000..8d4fba9 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue/CarrentNewsList.vue @@ -0,0 +1,177 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue/modules/CarrentNewsForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue/modules/CarrentNewsForm.vue new file mode 100644 index 0000000..e6ef433 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue/modules/CarrentNewsForm.vue @@ -0,0 +1,109 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue/modules/CarrentNewsModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue/modules/CarrentNewsModal.Style#Drawer.vue new file mode 100644 index 0000000..a22cd8b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue/modules/CarrentNewsModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue/modules/CarrentNewsModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue/modules/CarrentNewsModal.vue new file mode 100644 index 0000000..41110ae --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue/modules/CarrentNewsModal.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/carrentNews/vue3/CarrentNews.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue3/CarrentNews.api.ts new file mode 100644 index 0000000..d889a4c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue3/CarrentNews.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/carrentNews/carrentNews/list', + save='/carrentNews/carrentNews/add', + edit='/carrentNews/carrentNews/edit', + deleteOne = '/carrentNews/carrentNews/delete', + deleteBatch = '/carrentNews/carrentNews/deleteBatch', + importExcel = '/carrentNews/carrentNews/importExcel', + exportXls = '/carrentNews/carrentNews/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/carrentNews/vue3/CarrentNews.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue3/CarrentNews.data.ts new file mode 100644 index 0000000..45dd554 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue3/CarrentNews.data.ts @@ -0,0 +1,33 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '新闻标题', + align:"center", + dataIndex: 'title' + }, + { + title: '新闻内容', + align:"center", + dataIndex: 'content' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '新闻标题', + field: 'title', + component: 'Input', + }, + { + label: '新闻内容', + field: 'content', + component: 'Input', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue3/CarrentNewsList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue3/CarrentNewsList.vue new file mode 100644 index 0000000..db879fe --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue3/CarrentNewsList.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/carrentNews/vue3/components/CarrentNewsModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue3/components/CarrentNewsModal.vue new file mode 100644 index 0000000..788fa07 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue3/components/CarrentNewsModal.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/carrentUser/controller/CarrentUserController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/controller/CarrentUserController.java new file mode 100644 index 0000000..ecafa9b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/controller/CarrentUserController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.carrentUser.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +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.carrentUser.entity.CarrentUser; +import org.jeecg.modules.carrentUser.service.ICarrentUserService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 个人信息表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +@Api(tags="个人信息表") +@RestController +@RequestMapping("/carrentUser/carrentUser") +@Slf4j +public class CarrentUserController extends JeecgController { + @Autowired + private ICarrentUserService carrentUserService; + + /** + * 分页列表查询 + * + * @param carrentUser + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "个人信息表-分页列表查询") + @ApiOperation(value="个人信息表-分页列表查询", notes="个人信息表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CarrentUser carrentUser, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(carrentUser, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = carrentUserService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param carrentUser + * @return + */ + @AutoLog(value = "个人信息表-添加") + @ApiOperation(value="个人信息表-添加", notes="个人信息表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CarrentUser carrentUser) { + carrentUserService.save(carrentUser); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param carrentUser + * @return + */ + @AutoLog(value = "个人信息表-编辑") + @ApiOperation(value="个人信息表-编辑", notes="个人信息表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CarrentUser carrentUser) { + carrentUserService.updateById(carrentUser); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "个人信息表-通过id删除") + @ApiOperation(value="个人信息表-通过id删除", notes="个人信息表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + carrentUserService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "个人信息表-批量删除") + @ApiOperation(value="个人信息表-批量删除", notes="个人信息表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.carrentUserService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "个人信息表-通过id查询") + @ApiOperation(value="个人信息表-通过id查询", notes="个人信息表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + CarrentUser carrentUser = carrentUserService.getById(id); + if(carrentUser==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(carrentUser); + } + + /** + * 导出excel + * + * @param request + * @param carrentUser + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CarrentUser carrentUser) { + return super.exportXls(request, carrentUser, CarrentUser.class, "个人信息表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, CarrentUser.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/entity/CarrentUser.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/entity/CarrentUser.java new file mode 100644 index 0000000..790ac72 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/entity/CarrentUser.java @@ -0,0 +1,71 @@ +package org.jeecg.modules.carrentUser.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 个人信息表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +@Data +@TableName("carrent_user") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="carrent_user对象", description="个人信息表") +public class CarrentUser implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**姓名*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private java.lang.String name; + /**联系方式*/ + @Excel(name = "联系方式", width = 15) + @ApiModelProperty(value = "联系方式") + private java.lang.String phone; + /**身份证号码*/ + @Excel(name = "身份证号码", width = 15) + @ApiModelProperty(value = "身份证号码") + private java.lang.String cerNo; + /**身份证正面照*/ + @Excel(name = "身份证正面照", width = 15) + @ApiModelProperty(value = "身份证正面照") + private java.lang.String cerImage; + /**关联用户id*/ + @Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @ApiModelProperty(value = "关联用户id") + private java.lang.String userId; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/mapper/CarrentUserMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/mapper/CarrentUserMapper.java new file mode 100644 index 0000000..dbae2c5 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/mapper/CarrentUserMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.carrentUser.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.carrentUser.entity.CarrentUser; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 个人信息表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +public interface CarrentUserMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/mapper/xml/CarrentUserMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/mapper/xml/CarrentUserMapper.xml new file mode 100644 index 0000000..707e176 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/mapper/xml/CarrentUserMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/ICarrentUserService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/ICarrentUserService.java new file mode 100644 index 0000000..15d14df --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/ICarrentUserService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.carrentUser.service; + +import org.jeecg.modules.carrentUser.entity.CarrentUser; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 个人信息表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +public interface ICarrentUserService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/impl/CarrentUserServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/impl/CarrentUserServiceImpl.java new file mode 100644 index 0000000..7233369 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/impl/CarrentUserServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.carrentUser.service.impl; + +import org.jeecg.modules.carrentUser.entity.CarrentUser; +import org.jeecg.modules.carrentUser.mapper.CarrentUserMapper; +import org.jeecg.modules.carrentUser.service.ICarrentUserService; +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 CarrentUserServiceImpl extends ServiceImpl implements ICarrentUserService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/CarrentUserList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/CarrentUserList.vue new file mode 100644 index 0000000..7a7e83c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/CarrentUserList.vue @@ -0,0 +1,197 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserForm.vue new file mode 100644 index 0000000..ac016d9 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserForm.vue @@ -0,0 +1,124 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserModal.Style#Drawer.vue new file mode 100644 index 0000000..b6494ca --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserModal.vue new file mode 100644 index 0000000..057ff93 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserModal.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/carrentUser/vue3/CarrentUser.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUser.api.ts new file mode 100644 index 0000000..c7cac72 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUser.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/carrentUser/carrentUser/list', + save='/carrentUser/carrentUser/add', + edit='/carrentUser/carrentUser/edit', + deleteOne = '/carrentUser/carrentUser/delete', + deleteBatch = '/carrentUser/carrentUser/deleteBatch', + importExcel = '/carrentUser/carrentUser/importExcel', + exportXls = '/carrentUser/carrentUser/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/carrentUser/vue3/CarrentUser.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUser.data.ts new file mode 100644 index 0000000..8069601 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUser.data.ts @@ -0,0 +1,69 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '姓名', + align:"center", + dataIndex: 'name' + }, + { + title: '联系方式', + align:"center", + dataIndex: 'phone' + }, + { + title: '身份证号码', + align:"center", + dataIndex: 'cerNo' + }, + { + title: '身份证正面照', + align:"center", + dataIndex: 'cerImage', + customRender:render.renderAvatar, + }, + { + title: '关联用户id', + align:"center", + dataIndex: 'userId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '姓名', + field: 'name', + component: 'Input', + }, + { + label: '联系方式', + field: 'phone', + component: 'Input', + }, + { + label: '身份证号码', + field: 'cerNo', + component: 'Input', + }, + { + label: '身份证正面照', + field: 'cerImage', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '关联用户id', + field: 'userId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"han_hai_member,nick_name,id" + }, + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUserList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUserList.vue new file mode 100644 index 0000000..e172dbc --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUserList.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/carrentUser/vue3/components/CarrentUserModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/components/CarrentUserModal.vue new file mode 100644 index 0000000..1016b16 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/components/CarrentUserModal.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/carrrentOrder/controller/CarrrentOrderController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/controller/CarrrentOrderController.java new file mode 100644 index 0000000..9f4baba --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/controller/CarrrentOrderController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.carrrentOrder.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +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.carrrentOrder.entity.CarrrentOrder; +import org.jeecg.modules.carrrentOrder.service.ICarrrentOrderService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 预约信息表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +@Api(tags="预约信息表") +@RestController +@RequestMapping("/carrrentOrder/carrrentOrder") +@Slf4j +public class CarrrentOrderController extends JeecgController { + @Autowired + private ICarrrentOrderService carrrentOrderService; + + /** + * 分页列表查询 + * + * @param carrrentOrder + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "预约信息表-分页列表查询") + @ApiOperation(value="预约信息表-分页列表查询", notes="预约信息表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CarrrentOrder carrrentOrder, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(carrrentOrder, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = carrrentOrderService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param carrrentOrder + * @return + */ + @AutoLog(value = "预约信息表-添加") + @ApiOperation(value="预约信息表-添加", notes="预约信息表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CarrrentOrder carrrentOrder) { + carrrentOrderService.save(carrrentOrder); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param carrrentOrder + * @return + */ + @AutoLog(value = "预约信息表-编辑") + @ApiOperation(value="预约信息表-编辑", notes="预约信息表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CarrrentOrder carrrentOrder) { + carrrentOrderService.updateById(carrrentOrder); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "预约信息表-通过id删除") + @ApiOperation(value="预约信息表-通过id删除", notes="预约信息表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + carrrentOrderService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "预约信息表-批量删除") + @ApiOperation(value="预约信息表-批量删除", notes="预约信息表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.carrrentOrderService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "预约信息表-通过id查询") + @ApiOperation(value="预约信息表-通过id查询", notes="预约信息表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + CarrrentOrder carrrentOrder = carrrentOrderService.getById(id); + if(carrrentOrder==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(carrrentOrder); + } + + /** + * 导出excel + * + * @param request + * @param carrrentOrder + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CarrrentOrder carrrentOrder) { + return super.exportXls(request, carrrentOrder, CarrrentOrder.class, "预约信息表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, CarrrentOrder.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/entity/CarrrentOrder.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/entity/CarrrentOrder.java new file mode 100644 index 0000000..09108e7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/entity/CarrrentOrder.java @@ -0,0 +1,76 @@ +package org.jeecg.modules.carrrentOrder.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 预约信息表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +@Data +@TableName("carrrent_order") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="carrrent_order对象", description="预约信息表") +public class CarrrentOrder implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**姓名*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private java.lang.String name; + /**联系方式*/ + @Excel(name = "联系方式", width = 15) + @ApiModelProperty(value = "联系方式") + private java.lang.String phone; + /**所属区域*/ + @Excel(name = "所属区域", width = 15) + @ApiModelProperty(value = "所属区域") + private java.lang.String area; + /**详细地址*/ + @Excel(name = "详细地址", width = 15) + @ApiModelProperty(value = "详细地址") + private java.lang.String address; + /**关联商品*/ + @Excel(name = "关联商品", width = 15, dictTable = "carrent_car", dicText = "name", dicCode = "id") + @Dict(dictTable = "carrent_car", dicText = "name", dicCode = "id") + @ApiModelProperty(value = "关联商品") + private java.lang.String carId; + /**关联用户*/ + @Excel(name = "关联用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @ApiModelProperty(value = "关联用户") + private java.lang.String userId; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/mapper/CarrrentOrderMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/mapper/CarrrentOrderMapper.java new file mode 100644 index 0000000..43ba250 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/mapper/CarrrentOrderMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.carrrentOrder.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.carrrentOrder.entity.CarrrentOrder; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 预约信息表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +public interface CarrrentOrderMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/mapper/xml/CarrrentOrderMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/mapper/xml/CarrrentOrderMapper.xml new file mode 100644 index 0000000..8375bab --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/mapper/xml/CarrrentOrderMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/service/ICarrrentOrderService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/service/ICarrrentOrderService.java new file mode 100644 index 0000000..2fd4c69 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/service/ICarrrentOrderService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.carrrentOrder.service; + +import org.jeecg.modules.carrrentOrder.entity.CarrrentOrder; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 预约信息表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +public interface ICarrrentOrderService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/service/impl/CarrrentOrderServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/service/impl/CarrrentOrderServiceImpl.java new file mode 100644 index 0000000..7a664aa --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/service/impl/CarrrentOrderServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.carrrentOrder.service.impl; + +import org.jeecg.modules.carrrentOrder.entity.CarrrentOrder; +import org.jeecg.modules.carrrentOrder.mapper.CarrrentOrderMapper; +import org.jeecg.modules.carrrentOrder.service.ICarrrentOrderService; +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 CarrrentOrderServiceImpl extends ServiceImpl implements ICarrrentOrderService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/CarrrentOrderList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/CarrrentOrderList.vue new file mode 100644 index 0000000..d2c18a6 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/CarrrentOrderList.vue @@ -0,0 +1,202 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/modules/CarrrentOrderForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/modules/CarrrentOrderForm.vue new file mode 100644 index 0000000..ebdde3f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/modules/CarrrentOrderForm.vue @@ -0,0 +1,129 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/modules/CarrrentOrderModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/modules/CarrrentOrderModal.Style#Drawer.vue new file mode 100644 index 0000000..a51aaa7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/modules/CarrrentOrderModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/modules/CarrrentOrderModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/modules/CarrrentOrderModal.vue new file mode 100644 index 0000000..a70f69b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/modules/CarrrentOrderModal.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/carrrentOrder/vue3/CarrrentOrder.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue3/CarrrentOrder.api.ts new file mode 100644 index 0000000..8a146e5 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue3/CarrrentOrder.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/carrrentOrder/carrrentOrder/list', + save='/carrrentOrder/carrrentOrder/add', + edit='/carrrentOrder/carrrentOrder/edit', + deleteOne = '/carrrentOrder/carrrentOrder/delete', + deleteBatch = '/carrrentOrder/carrrentOrder/deleteBatch', + importExcel = '/carrrentOrder/carrrentOrder/importExcel', + exportXls = '/carrrentOrder/carrrentOrder/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/carrrentOrder/vue3/CarrrentOrder.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue3/CarrrentOrder.data.ts new file mode 100644 index 0000000..12cf2c0 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue3/CarrrentOrder.data.ts @@ -0,0 +1,79 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '姓名', + align:"center", + dataIndex: 'name' + }, + { + title: '联系方式', + align:"center", + dataIndex: 'phone' + }, + { + title: '所属区域', + align:"center", + dataIndex: 'area' + }, + { + title: '详细地址', + align:"center", + dataIndex: 'address' + }, + { + title: '关联商品', + align:"center", + dataIndex: 'carId_dictText' + }, + { + title: '关联用户', + align:"center", + dataIndex: 'userId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '姓名', + field: 'name', + component: 'Input', + }, + { + label: '联系方式', + field: 'phone', + component: 'Input', + }, + { + label: '所属区域', + field: 'area', + component: 'Input', + }, + { + label: '详细地址', + field: 'address', + component: 'Input', + }, + { + label: '关联商品', + field: 'carId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"carrent_car,name,id" + }, + }, + { + label: '关联用户', + field: 'userId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"han_hai_member,nick_name,id" + }, + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue3/CarrrentOrderList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue3/CarrrentOrderList.vue new file mode 100644 index 0000000..5234671 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue3/CarrrentOrderList.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/carrrentOrder/vue3/components/CarrrentOrderModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue3/components/CarrrentOrderModal.vue new file mode 100644 index 0000000..6e660c3 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue3/components/CarrrentOrderModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file