From 4ed2c2c0e0d18c39ee002c22d8feea50b213e45d Mon Sep 17 00:00:00 2001 From: lzx_win <2602107437@qq.com> Date: Thu, 19 Dec 2024 19:08:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CommonBannerController.java | 2 +- .../modules/commonBanner/entity/CommonBanner.java | 34 +- .../commonBanner/mapper/CommonBannerMapper.java | 2 +- .../commonBanner/service/ICommonBannerService.java | 2 +- .../service/impl/CommonBannerServiceImpl.java | 2 +- .../modules/commonBanner/vue/CommonBannerList.vue | 45 +++ .../commonBanner/vue/modules/CommonBannerForm.vue | 35 ++ .../modules/commonBanner/vue3/CommonBanner.data.ts | 87 +++++ .../controller/CommonIconImageController.java | 2 +- .../commonIconImage/entity/CommonIconImage.java | 2 +- .../mapper/CommonIconImageMapper.java | 2 +- .../service/ICommonIconImageService.java | 2 +- .../service/impl/CommonIconImageServiceImpl.java | 2 +- .../controller/HanHaiMemberController.java | 171 ++++++++++ .../modules/hanHaiMember/entity/HanHaiMember.java | 244 ++++++++++++++ .../hanHaiMember/mapper/HanHaiMemberMapper.java | 17 + .../hanHaiMember/mapper/xml/HanHaiMemberMapper.xml | 5 + .../hanHaiMember/service/IHanHaiMemberService.java | 14 + .../service/impl/HanHaiMemberServiceImpl.java | 19 ++ .../modules/hanHaiMember/vue/HanHaiMemberList.vue | 274 ++++++++++++++++ .../hanHaiMember/vue/modules/HanHaiMemberForm.vue | 169 ++++++++++ .../vue/modules/HanHaiMemberModal.Style#Drawer.vue | 84 +++++ .../hanHaiMember/vue/modules/HanHaiMemberModal.vue | 60 ++++ .../modules/hanHaiMember/vue3/HanHaiMember.api.ts | 61 ++++ .../modules/hanHaiMember/vue3/HanHaiMember.data.ts | 170 ++++++++++ .../modules/hanHaiMember/vue3/HanHaiMemberList.vue | 162 ++++++++++ .../vue3/components/HanHaiMemberModal.vue | 58 ++++ .../controller/PopularizeActivityController.java | 171 ++++++++++ .../entity/PopularizeActivity.java | 149 +++++++++ .../mapper/PopularizeActivityMapper.java | 17 + .../mapper/xml/PopularizeActivityMapper.xml | 5 + .../service/IPopularizeActivityService.java | 14 + .../impl/PopularizeActivityServiceImpl.java | 19 ++ .../vue/PopularizeActivityList.vue | 357 +++++++++++++++++++++ .../vue/modules/PopularizeActivityForm.vue | 214 ++++++++++++ .../PopularizeActivityModal.Style#Drawer.vue | 84 +++++ .../vue/modules/PopularizeActivityModal.vue | 60 ++++ .../vue3/PopularizeActivity.api.ts | 61 ++++ .../vue3/PopularizeActivity.data.ts | 319 ++++++++++++++++++ .../vue3/PopularizeActivityList.vue | 162 ++++++++++ .../vue3/components/PopularizeActivityModal.vue | 58 ++++ .../PopularizeAuthenticationController.java | 171 ++++++++++ .../entity/PopularizeAuthentication.java | 79 +++++ .../mapper/PopularizeAuthenticationMapper.java | 17 + .../mapper/xml/PopularizeAuthenticationMapper.xml | 5 + .../service/IPopularizeAuthenticationService.java | 14 + .../impl/PopularizeAuthenticationServiceImpl.java | 19 ++ .../vue/PopularizeAuthenticationList.vue | 216 +++++++++++++ .../vue/modules/PopularizeAuthenticationForm.vue | 134 ++++++++ .../PopularizeAuthenticationModal.Style#Drawer.vue | 84 +++++ .../vue/modules/PopularizeAuthenticationModal.vue | 60 ++++ .../vue3/PopularizeAuthentication.api.ts | 61 ++++ .../vue3/PopularizeAuthentication.data.ts | 95 ++++++ .../vue3/PopularizeAuthenticationList.vue | 162 ++++++++++ .../components/PopularizeAuthenticationModal.vue | 58 ++++ .../controller/PopularizeCityController.java | 171 ++++++++++ .../popularizeCity/entity/PopularizeCity.java | 62 ++++ .../mapper/PopularizeCityMapper.java | 17 + .../mapper/xml/PopularizeCityMapper.xml | 5 + .../service/IPopularizeCityService.java | 14 + .../service/impl/PopularizeCityServiceImpl.java | 19 ++ .../popularizeCity/vue/PopularizeCityList.vue | 203 ++++++++++++ .../vue/modules/PopularizeCityForm.vue | 114 +++++++ .../modules/PopularizeCityModal.Style#Drawer.vue | 84 +++++ .../vue/modules/PopularizeCityModal.vue | 60 ++++ .../popularizeCity/vue3/PopularizeCity.api.ts | 61 ++++ .../popularizeCity/vue3/PopularizeCity.data.ts | 55 ++++ .../popularizeCity/vue3/PopularizeCityList.vue | 162 ++++++++++ .../vue3/components/PopularizeCityModal.vue | 58 ++++ .../controller/PopularizeCollectController.java | 171 ++++++++++ .../entity/PopularizeCollect.java | 66 ++++ .../mapper/PopularizeCollectMapper.java | 17 + .../mapper/xml/PopularizeCollectMapper.xml | 5 + .../service/IPopularizeCollectService.java | 14 + .../service/impl/PopularizeCollectServiceImpl.java | 19 ++ .../vue/PopularizeCollectList.vue | 189 +++++++++++ .../vue/modules/PopularizeCollectForm.vue | 119 +++++++ .../PopularizeCollectModal.Style#Drawer.vue | 84 +++++ .../vue/modules/PopularizeCollectModal.vue | 60 ++++ .../vue3/PopularizeCollect.api.ts | 61 ++++ .../vue3/PopularizeCollect.data.ts | 53 +++ .../vue3/PopularizeCollectList.vue | 162 ++++++++++ .../vue3/components/PopularizeCollectModal.vue | 58 ++++ .../controller/PopularizeCountryController.java | 171 ++++++++++ .../entity/PopularizeCountry.java | 62 ++++ .../mapper/PopularizeCountryMapper.java | 17 + .../mapper/xml/PopularizeCountryMapper.xml | 5 + .../service/IPopularizeCountryService.java | 14 + .../service/impl/PopularizeCountryServiceImpl.java | 19 ++ .../vue/PopularizeCountryList.vue | 203 ++++++++++++ .../vue/modules/PopularizeCountryForm.vue | 114 +++++++ .../PopularizeCountryModal.Style#Drawer.vue | 84 +++++ .../vue/modules/PopularizeCountryModal.vue | 60 ++++ .../vue3/PopularizeCountry.api.ts | 61 ++++ .../vue3/PopularizeCountry.data.ts | 55 ++++ .../vue3/PopularizeCountryList.vue | 162 ++++++++++ .../vue3/components/PopularizeCountryModal.vue | 58 ++++ .../controller/PopularizeEvaluateController.java | 171 ++++++++++ .../entity/PopularizeEvaluate.java | 78 +++++ .../mapper/PopularizeEvaluateMapper.java | 17 + .../mapper/xml/PopularizeEvaluateMapper.xml | 5 + .../service/IPopularizeEvaluateService.java | 14 + .../impl/PopularizeEvaluateServiceImpl.java | 19 ++ .../vue/PopularizeEvaluateList.vue | 241 ++++++++++++++ .../vue/modules/PopularizeEvaluateForm.vue | 129 ++++++++ .../PopularizeEvaluateModal.Style#Drawer.vue | 84 +++++ .../vue/modules/PopularizeEvaluateModal.vue | 60 ++++ .../vue3/PopularizeEvaluate.api.ts | 61 ++++ .../vue3/PopularizeEvaluate.data.ts | 127 ++++++++ .../vue3/PopularizeEvaluateList.vue | 162 ++++++++++ .../vue3/components/PopularizeEvaluateModal.vue | 58 ++++ .../controller/PopularizeInvoicingController.java | 171 ++++++++++ .../entity/PopularizeInvoicing.java | 87 +++++ .../mapper/PopularizeInvoicingMapper.java | 17 + .../mapper/xml/PopularizeInvoicingMapper.xml | 5 + .../service/IPopularizeInvoicingService.java | 14 + .../impl/PopularizeInvoicingServiceImpl.java | 19 ++ .../vue/PopularizeInvoicingList.vue | 221 +++++++++++++ .../vue/modules/PopularizeInvoicingForm.vue | 139 ++++++++ .../PopularizeInvoicingModal.Style#Drawer.vue | 84 +++++ .../vue/modules/PopularizeInvoicingModal.vue | 60 ++++ .../vue3/PopularizeInvoicing.api.ts | 61 ++++ .../vue3/PopularizeInvoicing.data.ts | 114 +++++++ .../vue3/PopularizeInvoicingList.vue | 162 ++++++++++ .../vue3/components/PopularizeInvoicingModal.vue | 58 ++++ .../controller/PopularizeOrderController.java | 171 ++++++++++ .../popularizeOrder/entity/PopularizeOrder.java | 123 +++++++ .../mapper/PopularizeOrderMapper.java | 17 + .../mapper/xml/PopularizeOrderMapper.xml | 5 + .../service/IPopularizeOrderService.java | 14 + .../service/impl/PopularizeOrderServiceImpl.java | 19 ++ .../popularizeOrder/vue/PopularizeOrderList.vue | 303 +++++++++++++++++ .../vue/modules/PopularizeOrderForm.vue | 179 +++++++++++ .../modules/PopularizeOrderModal.Style#Drawer.vue | 84 +++++ .../vue/modules/PopularizeOrderModal.vue | 60 ++++ .../popularizeOrder/vue3/PopularizeOrder.api.ts | 61 ++++ .../popularizeOrder/vue3/PopularizeOrder.data.ts | 239 ++++++++++++++ .../popularizeOrder/vue3/PopularizeOrderList.vue | 162 ++++++++++ .../vue3/components/PopularizeOrderModal.vue | 58 ++++ .../controller/PopularizeRecruitController.java | 171 ++++++++++ .../entity/PopularizeRecruit.java | 95 ++++++ .../mapper/PopularizeRecruitMapper.java | 17 + .../mapper/xml/PopularizeRecruitMapper.xml | 5 + .../service/IPopularizeRecruitService.java | 14 + .../service/impl/PopularizeRecruitServiceImpl.java | 19 ++ .../vue/PopularizeRecruitList.vue | 295 +++++++++++++++++ .../vue/modules/PopularizeRecruitForm.vue | 154 +++++++++ .../PopularizeRecruitModal.Style#Drawer.vue | 84 +++++ .../vue/modules/PopularizeRecruitModal.vue | 60 ++++ .../vue3/PopularizeRecruit.api.ts | 61 ++++ .../vue3/PopularizeRecruit.data.ts | 190 +++++++++++ .../vue3/PopularizeRecruitList.vue | 162 ++++++++++ .../vue3/components/PopularizeRecruitModal.vue | 58 ++++ .../controller/PopularizeSchoolController.java | 171 ++++++++++ .../popularizeSchool/entity/PopularizeSchool.java | 78 +++++ .../mapper/PopularizeSchoolMapper.java | 17 + .../mapper/xml/PopularizeSchoolMapper.xml | 5 + .../service/IPopularizeSchoolService.java | 14 + .../service/impl/PopularizeSchoolServiceImpl.java | 19 ++ .../popularizeSchool/vue/PopularizeSchoolList.vue | 227 +++++++++++++ .../vue/modules/PopularizeSchoolForm.vue | 134 ++++++++ .../modules/PopularizeSchoolModal.Style#Drawer.vue | 84 +++++ .../vue/modules/PopularizeSchoolModal.vue | 60 ++++ .../popularizeSchool/vue3/PopularizeSchool.api.ts | 61 ++++ .../popularizeSchool/vue3/PopularizeSchool.data.ts | 95 ++++++ .../popularizeSchool/vue3/PopularizeSchoolList.vue | 162 ++++++++++ .../vue3/components/PopularizeSchoolModal.vue | 58 ++++ .../controller/PopularizeTravelController.java | 171 ++++++++++ .../popularizeTravel/entity/PopularizeTravel.java | 156 +++++++++ .../mapper/PopularizeTravelMapper.java | 17 + .../mapper/xml/PopularizeTravelMapper.xml | 5 + .../service/IPopularizeTravelService.java | 14 + .../service/impl/PopularizeTravelServiceImpl.java | 19 ++ .../popularizeTravel/vue/PopularizeTravelList.vue | 318 ++++++++++++++++++ .../vue/modules/PopularizeTravelForm.vue | 219 +++++++++++++ .../modules/PopularizeTravelModal.Style#Drawer.vue | 84 +++++ .../vue/modules/PopularizeTravelModal.vue | 60 ++++ .../popularizeTravel/vue3/PopularizeTravel.api.ts | 61 ++++ .../popularizeTravel/vue3/PopularizeTravel.data.ts | 274 ++++++++++++++++ .../popularizeTravel/vue3/PopularizeTravelList.vue | 162 ++++++++++ .../vue3/components/PopularizeTravelModal.vue | 58 ++++ 181 files changed, 15951 insertions(+), 10 deletions(-) create mode 100644 module-common/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java create mode 100644 module-common/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java create mode 100644 module-common/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java create mode 100644 module-common/src/main/java/org/jeecg/modules/hanHaiMember/mapper/xml/HanHaiMemberMapper.xml create mode 100644 module-common/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java create mode 100644 module-common/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java create mode 100644 module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberModal.Style#Drawer.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.api.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue3/components/HanHaiMemberModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeActivity/controller/PopularizeActivityController.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeActivity/entity/PopularizeActivity.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeActivity/mapper/PopularizeActivityMapper.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeActivity/mapper/xml/PopularizeActivityMapper.xml create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeActivity/service/IPopularizeActivityService.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeActivity/service/impl/PopularizeActivityServiceImpl.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue/PopularizeActivityList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue/modules/PopularizeActivityForm.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue/modules/PopularizeActivityModal.Style#Drawer.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue/modules/PopularizeActivityModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue3/PopularizeActivity.api.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue3/PopularizeActivity.data.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue3/PopularizeActivityList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue3/components/PopularizeActivityModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/controller/PopularizeAuthenticationController.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/entity/PopularizeAuthentication.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/mapper/PopularizeAuthenticationMapper.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/mapper/xml/PopularizeAuthenticationMapper.xml create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/service/IPopularizeAuthenticationService.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/service/impl/PopularizeAuthenticationServiceImpl.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue/PopularizeAuthenticationList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue/modules/PopularizeAuthenticationForm.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue/modules/PopularizeAuthenticationModal.Style#Drawer.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue/modules/PopularizeAuthenticationModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue3/PopularizeAuthentication.api.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue3/PopularizeAuthentication.data.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue3/PopularizeAuthenticationList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue3/components/PopularizeAuthenticationModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCity/controller/PopularizeCityController.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCity/entity/PopularizeCity.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCity/mapper/PopularizeCityMapper.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCity/mapper/xml/PopularizeCityMapper.xml create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCity/service/IPopularizeCityService.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCity/service/impl/PopularizeCityServiceImpl.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCity/vue/PopularizeCityList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCity/vue/modules/PopularizeCityForm.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCity/vue/modules/PopularizeCityModal.Style#Drawer.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCity/vue/modules/PopularizeCityModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCity/vue3/PopularizeCity.api.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCity/vue3/PopularizeCity.data.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCity/vue3/PopularizeCityList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCity/vue3/components/PopularizeCityModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCollect/controller/PopularizeCollectController.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCollect/entity/PopularizeCollect.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCollect/mapper/PopularizeCollectMapper.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCollect/mapper/xml/PopularizeCollectMapper.xml create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCollect/service/IPopularizeCollectService.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCollect/service/impl/PopularizeCollectServiceImpl.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue/PopularizeCollectList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue/modules/PopularizeCollectForm.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue/modules/PopularizeCollectModal.Style#Drawer.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue/modules/PopularizeCollectModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue3/PopularizeCollect.api.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue3/PopularizeCollect.data.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue3/PopularizeCollectList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue3/components/PopularizeCollectModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCountry/controller/PopularizeCountryController.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCountry/entity/PopularizeCountry.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCountry/mapper/PopularizeCountryMapper.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCountry/mapper/xml/PopularizeCountryMapper.xml create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCountry/service/IPopularizeCountryService.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCountry/service/impl/PopularizeCountryServiceImpl.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue/PopularizeCountryList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue/modules/PopularizeCountryForm.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue/modules/PopularizeCountryModal.Style#Drawer.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue/modules/PopularizeCountryModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue3/PopularizeCountry.api.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue3/PopularizeCountry.data.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue3/PopularizeCountryList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue3/components/PopularizeCountryModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/controller/PopularizeEvaluateController.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/entity/PopularizeEvaluate.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/mapper/PopularizeEvaluateMapper.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/mapper/xml/PopularizeEvaluateMapper.xml create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/service/IPopularizeEvaluateService.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/service/impl/PopularizeEvaluateServiceImpl.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue/PopularizeEvaluateList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue/modules/PopularizeEvaluateForm.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue/modules/PopularizeEvaluateModal.Style#Drawer.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue/modules/PopularizeEvaluateModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue3/PopularizeEvaluate.api.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue3/PopularizeEvaluate.data.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue3/PopularizeEvaluateList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue3/components/PopularizeEvaluateModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/controller/PopularizeInvoicingController.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/entity/PopularizeInvoicing.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/mapper/PopularizeInvoicingMapper.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/mapper/xml/PopularizeInvoicingMapper.xml create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/service/IPopularizeInvoicingService.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/service/impl/PopularizeInvoicingServiceImpl.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue/PopularizeInvoicingList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue/modules/PopularizeInvoicingForm.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue/modules/PopularizeInvoicingModal.Style#Drawer.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue/modules/PopularizeInvoicingModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue3/PopularizeInvoicing.api.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue3/PopularizeInvoicing.data.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue3/PopularizeInvoicingList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue3/components/PopularizeInvoicingModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeOrder/controller/PopularizeOrderController.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeOrder/entity/PopularizeOrder.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeOrder/mapper/PopularizeOrderMapper.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeOrder/mapper/xml/PopularizeOrderMapper.xml create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeOrder/service/IPopularizeOrderService.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeOrder/service/impl/PopularizeOrderServiceImpl.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/PopularizeOrderList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/modules/PopularizeOrderForm.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/modules/PopularizeOrderModal.Style#Drawer.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/modules/PopularizeOrderModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue3/PopularizeOrder.api.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue3/PopularizeOrder.data.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue3/PopularizeOrderList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue3/components/PopularizeOrderModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeRecruit/controller/PopularizeRecruitController.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeRecruit/entity/PopularizeRecruit.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeRecruit/mapper/PopularizeRecruitMapper.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeRecruit/mapper/xml/PopularizeRecruitMapper.xml create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeRecruit/service/IPopularizeRecruitService.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeRecruit/service/impl/PopularizeRecruitServiceImpl.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/PopularizeRecruitList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/modules/PopularizeRecruitForm.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/modules/PopularizeRecruitModal.Style#Drawer.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/modules/PopularizeRecruitModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue3/PopularizeRecruit.api.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue3/PopularizeRecruit.data.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue3/PopularizeRecruitList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue3/components/PopularizeRecruitModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSchool/controller/PopularizeSchoolController.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSchool/entity/PopularizeSchool.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSchool/mapper/PopularizeSchoolMapper.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSchool/mapper/xml/PopularizeSchoolMapper.xml create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSchool/service/IPopularizeSchoolService.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSchool/service/impl/PopularizeSchoolServiceImpl.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue/PopularizeSchoolList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue/modules/PopularizeSchoolForm.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue/modules/PopularizeSchoolModal.Style#Drawer.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue/modules/PopularizeSchoolModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue3/PopularizeSchool.api.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue3/PopularizeSchool.data.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue3/PopularizeSchoolList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue3/components/PopularizeSchoolModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeTravel/controller/PopularizeTravelController.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeTravel/entity/PopularizeTravel.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeTravel/mapper/PopularizeTravelMapper.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeTravel/mapper/xml/PopularizeTravelMapper.xml create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeTravel/service/IPopularizeTravelService.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeTravel/service/impl/PopularizeTravelServiceImpl.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/PopularizeTravelList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/modules/PopularizeTravelForm.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/modules/PopularizeTravelModal.Style#Drawer.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/modules/PopularizeTravelModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue3/PopularizeTravel.api.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue3/PopularizeTravel.data.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue3/PopularizeTravelList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue3/components/PopularizeTravelModal.vue diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/controller/CommonBannerController.java b/module-common/src/main/java/org/jeecg/modules/commonBanner/controller/CommonBannerController.java index 96cf27c..026fccd 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBanner/controller/CommonBannerController.java +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/controller/CommonBannerController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 公共轮播图 * @Author: jeecg-boot - * @Date: 2024-11-23 + * @Date: 2024-12-19 * @Version: V1.0 */ @Api(tags="公共轮播图") diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/entity/CommonBanner.java b/module-common/src/main/java/org/jeecg/modules/commonBanner/entity/CommonBanner.java index 7dd5d27..e24fb50 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBanner/entity/CommonBanner.java +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/entity/CommonBanner.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 公共轮播图 * @Author: jeecg-boot - * @Date: 2024-11-23 + * @Date: 2024-12-19 * @Version: V1.0 */ @Data @@ -51,4 +51,36 @@ public class CommonBanner implements Serializable { @Excel(name = "图片", width = 15) @ApiModelProperty(value = "图片") private java.lang.String image; + /**标题*/ + @Excel(name = "标题", width = 15) + @ApiModelProperty(value = "标题") + private java.lang.String title; + /**关联旅行*/ + @Excel(name = "关联旅行", width = 15, dictTable = "popularize_travel", dicText = "title", dicCode = "id") + @Dict(dictTable = "popularize_travel", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "关联旅行") + private java.lang.String travelId; + /**关联活动*/ + @Excel(name = "关联活动", width = 15, dictTable = "popularize_activity", dicText = "title", dicCode = "id") + @Dict(dictTable = "popularize_activity", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "关联活动") + private java.lang.String activityId; + /**排序*/ + @Excel(name = "排序", width = 15) + @ApiModelProperty(value = "排序") + private java.lang.Integer sort; + /**类型*/ + @Excel(name = "类型", width = 15, dicCode = "no_yu") + @Dict(dicCode = "no_yu") + @ApiModelProperty(value = "类型") + private java.lang.Integer type; + /**是否启用*/ + @Excel(name = "是否启用", width = 15) + @ApiModelProperty(value = "是否启用") + private java.lang.String isOpen; + /**跳转位置*/ + @Excel(name = "跳转位置", width = 15, dicCode = "to_go") + @Dict(dicCode = "to_go") + @ApiModelProperty(value = "跳转位置") + private java.lang.Integer toCheck; } diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/CommonBannerMapper.java b/module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/CommonBannerMapper.java index f225b0c..e047c6f 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/CommonBannerMapper.java +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/CommonBannerMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 公共轮播图 * @Author: jeecg-boot - * @Date: 2024-11-23 + * @Date: 2024-12-19 * @Version: V1.0 */ public interface CommonBannerMapper extends BaseMapper { diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/service/ICommonBannerService.java b/module-common/src/main/java/org/jeecg/modules/commonBanner/service/ICommonBannerService.java index e6c6532..d3b962f 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBanner/service/ICommonBannerService.java +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/service/ICommonBannerService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 公共轮播图 * @Author: jeecg-boot - * @Date: 2024-11-23 + * @Date: 2024-12-19 * @Version: V1.0 */ public interface ICommonBannerService extends IService { diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/service/impl/CommonBannerServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonBanner/service/impl/CommonBannerServiceImpl.java index eae3487..a72e2ee 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBanner/service/impl/CommonBannerServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/service/impl/CommonBannerServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 公共轮播图 * @Author: jeecg-boot - * @Date: 2024-11-23 + * @Date: 2024-12-19 * @Version: V1.0 */ @Service diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/CommonBannerList.vue b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/CommonBannerList.vue index cb075a4..395be05 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/CommonBannerList.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/CommonBannerList.vue @@ -99,6 +99,7 @@ import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import CommonBannerModal from './modules/CommonBannerModal' + import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' export default { name: 'CommonBannerList', @@ -127,6 +128,42 @@ dataIndex: 'image', scopedSlots: {customRender: 'imgSlot'} }, + { + title:'标题', + align:"center", + dataIndex: 'title' + }, + { + title:'关联旅行', + align:"center", + dataIndex: 'travelId_dictText' + }, + { + title:'关联活动', + align:"center", + dataIndex: 'activityId_dictText' + }, + { + title:'排序', + align:"center", + dataIndex: 'sort' + }, + { + title:'类型', + align:"center", + dataIndex: 'type_dictText' + }, + { + title:'是否启用', + align:"center", + dataIndex: 'isOpen', + customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isOpen'], text) : ''), + }, + { + title:'跳转位置', + align:"center", + dataIndex: 'toCheck_dictText' + }, { title: '操作', dataIndex: 'action', @@ -149,6 +186,7 @@ } }, created() { + this.$set(this.dictOptions, 'isOpen', [{text:'是',value:'Y'},{text:'否',value:'N'}]) this.getSuperFieldList(); }, computed: { @@ -162,6 +200,13 @@ getSuperFieldList(){ let fieldList=[]; fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''}) + fieldList.push({type:'string',value:'title',text:'标题',dictCode:''}) + fieldList.push({type:'sel_search',value:'travelId',text:'关联旅行',dictTable:"popularize_travel", dictText:'title', dictCode:'id'}) + fieldList.push({type:'sel_search',value:'activityId',text:'关联活动',dictTable:"popularize_activity", dictText:'title', dictCode:'id'}) + fieldList.push({type:'int',value:'sort',text:'排序',dictCode:''}) + fieldList.push({type:'int',value:'type',text:'类型',dictCode:'no_yu'}) + fieldList.push({type:'switch',value:'isOpen',text:'是否启用'}) + fieldList.push({type:'int',value:'toCheck',text:'跳转位置',dictCode:'to_go'}) this.superFieldList = fieldList } } diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerForm.vue b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerForm.vue index 853636a..05daed0 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerForm.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerForm.vue @@ -8,6 +8,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBanner.data.ts b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBanner.data.ts index 9c8a5a7..99a839a 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBanner.data.ts +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBanner.data.ts @@ -10,6 +10,44 @@ export const columns: BasicColumn[] = [ dataIndex: 'image', customRender:render.renderAvatar, }, + { + title: '标题', + align:"center", + dataIndex: 'title' + }, + { + title: '关联旅行', + align:"center", + dataIndex: 'travelId_dictText' + }, + { + title: '关联活动', + align:"center", + dataIndex: 'activityId_dictText' + }, + { + title: '排序', + align:"center", + dataIndex: 'sort' + }, + { + title: '类型', + align:"center", + dataIndex: 'type_dictText' + }, + { + title: '是否启用', + align:"center", + dataIndex: 'isOpen', + customRender:({text}) => { + return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]) + }, + }, + { + title: '跳转位置', + align:"center", + dataIndex: 'toCheck_dictText' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -23,4 +61,53 @@ export const formSchema: FormSchema[] = [ componentProps:{ }, }, + { + label: '标题', + field: 'title', + component: 'Input', + }, + { + label: '关联旅行', + field: 'travelId', + component: 'JSearchSelect', + componentProps:{ + dict:"popularize_travel,title,id" + }, + }, + { + label: '关联活动', + field: 'activityId', + component: 'JSearchSelect', + componentProps:{ + dict:"popularize_activity,title,id" + }, + }, + { + label: '排序', + field: 'sort', + component: 'InputNumber', + }, + { + label: '类型', + field: 'type', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"no_yu" + }, + }, + { + label: '是否启用', + field: 'isOpen', + component: 'JSwitch', + componentProps:{ + }, + }, + { + label: '跳转位置', + field: 'toCheck', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"to_go" + }, + }, ]; diff --git a/module-common/src/main/java/org/jeecg/modules/commonIconImage/controller/CommonIconImageController.java b/module-common/src/main/java/org/jeecg/modules/commonIconImage/controller/CommonIconImageController.java index 26fbded..b482252 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonIconImage/controller/CommonIconImageController.java +++ b/module-common/src/main/java/org/jeecg/modules/commonIconImage/controller/CommonIconImageController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 图标 * @Author: jeecg-boot - * @Date: 2024-11-24 + * @Date: 2024-12-19 * @Version: V1.0 */ @Api(tags="图标") diff --git a/module-common/src/main/java/org/jeecg/modules/commonIconImage/entity/CommonIconImage.java b/module-common/src/main/java/org/jeecg/modules/commonIconImage/entity/CommonIconImage.java index ac042fd..553b40a 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonIconImage/entity/CommonIconImage.java +++ b/module-common/src/main/java/org/jeecg/modules/commonIconImage/entity/CommonIconImage.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 图标 * @Author: jeecg-boot - * @Date: 2024-11-24 + * @Date: 2024-12-19 * @Version: V1.0 */ @Data diff --git a/module-common/src/main/java/org/jeecg/modules/commonIconImage/mapper/CommonIconImageMapper.java b/module-common/src/main/java/org/jeecg/modules/commonIconImage/mapper/CommonIconImageMapper.java index 8e25163..9c45856 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonIconImage/mapper/CommonIconImageMapper.java +++ b/module-common/src/main/java/org/jeecg/modules/commonIconImage/mapper/CommonIconImageMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 图标 * @Author: jeecg-boot - * @Date: 2024-11-24 + * @Date: 2024-12-19 * @Version: V1.0 */ public interface CommonIconImageMapper extends BaseMapper { diff --git a/module-common/src/main/java/org/jeecg/modules/commonIconImage/service/ICommonIconImageService.java b/module-common/src/main/java/org/jeecg/modules/commonIconImage/service/ICommonIconImageService.java index 415b507..70a091e 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonIconImage/service/ICommonIconImageService.java +++ b/module-common/src/main/java/org/jeecg/modules/commonIconImage/service/ICommonIconImageService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 图标 * @Author: jeecg-boot - * @Date: 2024-11-24 + * @Date: 2024-12-19 * @Version: V1.0 */ public interface ICommonIconImageService extends IService { diff --git a/module-common/src/main/java/org/jeecg/modules/commonIconImage/service/impl/CommonIconImageServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonIconImage/service/impl/CommonIconImageServiceImpl.java index 6b50a47..28b8b4b 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonIconImage/service/impl/CommonIconImageServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/modules/commonIconImage/service/impl/CommonIconImageServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 图标 * @Author: jeecg-boot - * @Date: 2024-11-24 + * @Date: 2024-12-19 * @Version: V1.0 */ @Service diff --git a/module-common/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java new file mode 100644 index 0000000..50c4739 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.hanHaiMember.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.hanHaiMember.entity.HanHaiMember; +import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; + +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-12-19 + * @Version: V1.0 + */ +@Api(tags="用户账户表") +@RestController +@RequestMapping("/hanHaiMember/hanHaiMember") +@Slf4j +public class HanHaiMemberController extends JeecgController { + @Autowired + private IHanHaiMemberService hanHaiMemberService; + + /** + * 分页列表查询 + * + * @param hanHaiMember + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "用户账户表-分页列表查询") + @ApiOperation(value="用户账户表-分页列表查询", notes="用户账户表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(HanHaiMember hanHaiMember, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(hanHaiMember, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = hanHaiMemberService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param hanHaiMember + * @return + */ + @AutoLog(value = "用户账户表-添加") + @ApiOperation(value="用户账户表-添加", notes="用户账户表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody HanHaiMember hanHaiMember) { + hanHaiMemberService.save(hanHaiMember); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param hanHaiMember + * @return + */ + @AutoLog(value = "用户账户表-编辑") + @ApiOperation(value="用户账户表-编辑", notes="用户账户表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody HanHaiMember hanHaiMember) { + hanHaiMemberService.updateById(hanHaiMember); + 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) { + hanHaiMemberService.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.hanHaiMemberService.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) { + HanHaiMember hanHaiMember = hanHaiMemberService.getById(id); + if(hanHaiMember==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(hanHaiMember); + } + + /** + * 导出excel + * + * @param request + * @param hanHaiMember + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, HanHaiMember hanHaiMember) { + return super.exportXls(request, hanHaiMember, HanHaiMember.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, HanHaiMember.class); + } + +} diff --git a/module-common/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java new file mode 100644 index 0000000..1c88310 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java @@ -0,0 +1,244 @@ +package org.jeecg.modules.hanHaiMember.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-12-19 + * @Version: V1.0 + */ +@Data +@TableName("han_hai_member") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="han_hai_member对象", description="用户账户表") +public class HanHaiMember implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + 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; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + /**用户昵称*/ + @Excel(name = "用户昵称", width = 15) + @ApiModelProperty(value = "用户昵称") + private java.lang.String nickName; + /**用户头像*/ + @Excel(name = "用户头像", width = 15) + @ApiModelProperty(value = "用户头像") + private java.lang.String headImage; + /**真实姓名*/ + @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 account; + /**登录密码*/ + @Excel(name = "登录密码", width = 15) + @ApiModelProperty(value = "登录密码") + private java.lang.String password; + /**登录盐*/ + @Excel(name = "登录盐", width = 15) + @ApiModelProperty(value = "登录盐") + private java.lang.String passwordSalt; + /**店铺名称备注*/ + @Excel(name = "店铺名称备注", width = 15) + @ApiModelProperty(value = "店铺名称备注") + private java.lang.String shopName; + /**角色*/ + @Excel(name = "角色", width = 15, dicCode = "member_role") + @Dict(dicCode = "member_role") + @ApiModelProperty(value = "角色") + private java.lang.Integer role; + /**ID标识号码*/ + @Excel(name = "ID标识号码", width = 15) + @ApiModelProperty(value = "ID标识号码") + private java.lang.String cardId; + /**是否冻结*/ + @Excel(name = "是否冻结", width = 15) + @ApiModelProperty(value = "是否冻结") + private java.lang.String frozenFlag; + /**是否删除*/ + @Excel(name = "是否删除", width = 15) + @ApiModelProperty(value = "是否删除") + private java.lang.String deleteFlag; + /**登录TOEKN*/ + @Excel(name = "登录TOEKN", width = 15) + @ApiModelProperty(value = "登录TOEKN") + private java.lang.String token; + /**公众号openid*/ + @Excel(name = "公众号openid", width = 15) + @ApiModelProperty(value = "公众号openid") + private java.lang.String officialOpenid; + /**小程序标识*/ + @Excel(name = "小程序标识", width = 15) + @ApiModelProperty(value = "小程序标识") + private java.lang.String appletOpenid; + /**APP标识*/ + @Excel(name = "APP标识", width = 15) + @ApiModelProperty(value = "APP标识") + private java.lang.String appOpenid; + /**微信UNIONID*/ + @Excel(name = "微信UNIONID", width = 15) + @ApiModelProperty(value = "微信UNIONID") + private java.lang.String wxUnionid; + /**公众号appid*/ + @Excel(name = "公众号appid", width = 15) + @ApiModelProperty(value = "公众号appid") + private java.lang.String officialAppid; + /**身份证号码*/ + @Excel(name = "身份证号码", width = 15) + @ApiModelProperty(value = "身份证号码") + private java.lang.String idCard; + /**发薪平台密码*/ + @Excel(name = "发薪平台密码", width = 15) + @ApiModelProperty(value = "发薪平台密码") + private java.lang.String idCardPassword; + /**发薪平台加密盐*/ + @Excel(name = "发薪平台加密盐", width = 15) + @ApiModelProperty(value = "发薪平台加密盐") + private java.lang.String idCardSalt; + /**是否实名认证*/ + @Excel(name = "是否实名认证", width = 15) + @ApiModelProperty(value = "是否实名认证") + private java.lang.Integer idCardOpen; + /**粉丝人数*/ + @Excel(name = "粉丝人数", width = 15) + @ApiModelProperty(value = "粉丝人数") + private java.lang.Integer intentionNum; + /**successNum*/ + @Excel(name = "successNum", width = 15) + @ApiModelProperty(value = "successNum") + private java.lang.Integer successNum; + /**addNum*/ + @Excel(name = "addNum", width = 15) + @ApiModelProperty(value = "addNum") + private java.lang.Integer addNum; + /**邀请人*/ + @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 shareId; + /**邀请人*/ + @Excel(name = "邀请人", width = 15) + @ApiModelProperty(value = "邀请人") + private java.lang.String vid; + /**邀请时间*/ + @Excel(name = "邀请时间", width = 15) + @ApiModelProperty(value = "邀请时间") + private java.util.Date vtime; + /**用户角色*/ + @Excel(name = "用户角色", width = 15, dicCode = "member_role") + @Dict(dicCode = "member_role") + @ApiModelProperty(value = "用户角色") + private java.lang.Integer isPay; + /**是否关注公众号*/ + @Excel(name = "是否关注公众号", width = 15) + @ApiModelProperty(value = "是否关注公众号") + private java.lang.Integer follow; + /**payRole*/ + @Excel(name = "payRole", width = 15) + @ApiModelProperty(value = "payRole") + private java.math.BigDecimal payRole; + /**余额*/ + @Excel(name = "余额", width = 15) + @ApiModelProperty(value = "余额") + private java.math.BigDecimal price; + /**积分*/ + @Excel(name = "积分", width = 15) + @ApiModelProperty(value = "积分") + private java.math.BigDecimal integerPrice; + /**小程序appid*/ + @Excel(name = "小程序appid", width = 15) + @ApiModelProperty(value = "小程序appid") + private java.lang.String appletAppid; + /**性别*/ + @Excel(name = "性别", width = 15) + @ApiModelProperty(value = "性别") + private java.lang.String sex; + /**是否分销商*/ + @Excel(name = "是否分销商", width = 15) + @ApiModelProperty(value = "是否分销商") + private java.lang.String isDai; + /**出生年*/ + @Excel(name = "出生年", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "出生年") + private java.util.Date yearDate; + /**地址*/ + @Excel(name = "地址", width = 15) + @ApiModelProperty(value = "地址") + private java.lang.String address; + /**可提现金额*/ + @Excel(name = "可提现金额", width = 15) + @ApiModelProperty(value = "可提现金额") + private java.math.BigDecimal money; + /**状态*/ + @Excel(name = "状态", width = 15) + @ApiModelProperty(value = "状态") + private java.lang.String state; + /**国籍*/ + @Excel(name = "国籍", width = 15) + @ApiModelProperty(value = "国籍") + private java.lang.String city; + /**邮箱*/ + @Excel(name = "邮箱", width = 15) + @ApiModelProperty(value = "邮箱") + private java.lang.String email; + /**学历*/ + @Excel(name = "学历", width = 15) + @ApiModelProperty(value = "学历") + private java.lang.String shcool; + /**院校类型*/ + @Excel(name = "院校类型", width = 15) + @ApiModelProperty(value = "院校类型") + private java.lang.String shcoolType; + /**工作*/ + @Excel(name = "工作", width = 15) + @ApiModelProperty(value = "工作") + private java.lang.String workValue; + /**关于我*/ + @Excel(name = "关于我", width = 15) + @ApiModelProperty(value = "关于我") + private java.lang.String details; +} diff --git a/module-common/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java new file mode 100644 index 0000000..52ff4ff --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.hanHaiMember.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 用户账户表 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface HanHaiMemberMapper extends BaseMapper { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/hanHaiMember/mapper/xml/HanHaiMemberMapper.xml b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/mapper/xml/HanHaiMemberMapper.xml new file mode 100644 index 0000000..67a19f7 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/mapper/xml/HanHaiMemberMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java new file mode 100644 index 0000000..2a15b84 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.hanHaiMember.service; + +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 用户账户表 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface IHanHaiMemberService extends IService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java new file mode 100644 index 0000000..2454576 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.hanHaiMember.service.impl; + +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.jeecg.modules.hanHaiMember.mapper.HanHaiMemberMapper; +import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 用户账户表 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +@Service +public class HanHaiMemberServiceImpl extends ServiceImpl implements IHanHaiMemberService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue new file mode 100644 index 0000000..c99a6a7 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue @@ -0,0 +1,274 @@ + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue new file mode 100644 index 0000000..42f1cbf --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue @@ -0,0 +1,169 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberModal.Style#Drawer.vue new file mode 100644 index 0000000..601b489 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberModal.vue b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberModal.vue new file mode 100644 index 0000000..b9706da --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.api.ts b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.api.ts new file mode 100644 index 0000000..0a4f36d --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/hanHaiMember/hanHaiMember/list', + save='/hanHaiMember/hanHaiMember/add', + edit='/hanHaiMember/hanHaiMember/edit', + deleteOne = '/hanHaiMember/hanHaiMember/delete', + deleteBatch = '/hanHaiMember/hanHaiMember/deleteBatch', + importExcel = '/hanHaiMember/hanHaiMember/importExcel', + exportXls = '/hanHaiMember/hanHaiMember/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/module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts new file mode 100644 index 0000000..ee5da7b --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts @@ -0,0 +1,170 @@ +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: 'createTime' + }, + { + title: '用户昵称', + align:"center", + dataIndex: 'nickName' + }, + { + title: '用户头像', + align:"center", + dataIndex: 'headImage', + customRender:render.renderAvatar, + }, + { + title: '手机号码', + align:"center", + dataIndex: 'phone' + }, + { + title: '小程序标识', + align:"center", + dataIndex: 'appletOpenid' + }, + { + title: '性别', + align:"center", + dataIndex: 'sex' + }, + { + title: '出生年', + align:"center", + dataIndex: 'yearDate', + customRender:({text}) =>{ + return !text?"":(text.length>10?text.substr(0,10):text) + }, + }, + { + title: '地址', + align:"center", + dataIndex: 'address' + }, + { + title: '状态', + align:"center", + dataIndex: 'state' + }, + { + title: '国籍', + align:"center", + dataIndex: 'city' + }, + { + title: '邮箱', + align:"center", + dataIndex: 'email' + }, + { + title: '学历', + align:"center", + dataIndex: 'shcool' + }, + { + title: '院校类型', + align:"center", + dataIndex: 'shcoolType' + }, + { + title: '工作', + align:"center", + dataIndex: 'workValue' + }, + { + title: '关于我', + align:"center", + dataIndex: 'details' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ + { + label: "用户昵称", + field: "nickName", + component: 'Input', + colProps: {span: 6}, + }, +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '用户昵称', + field: 'nickName', + component: 'Input', + }, + { + label: '用户头像', + field: 'headImage', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '手机号码', + field: 'phone', + component: 'Input', + }, + { + label: '小程序标识', + field: 'appletOpenid', + component: 'Input', + }, + { + label: '性别', + field: 'sex', + component: 'Input', + }, + { + label: '出生年', + field: 'yearDate', + component: 'DatePicker', + }, + { + label: '地址', + field: 'address', + component: 'Input', + }, + { + label: '状态', + field: 'state', + component: 'Input', + }, + { + label: '国籍', + field: 'city', + component: 'Input', + }, + { + label: '邮箱', + field: 'email', + component: 'Input', + }, + { + label: '学历', + field: 'shcool', + component: 'Input', + }, + { + label: '院校类型', + field: 'shcoolType', + component: 'Input', + }, + { + label: '工作', + field: 'workValue', + component: 'Input', + }, + { + label: '关于我', + field: 'details', + component: 'InputTextArea',//TODO 注意string转换问题 + }, +]; diff --git a/module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue new file mode 100644 index 0000000..40a6799 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue3/components/HanHaiMemberModal.vue b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue3/components/HanHaiMemberModal.vue new file mode 100644 index 0000000..4773019 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/hanHaiMember/vue3/components/HanHaiMemberModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeActivity/controller/PopularizeActivityController.java b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/controller/PopularizeActivityController.java new file mode 100644 index 0000000..0b5592c --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/controller/PopularizeActivityController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.popularizeActivity.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.popularizeActivity.entity.PopularizeActivity; +import org.jeecg.modules.popularizeActivity.service.IPopularizeActivityService; + +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-12-19 + * @Version: V1.0 + */ +@Api(tags="活动信息表") +@RestController +@RequestMapping("/popularizeActivity/popularizeActivity") +@Slf4j +public class PopularizeActivityController extends JeecgController { + @Autowired + private IPopularizeActivityService popularizeActivityService; + + /** + * 分页列表查询 + * + * @param popularizeActivity + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "活动信息表-分页列表查询") + @ApiOperation(value="活动信息表-分页列表查询", notes="活动信息表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(PopularizeActivity popularizeActivity, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(popularizeActivity, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = popularizeActivityService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param popularizeActivity + * @return + */ + @AutoLog(value = "活动信息表-添加") + @ApiOperation(value="活动信息表-添加", notes="活动信息表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PopularizeActivity popularizeActivity) { + popularizeActivityService.save(popularizeActivity); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param popularizeActivity + * @return + */ + @AutoLog(value = "活动信息表-编辑") + @ApiOperation(value="活动信息表-编辑", notes="活动信息表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody PopularizeActivity popularizeActivity) { + popularizeActivityService.updateById(popularizeActivity); + 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) { + popularizeActivityService.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.popularizeActivityService.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) { + PopularizeActivity popularizeActivity = popularizeActivityService.getById(id); + if(popularizeActivity==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(popularizeActivity); + } + + /** + * 导出excel + * + * @param request + * @param popularizeActivity + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PopularizeActivity popularizeActivity) { + return super.exportXls(request, popularizeActivity, PopularizeActivity.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, PopularizeActivity.class); + } + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeActivity/entity/PopularizeActivity.java b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/entity/PopularizeActivity.java new file mode 100644 index 0000000..e9fdc9b --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/entity/PopularizeActivity.java @@ -0,0 +1,149 @@ +package org.jeecg.modules.popularizeActivity.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-12-19 + * @Version: V1.0 + */ +@Data +@TableName("popularize_activity") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="popularize_activity对象", description="活动信息表") +public class PopularizeActivity 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 no; + /**中文-活动标题*/ + @Excel(name = "中文-活动标题", width = 15) + @ApiModelProperty(value = "中文-活动标题") + private java.lang.String title; + /**英文-活动标题*/ + @Excel(name = "英文-活动标题", width = 15) + @ApiModelProperty(value = "英文-活动标题") + private java.lang.String enTitle; + /**活动类型*/ + @Excel(name = "活动类型", width = 15, dicCode = "no_type") + @Dict(dicCode = "no_type") + @ApiModelProperty(value = "活动类型") + private java.lang.String type; + /**活动封面*/ + @Excel(name = "活动封面", width = 15) + @ApiModelProperty(value = "活动封面") + private java.lang.String image; + /**活动时间*/ + @Excel(name = "活动时间", width = 15) + @ApiModelProperty(value = "活动时间") + private java.util.Date startTime; + /**中文-活动地址*/ + @Excel(name = "中文-活动地址", width = 15) + @ApiModelProperty(value = "中文-活动地址") + private java.lang.String address; + /**英文-活动地址*/ + @Excel(name = "英文-活动地址", width = 15) + @ApiModelProperty(value = "英文-活动地址") + private java.lang.String enAddress; + /**活动人数*/ + @Excel(name = "活动人数", width = 15) + @ApiModelProperty(value = "活动人数") + private java.lang.Integer sum; + /**报名人数*/ + @Excel(name = "报名人数", width = 15) + @ApiModelProperty(value = "报名人数") + private java.lang.Integer num; + /**报名费用*/ + @Excel(name = "报名费用", width = 15) + @ApiModelProperty(value = "报名费用") + private java.math.BigDecimal price; + /**主理人*/ + @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 adminUser; + /**签到人数*/ + @Excel(name = "签到人数", width = 15) + @ApiModelProperty(value = "签到人数") + private java.lang.Integer openNum; + /**是否上架*/ + @Excel(name = "是否上架", width = 15) + @ApiModelProperty(value = "是否上架") + private java.lang.String isOpen; + /**活动状态*/ + @Excel(name = "活动状态", width = 15, dicCode = "no_state") + @Dict(dicCode = "no_state") + @ApiModelProperty(value = "活动状态") + private java.lang.Integer state; + /**活动详情*/ + @Excel(name = "活动详情", width = 15) + @ApiModelProperty(value = "活动详情") + private java.lang.String details; + /**英文-活动详情*/ + @Excel(name = "英文-活动详情", width = 15) + @ApiModelProperty(value = "英文-活动详情") + private java.lang.String enDetails; + /**中文-注意事项*/ + @Excel(name = "中文-注意事项", width = 15) + @ApiModelProperty(value = "中文-注意事项") + private java.lang.String precautions; + /**英文-注意事项*/ + @Excel(name = "英文-注意事项", width = 15) + @ApiModelProperty(value = "英文-注意事项") + private java.lang.String enPrecautions; + /**早鸟票*/ + @Excel(name = "早鸟票", width = 15) + @ApiModelProperty(value = "早鸟票") + private java.math.BigDecimal birdPrice; + /**单人票*/ + @Excel(name = "单人票", width = 15) + @ApiModelProperty(value = "单人票") + private java.math.BigDecimal personPrice; + /**尊享票*/ + @Excel(name = "尊享票", width = 15) + @ApiModelProperty(value = "尊享票") + private java.math.BigDecimal expensivePrice; + /**经度*/ + @Excel(name = "经度", width = 15) + @ApiModelProperty(value = "经度") + private java.lang.String longitude; + /**纬度*/ + @Excel(name = "纬度", width = 15) + @ApiModelProperty(value = "纬度") + private java.lang.String latitude; +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeActivity/mapper/PopularizeActivityMapper.java b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/mapper/PopularizeActivityMapper.java new file mode 100644 index 0000000..7e24e6c --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/mapper/PopularizeActivityMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.popularizeActivity.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.popularizeActivity.entity.PopularizeActivity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 活动信息表 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface PopularizeActivityMapper extends BaseMapper { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeActivity/mapper/xml/PopularizeActivityMapper.xml b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/mapper/xml/PopularizeActivityMapper.xml new file mode 100644 index 0000000..bad28a6 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/mapper/xml/PopularizeActivityMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeActivity/service/IPopularizeActivityService.java b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/service/IPopularizeActivityService.java new file mode 100644 index 0000000..c8a74a4 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/service/IPopularizeActivityService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.popularizeActivity.service; + +import org.jeecg.modules.popularizeActivity.entity.PopularizeActivity; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 活动信息表 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface IPopularizeActivityService extends IService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeActivity/service/impl/PopularizeActivityServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/service/impl/PopularizeActivityServiceImpl.java new file mode 100644 index 0000000..bed310d --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/service/impl/PopularizeActivityServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.popularizeActivity.service.impl; + +import org.jeecg.modules.popularizeActivity.entity.PopularizeActivity; +import org.jeecg.modules.popularizeActivity.mapper.PopularizeActivityMapper; +import org.jeecg.modules.popularizeActivity.service.IPopularizeActivityService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 活动信息表 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +@Service +public class PopularizeActivityServiceImpl extends ServiceImpl implements IPopularizeActivityService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue/PopularizeActivityList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue/PopularizeActivityList.vue new file mode 100644 index 0000000..ff7f989 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue/PopularizeActivityList.vue @@ -0,0 +1,357 @@ + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue/modules/PopularizeActivityForm.vue b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue/modules/PopularizeActivityForm.vue new file mode 100644 index 0000000..c796e67 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue/modules/PopularizeActivityForm.vue @@ -0,0 +1,214 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue/modules/PopularizeActivityModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue/modules/PopularizeActivityModal.Style#Drawer.vue new file mode 100644 index 0000000..e3841ee --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue/modules/PopularizeActivityModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue/modules/PopularizeActivityModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue/modules/PopularizeActivityModal.vue new file mode 100644 index 0000000..22d20b9 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue/modules/PopularizeActivityModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue3/PopularizeActivity.api.ts b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue3/PopularizeActivity.api.ts new file mode 100644 index 0000000..bea53c5 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue3/PopularizeActivity.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/popularizeActivity/popularizeActivity/list', + save='/popularizeActivity/popularizeActivity/add', + edit='/popularizeActivity/popularizeActivity/edit', + deleteOne = '/popularizeActivity/popularizeActivity/delete', + deleteBatch = '/popularizeActivity/popularizeActivity/deleteBatch', + importExcel = '/popularizeActivity/popularizeActivity/importExcel', + exportXls = '/popularizeActivity/popularizeActivity/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/module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue3/PopularizeActivity.data.ts b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue3/PopularizeActivity.data.ts new file mode 100644 index 0000000..2a43863 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue3/PopularizeActivity.data.ts @@ -0,0 +1,319 @@ +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: 'createBy' + }, + { + title: '创建日期', + align:"center", + sorter: true, + dataIndex: 'createTime' + }, + { + title: '中文-活动标题', + align:"center", + dataIndex: 'title' + }, + { + title: '英文-活动标题', + align:"center", + dataIndex: 'enTitle' + }, + { + title: '活动类型', + align:"center", + dataIndex: 'type_dictText' + }, + { + title: '活动封面', + align:"center", + dataIndex: 'image', + customRender:render.renderAvatar, + }, + { + title: '活动时间', + align:"center", + dataIndex: 'startTime' + }, + { + title: '中文-活动地址', + align:"center", + dataIndex: 'address' + }, + { + title: '英文-活动地址', + align:"center", + dataIndex: 'enAddress' + }, + { + title: '活动人数', + align:"center", + dataIndex: 'sum' + }, + { + title: '报名人数', + align:"center", + dataIndex: 'num' + }, + { + title: '报名费用', + align:"center", + dataIndex: 'price' + }, + { + title: '主理人', + align:"center", + dataIndex: 'adminUser_dictText' + }, + { + title: '签到人数', + align:"center", + dataIndex: 'openNum' + }, + { + title: '是否上架', + align:"center", + dataIndex: 'isOpen', + customRender:({text}) => { + return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]) + }, + }, + { + title: '活动状态', + align:"center", + dataIndex: 'state_dictText' + }, + { + title: '早鸟票', + align:"center", + dataIndex: 'birdPrice' + }, + { + title: '单人票', + align:"center", + dataIndex: 'personPrice' + }, + { + title: '尊享票', + align:"center", + dataIndex: 'expensivePrice' + }, + { + title: '经度', + align:"center", + dataIndex: 'longitude' + }, + { + title: '纬度', + align:"center", + dataIndex: 'latitude' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ + { + label: "中文-活动标题", + field: "title", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "英文-活动标题", + field: "enTitle", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "活动类型", + field: "type", + component: 'JDictSelectTag', + componentProps:{ + dictCode:"no_type" + }, + colProps: {span: 6}, + }, + { + label: "活动时间", + field: "startTime", + component: 'DatePicker', + componentProps: { + showTime:true + }, + colProps: {span: 6}, + }, + { + label: "中文-活动地址", + field: "address", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "英文-活动地址", + field: "enAddress", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "主理人", + field: "adminUser", + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + colProps: {span: 6}, + }, + { + label: "是否上架", + field: "isOpen", + component: 'JSwitch', + componentProps:{ + }, + colProps: {span: 6}, + }, + { + label: "活动状态", + field: "state", + component: 'JDictSelectTag', + componentProps:{ + dictCode:"no_state" + }, + colProps: {span: 6}, + }, +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '中文-活动标题', + field: 'title', + component: 'Input', + }, + { + label: '英文-活动标题', + field: 'enTitle', + component: 'Input', + }, + { + label: '活动类型', + field: 'type', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"no_type" + }, + }, + { + label: '活动封面', + field: 'image', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '活动时间', + field: 'startTime', + component: 'Input', + }, + { + label: '中文-活动地址', + field: 'address', + component: 'Input', + }, + { + label: '英文-活动地址', + field: 'enAddress', + component: 'Input', + }, + { + label: '活动人数', + field: 'sum', + component: 'InputNumber', + }, + { + label: '报名人数', + field: 'num', + component: 'InputNumber', + }, + { + label: '报名费用', + field: 'price', + component: 'InputNumber', + }, + { + label: '主理人', + field: 'adminUser', + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + }, + { + label: '签到人数', + field: 'openNum', + component: 'InputNumber', + }, + { + label: '是否上架', + field: 'isOpen', + component: 'JSwitch', + componentProps:{ + }, + }, + { + label: '活动状态', + field: 'state', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"no_state" + }, + }, + { + label: '活动详情', + field: 'details', + component: 'JCodeEditor', //TODO String后缀暂未添加 + }, + { + label: '英文-活动详情', + field: 'enDetails', + component: 'JCodeEditor', //TODO String后缀暂未添加 + }, + { + label: '中文-注意事项', + field: 'precautions', + component: 'InputTextArea',//TODO 注意string转换问题 + }, + { + label: '英文-注意事项', + field: 'enPrecautions', + component: 'InputTextArea',//TODO 注意string转换问题 + }, + { + label: '早鸟票', + field: 'birdPrice', + component: 'InputNumber', + }, + { + label: '单人票', + field: 'personPrice', + component: 'InputNumber', + }, + { + label: '尊享票', + field: 'expensivePrice', + component: 'InputNumber', + }, + { + label: '经度', + field: 'longitude', + component: 'Input', + }, + { + label: '纬度', + field: 'latitude', + component: 'Input', + }, +]; diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue3/PopularizeActivityList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue3/PopularizeActivityList.vue new file mode 100644 index 0000000..1cd4308 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue3/PopularizeActivityList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue3/components/PopularizeActivityModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue3/components/PopularizeActivityModal.vue new file mode 100644 index 0000000..c4e982c --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/vue3/components/PopularizeActivityModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/controller/PopularizeAuthenticationController.java b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/controller/PopularizeAuthenticationController.java new file mode 100644 index 0000000..80e5817 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/controller/PopularizeAuthenticationController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.popularizeAuthentication.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.popularizeAuthentication.entity.PopularizeAuthentication; +import org.jeecg.modules.popularizeAuthentication.service.IPopularizeAuthenticationService; + +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-12-19 + * @Version: V1.0 + */ +@Api(tags="主理人认证") +@RestController +@RequestMapping("/popularizeAuthentication/popularizeAuthentication") +@Slf4j +public class PopularizeAuthenticationController extends JeecgController { + @Autowired + private IPopularizeAuthenticationService popularizeAuthenticationService; + + /** + * 分页列表查询 + * + * @param popularizeAuthentication + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "主理人认证-分页列表查询") + @ApiOperation(value="主理人认证-分页列表查询", notes="主理人认证-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(PopularizeAuthentication popularizeAuthentication, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(popularizeAuthentication, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = popularizeAuthenticationService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param popularizeAuthentication + * @return + */ + @AutoLog(value = "主理人认证-添加") + @ApiOperation(value="主理人认证-添加", notes="主理人认证-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PopularizeAuthentication popularizeAuthentication) { + popularizeAuthenticationService.save(popularizeAuthentication); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param popularizeAuthentication + * @return + */ + @AutoLog(value = "主理人认证-编辑") + @ApiOperation(value="主理人认证-编辑", notes="主理人认证-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody PopularizeAuthentication popularizeAuthentication) { + popularizeAuthenticationService.updateById(popularizeAuthentication); + 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) { + popularizeAuthenticationService.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.popularizeAuthenticationService.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) { + PopularizeAuthentication popularizeAuthentication = popularizeAuthenticationService.getById(id); + if(popularizeAuthentication==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(popularizeAuthentication); + } + + /** + * 导出excel + * + * @param request + * @param popularizeAuthentication + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PopularizeAuthentication popularizeAuthentication) { + return super.exportXls(request, popularizeAuthentication, PopularizeAuthentication.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, PopularizeAuthentication.class); + } + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/entity/PopularizeAuthentication.java b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/entity/PopularizeAuthentication.java new file mode 100644 index 0000000..6067cc8 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/entity/PopularizeAuthentication.java @@ -0,0 +1,79 @@ +package org.jeecg.modules.popularizeAuthentication.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-12-19 + * @Version: V1.0 + */ +@Data +@TableName("popularize_authentication") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="popularize_authentication对象", description="主理人认证") +public class PopularizeAuthentication 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 cardNo; + /**简历附件*/ + @Excel(name = "简历附件", width = 15) + @ApiModelProperty(value = "简历附件") + private java.lang.String image; + /**状态*/ + @Excel(name = "状态", width = 15) + @ApiModelProperty(value = "状态") + private java.lang.Integer state; + /**用户*/ + @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; + /**微信二维码*/ + @Excel(name = "微信二维码", width = 15) + @ApiModelProperty(value = "微信二维码") + private java.lang.String img; +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/mapper/PopularizeAuthenticationMapper.java b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/mapper/PopularizeAuthenticationMapper.java new file mode 100644 index 0000000..d298caf --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/mapper/PopularizeAuthenticationMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.popularizeAuthentication.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.popularizeAuthentication.entity.PopularizeAuthentication; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 主理人认证 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface PopularizeAuthenticationMapper extends BaseMapper { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/mapper/xml/PopularizeAuthenticationMapper.xml b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/mapper/xml/PopularizeAuthenticationMapper.xml new file mode 100644 index 0000000..3adf279 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/mapper/xml/PopularizeAuthenticationMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/service/IPopularizeAuthenticationService.java b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/service/IPopularizeAuthenticationService.java new file mode 100644 index 0000000..a794d51 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/service/IPopularizeAuthenticationService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.popularizeAuthentication.service; + +import org.jeecg.modules.popularizeAuthentication.entity.PopularizeAuthentication; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 主理人认证 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface IPopularizeAuthenticationService extends IService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/service/impl/PopularizeAuthenticationServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/service/impl/PopularizeAuthenticationServiceImpl.java new file mode 100644 index 0000000..70fdf93 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/service/impl/PopularizeAuthenticationServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.popularizeAuthentication.service.impl; + +import org.jeecg.modules.popularizeAuthentication.entity.PopularizeAuthentication; +import org.jeecg.modules.popularizeAuthentication.mapper.PopularizeAuthenticationMapper; +import org.jeecg.modules.popularizeAuthentication.service.IPopularizeAuthenticationService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 主理人认证 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +@Service +public class PopularizeAuthenticationServiceImpl extends ServiceImpl implements IPopularizeAuthenticationService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue/PopularizeAuthenticationList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue/PopularizeAuthenticationList.vue new file mode 100644 index 0000000..97e17c7 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue/PopularizeAuthenticationList.vue @@ -0,0 +1,216 @@ + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue/modules/PopularizeAuthenticationForm.vue b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue/modules/PopularizeAuthenticationForm.vue new file mode 100644 index 0000000..f1a44b4 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue/modules/PopularizeAuthenticationForm.vue @@ -0,0 +1,134 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue/modules/PopularizeAuthenticationModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue/modules/PopularizeAuthenticationModal.Style#Drawer.vue new file mode 100644 index 0000000..1f53d07 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue/modules/PopularizeAuthenticationModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue/modules/PopularizeAuthenticationModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue/modules/PopularizeAuthenticationModal.vue new file mode 100644 index 0000000..aea8d50 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue/modules/PopularizeAuthenticationModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue3/PopularizeAuthentication.api.ts b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue3/PopularizeAuthentication.api.ts new file mode 100644 index 0000000..501f78a --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue3/PopularizeAuthentication.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/popularizeAuthentication/popularizeAuthentication/list', + save='/popularizeAuthentication/popularizeAuthentication/add', + edit='/popularizeAuthentication/popularizeAuthentication/edit', + deleteOne = '/popularizeAuthentication/popularizeAuthentication/delete', + deleteBatch = '/popularizeAuthentication/popularizeAuthentication/deleteBatch', + importExcel = '/popularizeAuthentication/popularizeAuthentication/importExcel', + exportXls = '/popularizeAuthentication/popularizeAuthentication/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/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue3/PopularizeAuthentication.data.ts b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue3/PopularizeAuthentication.data.ts new file mode 100644 index 0000000..e4ff32c --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue3/PopularizeAuthentication.data.ts @@ -0,0 +1,95 @@ +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", + sorter: true, + dataIndex: 'createTime' + }, + { + title: '姓名', + align:"center", + dataIndex: 'name' + }, + { + title: '电话', + align:"center", + dataIndex: 'phone' + }, + { + title: '身份证', + align:"center", + dataIndex: 'cardNo' + }, + { + title: '简历附件', + align:"center", + dataIndex: 'image', + slots: { customRender: 'fileSlot' }, + }, + { + title: '状态', + align:"center", + dataIndex: 'state' + }, + { + title: '用户', + align:"center", + dataIndex: 'userId_dictText' + }, + { + title: '微信二维码', + align:"center", + dataIndex: 'img' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '姓名', + field: 'name', + component: 'Input', + }, + { + label: '电话', + field: 'phone', + component: 'Input', + }, + { + label: '身份证', + field: 'cardNo', + component: 'Input', + }, + { + label: '简历附件', + field: 'image', + component: 'JUpload', + componentProps:{ + }, + }, + { + label: '状态', + field: 'state', + component: 'InputNumber', + }, + { + label: '用户', + field: 'userId', + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + }, + { + label: '微信二维码', + field: 'img', + component: 'Input', + }, +]; diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue3/PopularizeAuthenticationList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue3/PopularizeAuthenticationList.vue new file mode 100644 index 0000000..2eed46b --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue3/PopularizeAuthenticationList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue3/components/PopularizeAuthenticationModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue3/components/PopularizeAuthenticationModal.vue new file mode 100644 index 0000000..14238e3 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue3/components/PopularizeAuthenticationModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCity/controller/PopularizeCityController.java b/module-common/src/main/java/org/jeecg/modules/popularizeCity/controller/PopularizeCityController.java new file mode 100644 index 0000000..992b45e --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCity/controller/PopularizeCityController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.popularizeCity.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.popularizeCity.entity.PopularizeCity; +import org.jeecg.modules.popularizeCity.service.IPopularizeCityService; + +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-12-19 + * @Version: V1.0 + */ +@Api(tags="城市管理") +@RestController +@RequestMapping("/popularizeCity/popularizeCity") +@Slf4j +public class PopularizeCityController extends JeecgController { + @Autowired + private IPopularizeCityService popularizeCityService; + + /** + * 分页列表查询 + * + * @param popularizeCity + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "城市管理-分页列表查询") + @ApiOperation(value="城市管理-分页列表查询", notes="城市管理-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(PopularizeCity popularizeCity, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(popularizeCity, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = popularizeCityService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param popularizeCity + * @return + */ + @AutoLog(value = "城市管理-添加") + @ApiOperation(value="城市管理-添加", notes="城市管理-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PopularizeCity popularizeCity) { + popularizeCityService.save(popularizeCity); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param popularizeCity + * @return + */ + @AutoLog(value = "城市管理-编辑") + @ApiOperation(value="城市管理-编辑", notes="城市管理-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody PopularizeCity popularizeCity) { + popularizeCityService.updateById(popularizeCity); + 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) { + popularizeCityService.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.popularizeCityService.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) { + PopularizeCity popularizeCity = popularizeCityService.getById(id); + if(popularizeCity==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(popularizeCity); + } + + /** + * 导出excel + * + * @param request + * @param popularizeCity + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PopularizeCity popularizeCity) { + return super.exportXls(request, popularizeCity, PopularizeCity.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, PopularizeCity.class); + } + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCity/entity/PopularizeCity.java b/module-common/src/main/java/org/jeecg/modules/popularizeCity/entity/PopularizeCity.java new file mode 100644 index 0000000..975f8b9 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCity/entity/PopularizeCity.java @@ -0,0 +1,62 @@ +package org.jeecg.modules.popularizeCity.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-12-19 + * @Version: V1.0 + */ +@Data +@TableName("popularize_city") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="popularize_city对象", description="城市管理") +public class PopularizeCity 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 city; + /**英文-城市*/ + @Excel(name = "英文-城市", width = 15) + @ApiModelProperty(value = "英文-城市") + private java.lang.String enCity; + /**排序*/ + @Excel(name = "排序", width = 15) + @ApiModelProperty(value = "排序") + private java.lang.Integer sort; +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCity/mapper/PopularizeCityMapper.java b/module-common/src/main/java/org/jeecg/modules/popularizeCity/mapper/PopularizeCityMapper.java new file mode 100644 index 0000000..2a0dd5a --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCity/mapper/PopularizeCityMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.popularizeCity.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.popularizeCity.entity.PopularizeCity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 城市管理 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface PopularizeCityMapper extends BaseMapper { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCity/mapper/xml/PopularizeCityMapper.xml b/module-common/src/main/java/org/jeecg/modules/popularizeCity/mapper/xml/PopularizeCityMapper.xml new file mode 100644 index 0000000..e788aca --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCity/mapper/xml/PopularizeCityMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCity/service/IPopularizeCityService.java b/module-common/src/main/java/org/jeecg/modules/popularizeCity/service/IPopularizeCityService.java new file mode 100644 index 0000000..667ea48 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCity/service/IPopularizeCityService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.popularizeCity.service; + +import org.jeecg.modules.popularizeCity.entity.PopularizeCity; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 城市管理 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface IPopularizeCityService extends IService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCity/service/impl/PopularizeCityServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/popularizeCity/service/impl/PopularizeCityServiceImpl.java new file mode 100644 index 0000000..fcdab42 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCity/service/impl/PopularizeCityServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.popularizeCity.service.impl; + +import org.jeecg.modules.popularizeCity.entity.PopularizeCity; +import org.jeecg.modules.popularizeCity.mapper.PopularizeCityMapper; +import org.jeecg.modules.popularizeCity.service.IPopularizeCityService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 城市管理 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +@Service +public class PopularizeCityServiceImpl extends ServiceImpl implements IPopularizeCityService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCity/vue/PopularizeCityList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeCity/vue/PopularizeCityList.vue new file mode 100644 index 0000000..09ccead --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCity/vue/PopularizeCityList.vue @@ -0,0 +1,203 @@ + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCity/vue/modules/PopularizeCityForm.vue b/module-common/src/main/java/org/jeecg/modules/popularizeCity/vue/modules/PopularizeCityForm.vue new file mode 100644 index 0000000..22655d1 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCity/vue/modules/PopularizeCityForm.vue @@ -0,0 +1,114 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCity/vue/modules/PopularizeCityModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/popularizeCity/vue/modules/PopularizeCityModal.Style#Drawer.vue new file mode 100644 index 0000000..c02f142 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCity/vue/modules/PopularizeCityModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCity/vue/modules/PopularizeCityModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeCity/vue/modules/PopularizeCityModal.vue new file mode 100644 index 0000000..9a7e183 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCity/vue/modules/PopularizeCityModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCity/vue3/PopularizeCity.api.ts b/module-common/src/main/java/org/jeecg/modules/popularizeCity/vue3/PopularizeCity.api.ts new file mode 100644 index 0000000..006be33 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCity/vue3/PopularizeCity.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/popularizeCity/popularizeCity/list', + save='/popularizeCity/popularizeCity/add', + edit='/popularizeCity/popularizeCity/edit', + deleteOne = '/popularizeCity/popularizeCity/delete', + deleteBatch = '/popularizeCity/popularizeCity/deleteBatch', + importExcel = '/popularizeCity/popularizeCity/importExcel', + exportXls = '/popularizeCity/popularizeCity/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/module-common/src/main/java/org/jeecg/modules/popularizeCity/vue3/PopularizeCity.data.ts b/module-common/src/main/java/org/jeecg/modules/popularizeCity/vue3/PopularizeCity.data.ts new file mode 100644 index 0000000..ff445e8 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCity/vue3/PopularizeCity.data.ts @@ -0,0 +1,55 @@ +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: 'city' + }, + { + title: '英文-城市', + align:"center", + dataIndex: 'enCity' + }, + { + title: '排序', + align:"center", + dataIndex: 'sort' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ + { + label: "中文-城市", + field: "city", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "英文-城市", + field: "enCity", + component: 'Input', + colProps: {span: 6}, + }, +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '中文-城市', + field: 'city', + component: 'Input', + }, + { + label: '英文-城市', + field: 'enCity', + component: 'Input', + }, + { + label: '排序', + field: 'sort', + component: 'InputNumber', + }, +]; diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCity/vue3/PopularizeCityList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeCity/vue3/PopularizeCityList.vue new file mode 100644 index 0000000..43ff2f0 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCity/vue3/PopularizeCityList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCity/vue3/components/PopularizeCityModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeCity/vue3/components/PopularizeCityModal.vue new file mode 100644 index 0000000..0c97c76 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCity/vue3/components/PopularizeCityModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCollect/controller/PopularizeCollectController.java b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/controller/PopularizeCollectController.java new file mode 100644 index 0000000..c26a067 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/controller/PopularizeCollectController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.popularizeCollect.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.popularizeCollect.entity.PopularizeCollect; +import org.jeecg.modules.popularizeCollect.service.IPopularizeCollectService; + +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-12-19 + * @Version: V1.0 + */ +@Api(tags="用户收藏") +@RestController +@RequestMapping("/popularizeCollect/popularizeCollect") +@Slf4j +public class PopularizeCollectController extends JeecgController { + @Autowired + private IPopularizeCollectService popularizeCollectService; + + /** + * 分页列表查询 + * + * @param popularizeCollect + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "用户收藏-分页列表查询") + @ApiOperation(value="用户收藏-分页列表查询", notes="用户收藏-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(PopularizeCollect popularizeCollect, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(popularizeCollect, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = popularizeCollectService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param popularizeCollect + * @return + */ + @AutoLog(value = "用户收藏-添加") + @ApiOperation(value="用户收藏-添加", notes="用户收藏-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PopularizeCollect popularizeCollect) { + popularizeCollectService.save(popularizeCollect); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param popularizeCollect + * @return + */ + @AutoLog(value = "用户收藏-编辑") + @ApiOperation(value="用户收藏-编辑", notes="用户收藏-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody PopularizeCollect popularizeCollect) { + popularizeCollectService.updateById(popularizeCollect); + 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) { + popularizeCollectService.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.popularizeCollectService.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) { + PopularizeCollect popularizeCollect = popularizeCollectService.getById(id); + if(popularizeCollect==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(popularizeCollect); + } + + /** + * 导出excel + * + * @param request + * @param popularizeCollect + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PopularizeCollect popularizeCollect) { + return super.exportXls(request, popularizeCollect, PopularizeCollect.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, PopularizeCollect.class); + } + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCollect/entity/PopularizeCollect.java b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/entity/PopularizeCollect.java new file mode 100644 index 0000000..9858b92 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/entity/PopularizeCollect.java @@ -0,0 +1,66 @@ +package org.jeecg.modules.popularizeCollect.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-12-19 + * @Version: V1.0 + */ +@Data +@TableName("popularize_collect") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="popularize_collect对象", description="用户收藏") +public class PopularizeCollect 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 type; + /**用户*/ + @Excel(name = "用户", width = 15) + @ApiModelProperty(value = "用户") + private java.lang.String userId; + /**旅行标题*/ + @Excel(name = "旅行标题", width = 15) + @ApiModelProperty(value = "旅行标题") + private java.lang.String travelId; + /**活动标题*/ + @Excel(name = "活动标题", width = 15) + @ApiModelProperty(value = "活动标题") + private java.lang.String activityId; +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCollect/mapper/PopularizeCollectMapper.java b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/mapper/PopularizeCollectMapper.java new file mode 100644 index 0000000..73c6a6a --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/mapper/PopularizeCollectMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.popularizeCollect.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.popularizeCollect.entity.PopularizeCollect; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 用户收藏 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface PopularizeCollectMapper extends BaseMapper { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCollect/mapper/xml/PopularizeCollectMapper.xml b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/mapper/xml/PopularizeCollectMapper.xml new file mode 100644 index 0000000..3d0b97f --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/mapper/xml/PopularizeCollectMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCollect/service/IPopularizeCollectService.java b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/service/IPopularizeCollectService.java new file mode 100644 index 0000000..ba6080b --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/service/IPopularizeCollectService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.popularizeCollect.service; + +import org.jeecg.modules.popularizeCollect.entity.PopularizeCollect; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 用户收藏 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface IPopularizeCollectService extends IService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCollect/service/impl/PopularizeCollectServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/service/impl/PopularizeCollectServiceImpl.java new file mode 100644 index 0000000..1646cba --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/service/impl/PopularizeCollectServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.popularizeCollect.service.impl; + +import org.jeecg.modules.popularizeCollect.entity.PopularizeCollect; +import org.jeecg.modules.popularizeCollect.mapper.PopularizeCollectMapper; +import org.jeecg.modules.popularizeCollect.service.IPopularizeCollectService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 用户收藏 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +@Service +public class PopularizeCollectServiceImpl extends ServiceImpl implements IPopularizeCollectService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue/PopularizeCollectList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue/PopularizeCollectList.vue new file mode 100644 index 0000000..092ca0a --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue/PopularizeCollectList.vue @@ -0,0 +1,189 @@ + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue/modules/PopularizeCollectForm.vue b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue/modules/PopularizeCollectForm.vue new file mode 100644 index 0000000..4dbc191 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue/modules/PopularizeCollectForm.vue @@ -0,0 +1,119 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue/modules/PopularizeCollectModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue/modules/PopularizeCollectModal.Style#Drawer.vue new file mode 100644 index 0000000..4b89c03 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue/modules/PopularizeCollectModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue/modules/PopularizeCollectModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue/modules/PopularizeCollectModal.vue new file mode 100644 index 0000000..9272121 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue/modules/PopularizeCollectModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue3/PopularizeCollect.api.ts b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue3/PopularizeCollect.api.ts new file mode 100644 index 0000000..b857dc5 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue3/PopularizeCollect.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/popularizeCollect/popularizeCollect/list', + save='/popularizeCollect/popularizeCollect/add', + edit='/popularizeCollect/popularizeCollect/edit', + deleteOne = '/popularizeCollect/popularizeCollect/delete', + deleteBatch = '/popularizeCollect/popularizeCollect/deleteBatch', + importExcel = '/popularizeCollect/popularizeCollect/importExcel', + exportXls = '/popularizeCollect/popularizeCollect/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/module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue3/PopularizeCollect.data.ts b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue3/PopularizeCollect.data.ts new file mode 100644 index 0000000..bc3efec --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue3/PopularizeCollect.data.ts @@ -0,0 +1,53 @@ +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: 'type' + }, + { + title: '用户', + align:"center", + dataIndex: 'userId' + }, + { + title: '旅行标题', + align:"center", + dataIndex: 'travelId' + }, + { + title: '活动标题', + align:"center", + dataIndex: 'activityId' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '类型', + field: 'type', + component: 'Input', + }, + { + label: '用户', + field: 'userId', + component: 'Input', + }, + { + label: '旅行标题', + field: 'travelId', + component: 'Input', + }, + { + label: '活动标题', + field: 'activityId', + component: 'Input', + }, +]; diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue3/PopularizeCollectList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue3/PopularizeCollectList.vue new file mode 100644 index 0000000..0e069ec --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue3/PopularizeCollectList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue3/components/PopularizeCollectModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue3/components/PopularizeCollectModal.vue new file mode 100644 index 0000000..4bf26ba --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCollect/vue3/components/PopularizeCollectModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCountry/controller/PopularizeCountryController.java b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/controller/PopularizeCountryController.java new file mode 100644 index 0000000..e4ca632 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/controller/PopularizeCountryController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.popularizeCountry.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.popularizeCountry.entity.PopularizeCountry; +import org.jeecg.modules.popularizeCountry.service.IPopularizeCountryService; + +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-12-19 + * @Version: V1.0 + */ +@Api(tags="国籍管理") +@RestController +@RequestMapping("/popularizeCountry/popularizeCountry") +@Slf4j +public class PopularizeCountryController extends JeecgController { + @Autowired + private IPopularizeCountryService popularizeCountryService; + + /** + * 分页列表查询 + * + * @param popularizeCountry + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "国籍管理-分页列表查询") + @ApiOperation(value="国籍管理-分页列表查询", notes="国籍管理-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(PopularizeCountry popularizeCountry, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(popularizeCountry, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = popularizeCountryService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param popularizeCountry + * @return + */ + @AutoLog(value = "国籍管理-添加") + @ApiOperation(value="国籍管理-添加", notes="国籍管理-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PopularizeCountry popularizeCountry) { + popularizeCountryService.save(popularizeCountry); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param popularizeCountry + * @return + */ + @AutoLog(value = "国籍管理-编辑") + @ApiOperation(value="国籍管理-编辑", notes="国籍管理-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody PopularizeCountry popularizeCountry) { + popularizeCountryService.updateById(popularizeCountry); + 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) { + popularizeCountryService.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.popularizeCountryService.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) { + PopularizeCountry popularizeCountry = popularizeCountryService.getById(id); + if(popularizeCountry==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(popularizeCountry); + } + + /** + * 导出excel + * + * @param request + * @param popularizeCountry + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PopularizeCountry popularizeCountry) { + return super.exportXls(request, popularizeCountry, PopularizeCountry.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, PopularizeCountry.class); + } + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCountry/entity/PopularizeCountry.java b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/entity/PopularizeCountry.java new file mode 100644 index 0000000..bc007a6 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/entity/PopularizeCountry.java @@ -0,0 +1,62 @@ +package org.jeecg.modules.popularizeCountry.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-12-19 + * @Version: V1.0 + */ +@Data +@TableName("popularize_country") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="popularize_country对象", description="国籍管理") +public class PopularizeCountry 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 country; + /**英文-国家*/ + @Excel(name = "英文-国家", width = 15) + @ApiModelProperty(value = "英文-国家") + private java.lang.String enCountry; + /**排序*/ + @Excel(name = "排序", width = 15) + @ApiModelProperty(value = "排序") + private java.lang.Integer sort; +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCountry/mapper/PopularizeCountryMapper.java b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/mapper/PopularizeCountryMapper.java new file mode 100644 index 0000000..ed04b33 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/mapper/PopularizeCountryMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.popularizeCountry.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.popularizeCountry.entity.PopularizeCountry; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 国籍管理 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface PopularizeCountryMapper extends BaseMapper { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCountry/mapper/xml/PopularizeCountryMapper.xml b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/mapper/xml/PopularizeCountryMapper.xml new file mode 100644 index 0000000..a1b45de --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/mapper/xml/PopularizeCountryMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCountry/service/IPopularizeCountryService.java b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/service/IPopularizeCountryService.java new file mode 100644 index 0000000..6e909b1 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/service/IPopularizeCountryService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.popularizeCountry.service; + +import org.jeecg.modules.popularizeCountry.entity.PopularizeCountry; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 国籍管理 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface IPopularizeCountryService extends IService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCountry/service/impl/PopularizeCountryServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/service/impl/PopularizeCountryServiceImpl.java new file mode 100644 index 0000000..4275ef9 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/service/impl/PopularizeCountryServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.popularizeCountry.service.impl; + +import org.jeecg.modules.popularizeCountry.entity.PopularizeCountry; +import org.jeecg.modules.popularizeCountry.mapper.PopularizeCountryMapper; +import org.jeecg.modules.popularizeCountry.service.IPopularizeCountryService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 国籍管理 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +@Service +public class PopularizeCountryServiceImpl extends ServiceImpl implements IPopularizeCountryService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue/PopularizeCountryList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue/PopularizeCountryList.vue new file mode 100644 index 0000000..6572e93 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue/PopularizeCountryList.vue @@ -0,0 +1,203 @@ + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue/modules/PopularizeCountryForm.vue b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue/modules/PopularizeCountryForm.vue new file mode 100644 index 0000000..1123273 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue/modules/PopularizeCountryForm.vue @@ -0,0 +1,114 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue/modules/PopularizeCountryModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue/modules/PopularizeCountryModal.Style#Drawer.vue new file mode 100644 index 0000000..764eba7 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue/modules/PopularizeCountryModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue/modules/PopularizeCountryModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue/modules/PopularizeCountryModal.vue new file mode 100644 index 0000000..67f448f --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue/modules/PopularizeCountryModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue3/PopularizeCountry.api.ts b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue3/PopularizeCountry.api.ts new file mode 100644 index 0000000..848ff3d --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue3/PopularizeCountry.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/popularizeCountry/popularizeCountry/list', + save='/popularizeCountry/popularizeCountry/add', + edit='/popularizeCountry/popularizeCountry/edit', + deleteOne = '/popularizeCountry/popularizeCountry/delete', + deleteBatch = '/popularizeCountry/popularizeCountry/deleteBatch', + importExcel = '/popularizeCountry/popularizeCountry/importExcel', + exportXls = '/popularizeCountry/popularizeCountry/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/module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue3/PopularizeCountry.data.ts b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue3/PopularizeCountry.data.ts new file mode 100644 index 0000000..93aade3 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue3/PopularizeCountry.data.ts @@ -0,0 +1,55 @@ +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: 'country' + }, + { + title: '英文-国家', + align:"center", + dataIndex: 'enCountry' + }, + { + title: '排序', + align:"center", + dataIndex: 'sort' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ + { + label: "中文-国家", + field: "country", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "英文-国家", + field: "enCountry", + component: 'Input', + colProps: {span: 6}, + }, +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '中文-国家', + field: 'country', + component: 'Input', + }, + { + label: '英文-国家', + field: 'enCountry', + component: 'Input', + }, + { + label: '排序', + field: 'sort', + component: 'InputNumber', + }, +]; diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue3/PopularizeCountryList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue3/PopularizeCountryList.vue new file mode 100644 index 0000000..532316c --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue3/PopularizeCountryList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue3/components/PopularizeCountryModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue3/components/PopularizeCountryModal.vue new file mode 100644 index 0000000..1e16153 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeCountry/vue3/components/PopularizeCountryModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/controller/PopularizeEvaluateController.java b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/controller/PopularizeEvaluateController.java new file mode 100644 index 0000000..9bcb852 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/controller/PopularizeEvaluateController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.popularizeEvaluate.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.popularizeEvaluate.entity.PopularizeEvaluate; +import org.jeecg.modules.popularizeEvaluate.service.IPopularizeEvaluateService; + +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-12-19 + * @Version: V1.0 + */ +@Api(tags="评价列表") +@RestController +@RequestMapping("/popularizeEvaluate/popularizeEvaluate") +@Slf4j +public class PopularizeEvaluateController extends JeecgController { + @Autowired + private IPopularizeEvaluateService popularizeEvaluateService; + + /** + * 分页列表查询 + * + * @param popularizeEvaluate + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "评价列表-分页列表查询") + @ApiOperation(value="评价列表-分页列表查询", notes="评价列表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(PopularizeEvaluate popularizeEvaluate, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(popularizeEvaluate, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = popularizeEvaluateService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param popularizeEvaluate + * @return + */ + @AutoLog(value = "评价列表-添加") + @ApiOperation(value="评价列表-添加", notes="评价列表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PopularizeEvaluate popularizeEvaluate) { + popularizeEvaluateService.save(popularizeEvaluate); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param popularizeEvaluate + * @return + */ + @AutoLog(value = "评价列表-编辑") + @ApiOperation(value="评价列表-编辑", notes="评价列表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody PopularizeEvaluate popularizeEvaluate) { + popularizeEvaluateService.updateById(popularizeEvaluate); + 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) { + popularizeEvaluateService.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.popularizeEvaluateService.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) { + PopularizeEvaluate popularizeEvaluate = popularizeEvaluateService.getById(id); + if(popularizeEvaluate==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(popularizeEvaluate); + } + + /** + * 导出excel + * + * @param request + * @param popularizeEvaluate + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PopularizeEvaluate popularizeEvaluate) { + return super.exportXls(request, popularizeEvaluate, PopularizeEvaluate.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, PopularizeEvaluate.class); + } + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/entity/PopularizeEvaluate.java b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/entity/PopularizeEvaluate.java new file mode 100644 index 0000000..66c2d72 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/entity/PopularizeEvaluate.java @@ -0,0 +1,78 @@ +package org.jeecg.modules.popularizeEvaluate.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-12-19 + * @Version: V1.0 + */ +@Data +@TableName("popularize_evaluate") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="popularize_evaluate对象", description="评价列表") +public class PopularizeEvaluate 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, dicCode = "order_type") + @Dict(dicCode = "order_type") + @ApiModelProperty(value = "类型") + private java.lang.String type; + /**用户*/ + @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; + /**分数*/ + @Excel(name = "分数", width = 15) + @ApiModelProperty(value = "分数") + private java.lang.String num; + /**文本详情*/ + @Excel(name = "文本详情", width = 15) + @ApiModelProperty(value = "文本详情") + private java.lang.String details; + /**旅行标识*/ + @Excel(name = "旅行标识", width = 15, dictTable = "popularize_travel", dicText = "title", dicCode = "id") + @Dict(dictTable = "popularize_travel", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "旅行标识") + private java.lang.String travelId; + /**活动标识*/ + @Excel(name = "活动标识", width = 15, dictTable = "popularize_activity", dicText = "title", dicCode = "id") + @Dict(dictTable = "popularize_activity", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "活动标识") + private java.lang.String activityId; +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/mapper/PopularizeEvaluateMapper.java b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/mapper/PopularizeEvaluateMapper.java new file mode 100644 index 0000000..8f25b8d --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/mapper/PopularizeEvaluateMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.popularizeEvaluate.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.popularizeEvaluate.entity.PopularizeEvaluate; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 评价列表 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface PopularizeEvaluateMapper extends BaseMapper { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/mapper/xml/PopularizeEvaluateMapper.xml b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/mapper/xml/PopularizeEvaluateMapper.xml new file mode 100644 index 0000000..655ee78 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/mapper/xml/PopularizeEvaluateMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/service/IPopularizeEvaluateService.java b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/service/IPopularizeEvaluateService.java new file mode 100644 index 0000000..bb5afc9 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/service/IPopularizeEvaluateService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.popularizeEvaluate.service; + +import org.jeecg.modules.popularizeEvaluate.entity.PopularizeEvaluate; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 评价列表 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface IPopularizeEvaluateService extends IService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/service/impl/PopularizeEvaluateServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/service/impl/PopularizeEvaluateServiceImpl.java new file mode 100644 index 0000000..f350c50 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/service/impl/PopularizeEvaluateServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.popularizeEvaluate.service.impl; + +import org.jeecg.modules.popularizeEvaluate.entity.PopularizeEvaluate; +import org.jeecg.modules.popularizeEvaluate.mapper.PopularizeEvaluateMapper; +import org.jeecg.modules.popularizeEvaluate.service.IPopularizeEvaluateService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 评价列表 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +@Service +public class PopularizeEvaluateServiceImpl extends ServiceImpl implements IPopularizeEvaluateService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue/PopularizeEvaluateList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue/PopularizeEvaluateList.vue new file mode 100644 index 0000000..16586a1 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue/PopularizeEvaluateList.vue @@ -0,0 +1,241 @@ + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue/modules/PopularizeEvaluateForm.vue b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue/modules/PopularizeEvaluateForm.vue new file mode 100644 index 0000000..5844500 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue/modules/PopularizeEvaluateForm.vue @@ -0,0 +1,129 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue/modules/PopularizeEvaluateModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue/modules/PopularizeEvaluateModal.Style#Drawer.vue new file mode 100644 index 0000000..3bf30c9 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue/modules/PopularizeEvaluateModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue/modules/PopularizeEvaluateModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue/modules/PopularizeEvaluateModal.vue new file mode 100644 index 0000000..98b5227 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue/modules/PopularizeEvaluateModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue3/PopularizeEvaluate.api.ts b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue3/PopularizeEvaluate.api.ts new file mode 100644 index 0000000..f712cd7 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue3/PopularizeEvaluate.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/popularizeEvaluate/popularizeEvaluate/list', + save='/popularizeEvaluate/popularizeEvaluate/add', + edit='/popularizeEvaluate/popularizeEvaluate/edit', + deleteOne = '/popularizeEvaluate/popularizeEvaluate/delete', + deleteBatch = '/popularizeEvaluate/popularizeEvaluate/deleteBatch', + importExcel = '/popularizeEvaluate/popularizeEvaluate/importExcel', + exportXls = '/popularizeEvaluate/popularizeEvaluate/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/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue3/PopularizeEvaluate.data.ts b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue3/PopularizeEvaluate.data.ts new file mode 100644 index 0000000..01d5406 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue3/PopularizeEvaluate.data.ts @@ -0,0 +1,127 @@ +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", + sorter: true, + dataIndex: 'createTime' + }, + { + title: '类型', + align:"center", + dataIndex: 'type_dictText' + }, + { + title: '用户', + align:"center", + dataIndex: 'userId_dictText' + }, + { + title: '分数', + align:"center", + dataIndex: 'num' + }, + { + title: '文本详情', + align:"center", + dataIndex: 'details' + }, + { + title: '旅行标识', + align:"center", + dataIndex: 'travelId_dictText' + }, + { + title: '活动标识', + align:"center", + dataIndex: 'activityId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ + { + label: "类型", + field: "type", + component: 'JDictSelectTag', + componentProps:{ + dictCode:"order_type" + }, + colProps: {span: 6}, + }, + { + label: "用户", + field: "userId", + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + colProps: {span: 6}, + }, + { + label: "旅行标识", + field: "travelId", + component: 'JSearchSelect', + componentProps:{ + dict:"popularize_travel,title,id" + }, + colProps: {span: 6}, + }, + { + label: "活动标识", + field: "activityId", + component: 'JSearchSelect', + componentProps:{ + dict:"popularize_activity,title,id" + }, + colProps: {span: 6}, + }, +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '类型', + field: 'type', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"order_type" + }, + }, + { + label: '用户', + field: 'userId', + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + }, + { + label: '分数', + field: 'num', + component: 'Input', + }, + { + label: '文本详情', + field: 'details', + component: 'InputTextArea',//TODO 注意string转换问题 + }, + { + label: '旅行标识', + field: 'travelId', + component: 'JSearchSelect', + componentProps:{ + dict:"popularize_travel,title,id" + }, + }, + { + label: '活动标识', + field: 'activityId', + component: 'JSearchSelect', + componentProps:{ + dict:"popularize_activity,title,id" + }, + }, +]; diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue3/PopularizeEvaluateList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue3/PopularizeEvaluateList.vue new file mode 100644 index 0000000..b8ebd81 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue3/PopularizeEvaluateList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue3/components/PopularizeEvaluateModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue3/components/PopularizeEvaluateModal.vue new file mode 100644 index 0000000..789a352 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/vue3/components/PopularizeEvaluateModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/controller/PopularizeInvoicingController.java b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/controller/PopularizeInvoicingController.java new file mode 100644 index 0000000..ef75c8b --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/controller/PopularizeInvoicingController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.popularizeInvoicing.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.popularizeInvoicing.entity.PopularizeInvoicing; +import org.jeecg.modules.popularizeInvoicing.service.IPopularizeInvoicingService; + +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-12-19 + * @Version: V1.0 + */ +@Api(tags="开票管理") +@RestController +@RequestMapping("/popularizeInvoicing/popularizeInvoicing") +@Slf4j +public class PopularizeInvoicingController extends JeecgController { + @Autowired + private IPopularizeInvoicingService popularizeInvoicingService; + + /** + * 分页列表查询 + * + * @param popularizeInvoicing + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "开票管理-分页列表查询") + @ApiOperation(value="开票管理-分页列表查询", notes="开票管理-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(PopularizeInvoicing popularizeInvoicing, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(popularizeInvoicing, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = popularizeInvoicingService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param popularizeInvoicing + * @return + */ + @AutoLog(value = "开票管理-添加") + @ApiOperation(value="开票管理-添加", notes="开票管理-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PopularizeInvoicing popularizeInvoicing) { + popularizeInvoicingService.save(popularizeInvoicing); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param popularizeInvoicing + * @return + */ + @AutoLog(value = "开票管理-编辑") + @ApiOperation(value="开票管理-编辑", notes="开票管理-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody PopularizeInvoicing popularizeInvoicing) { + popularizeInvoicingService.updateById(popularizeInvoicing); + 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) { + popularizeInvoicingService.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.popularizeInvoicingService.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) { + PopularizeInvoicing popularizeInvoicing = popularizeInvoicingService.getById(id); + if(popularizeInvoicing==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(popularizeInvoicing); + } + + /** + * 导出excel + * + * @param request + * @param popularizeInvoicing + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PopularizeInvoicing popularizeInvoicing) { + return super.exportXls(request, popularizeInvoicing, PopularizeInvoicing.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, PopularizeInvoicing.class); + } + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/entity/PopularizeInvoicing.java b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/entity/PopularizeInvoicing.java new file mode 100644 index 0000000..37b1cee --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/entity/PopularizeInvoicing.java @@ -0,0 +1,87 @@ +package org.jeecg.modules.popularizeInvoicing.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-12-19 + * @Version: V1.0 + */ +@Data +@TableName("popularize_invoicing") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="popularize_invoicing对象", description="开票管理") +public class PopularizeInvoicing 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, dicCode = "order_type") + @Dict(dicCode = "order_type") + @ApiModelProperty(value = "类型") + private java.lang.String type; + /**关联旅行*/ + @Excel(name = "关联旅行", width = 15, dictTable = "popularize_travel", dicText = "title", dicCode = "id") + @Dict(dictTable = "popularize_travel", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "关联旅行") + private java.lang.String travelId; + /**关联活动*/ + @Excel(name = "关联活动", width = 15, dictTable = "popularize_activity", dicText = "title", dicCode = "id") + @Dict(dictTable = "popularize_activity", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "关联活动") + private java.lang.String activityId; + /**开票类型*/ + @Excel(name = "开票类型", width = 15, dicCode = "role_type") + @Dict(dicCode = "role_type") + @ApiModelProperty(value = "开票类型") + private java.lang.String noType; + /**企业名称*/ + @Excel(name = "企业名称", width = 15) + @ApiModelProperty(value = "企业名称") + private java.lang.String name; + /**税号*/ + @Excel(name = "税号", width = 15) + @ApiModelProperty(value = "税号") + private java.lang.String no; + /**邮箱*/ + @Excel(name = "邮箱", width = 15) + @ApiModelProperty(value = "邮箱") + private java.lang.String emil; + /**状态*/ + @Excel(name = "状态", width = 15, dicCode = "no_state_type") + @Dict(dicCode = "no_state_type") + @ApiModelProperty(value = "状态") + private java.lang.String state; +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/mapper/PopularizeInvoicingMapper.java b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/mapper/PopularizeInvoicingMapper.java new file mode 100644 index 0000000..9cd6e33 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/mapper/PopularizeInvoicingMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.popularizeInvoicing.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.popularizeInvoicing.entity.PopularizeInvoicing; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 开票管理 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface PopularizeInvoicingMapper extends BaseMapper { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/mapper/xml/PopularizeInvoicingMapper.xml b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/mapper/xml/PopularizeInvoicingMapper.xml new file mode 100644 index 0000000..f92e651 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/mapper/xml/PopularizeInvoicingMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/service/IPopularizeInvoicingService.java b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/service/IPopularizeInvoicingService.java new file mode 100644 index 0000000..b287b16 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/service/IPopularizeInvoicingService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.popularizeInvoicing.service; + +import org.jeecg.modules.popularizeInvoicing.entity.PopularizeInvoicing; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 开票管理 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface IPopularizeInvoicingService extends IService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/service/impl/PopularizeInvoicingServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/service/impl/PopularizeInvoicingServiceImpl.java new file mode 100644 index 0000000..34d595d --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/service/impl/PopularizeInvoicingServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.popularizeInvoicing.service.impl; + +import org.jeecg.modules.popularizeInvoicing.entity.PopularizeInvoicing; +import org.jeecg.modules.popularizeInvoicing.mapper.PopularizeInvoicingMapper; +import org.jeecg.modules.popularizeInvoicing.service.IPopularizeInvoicingService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 开票管理 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +@Service +public class PopularizeInvoicingServiceImpl extends ServiceImpl implements IPopularizeInvoicingService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue/PopularizeInvoicingList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue/PopularizeInvoicingList.vue new file mode 100644 index 0000000..77b878a --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue/PopularizeInvoicingList.vue @@ -0,0 +1,221 @@ + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue/modules/PopularizeInvoicingForm.vue b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue/modules/PopularizeInvoicingForm.vue new file mode 100644 index 0000000..b2ce973 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue/modules/PopularizeInvoicingForm.vue @@ -0,0 +1,139 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue/modules/PopularizeInvoicingModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue/modules/PopularizeInvoicingModal.Style#Drawer.vue new file mode 100644 index 0000000..b5ddf2e --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue/modules/PopularizeInvoicingModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue/modules/PopularizeInvoicingModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue/modules/PopularizeInvoicingModal.vue new file mode 100644 index 0000000..15de1b9 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue/modules/PopularizeInvoicingModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue3/PopularizeInvoicing.api.ts b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue3/PopularizeInvoicing.api.ts new file mode 100644 index 0000000..f37cd62 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue3/PopularizeInvoicing.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/popularizeInvoicing/popularizeInvoicing/list', + save='/popularizeInvoicing/popularizeInvoicing/add', + edit='/popularizeInvoicing/popularizeInvoicing/edit', + deleteOne = '/popularizeInvoicing/popularizeInvoicing/delete', + deleteBatch = '/popularizeInvoicing/popularizeInvoicing/deleteBatch', + importExcel = '/popularizeInvoicing/popularizeInvoicing/importExcel', + exportXls = '/popularizeInvoicing/popularizeInvoicing/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/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue3/PopularizeInvoicing.data.ts b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue3/PopularizeInvoicing.data.ts new file mode 100644 index 0000000..2014add --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue3/PopularizeInvoicing.data.ts @@ -0,0 +1,114 @@ +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", + sorter: true, + dataIndex: 'createTime' + }, + { + title: '类型', + align:"center", + dataIndex: 'type_dictText' + }, + { + title: '关联旅行', + align:"center", + dataIndex: 'travelId_dictText' + }, + { + title: '关联活动', + align:"center", + dataIndex: 'activityId_dictText' + }, + { + title: '开票类型', + align:"center", + dataIndex: 'noType_dictText' + }, + { + title: '企业名称', + align:"center", + dataIndex: 'name' + }, + { + title: '税号', + align:"center", + dataIndex: 'no' + }, + { + title: '邮箱', + align:"center", + dataIndex: 'emil' + }, + { + title: '状态', + align:"center", + dataIndex: 'state_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '类型', + field: 'type', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"order_type" + }, + }, + { + label: '关联旅行', + field: 'travelId', + component: 'JSearchSelect', + componentProps:{ + dict:"popularize_travel,title,id" + }, + }, + { + label: '关联活动', + field: 'activityId', + component: 'JSearchSelect', + componentProps:{ + dict:"popularize_activity,title,id" + }, + }, + { + label: '开票类型', + field: 'noType', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"role_type" + }, + }, + { + label: '企业名称', + field: 'name', + component: 'Input', + }, + { + label: '税号', + field: 'no', + component: 'Input', + }, + { + label: '邮箱', + field: 'emil', + component: 'Input', + }, + { + label: '状态', + field: 'state', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"no_state_type" + }, + }, +]; diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue3/PopularizeInvoicingList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue3/PopularizeInvoicingList.vue new file mode 100644 index 0000000..36929d9 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue3/PopularizeInvoicingList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue3/components/PopularizeInvoicingModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue3/components/PopularizeInvoicingModal.vue new file mode 100644 index 0000000..645f5bb --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue3/components/PopularizeInvoicingModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/controller/PopularizeOrderController.java b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/controller/PopularizeOrderController.java new file mode 100644 index 0000000..40178de --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/controller/PopularizeOrderController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.popularizeOrder.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.popularizeOrder.entity.PopularizeOrder; +import org.jeecg.modules.popularizeOrder.service.IPopularizeOrderService; + +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-12-19 + * @Version: V1.0 + */ +@Api(tags="订单列表") +@RestController +@RequestMapping("/popularizeOrder/popularizeOrder") +@Slf4j +public class PopularizeOrderController extends JeecgController { + @Autowired + private IPopularizeOrderService popularizeOrderService; + + /** + * 分页列表查询 + * + * @param popularizeOrder + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "订单列表-分页列表查询") + @ApiOperation(value="订单列表-分页列表查询", notes="订单列表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(PopularizeOrder popularizeOrder, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(popularizeOrder, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = popularizeOrderService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param popularizeOrder + * @return + */ + @AutoLog(value = "订单列表-添加") + @ApiOperation(value="订单列表-添加", notes="订单列表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PopularizeOrder popularizeOrder) { + popularizeOrderService.save(popularizeOrder); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param popularizeOrder + * @return + */ + @AutoLog(value = "订单列表-编辑") + @ApiOperation(value="订单列表-编辑", notes="订单列表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody PopularizeOrder popularizeOrder) { + popularizeOrderService.updateById(popularizeOrder); + 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) { + popularizeOrderService.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.popularizeOrderService.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) { + PopularizeOrder popularizeOrder = popularizeOrderService.getById(id); + if(popularizeOrder==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(popularizeOrder); + } + + /** + * 导出excel + * + * @param request + * @param popularizeOrder + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PopularizeOrder popularizeOrder) { + return super.exportXls(request, popularizeOrder, PopularizeOrder.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, PopularizeOrder.class); + } + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/entity/PopularizeOrder.java b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/entity/PopularizeOrder.java new file mode 100644 index 0000000..5d839c1 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/entity/PopularizeOrder.java @@ -0,0 +1,123 @@ +package org.jeecg.modules.popularizeOrder.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-12-19 + * @Version: V1.0 + */ +@Data +@TableName("popularize_order") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="popularize_order对象", description="订单列表") +public class PopularizeOrder 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, dicCode = "order_state") + @Dict(dicCode = "order_state") + @ApiModelProperty(value = "订单状态") + private java.lang.String state; + /**订单标题*/ + @Excel(name = "订单标题", width = 15) + @ApiModelProperty(value = "订单标题") + private java.lang.String title; + /**订单图片*/ + @Excel(name = "订单图片", width = 15) + @ApiModelProperty(value = "订单图片") + private java.lang.String image; + /**类型*/ + @Excel(name = "类型", width = 15, dicCode = "order_type") + @Dict(dicCode = "order_type") + @ApiModelProperty(value = "类型") + private java.lang.String type; + /**时间*/ + @Excel(name = "时间", width = 15) + @ApiModelProperty(value = "时间") + private java.util.Date startTime; + /**地点*/ + @Excel(name = "地点", width = 15) + @ApiModelProperty(value = "地点") + private java.lang.String address; + /**价格*/ + @Excel(name = "价格", width = 15) + @ApiModelProperty(value = "价格") + private java.lang.String price; + /**需知*/ + @Excel(name = "需知", width = 15) + @ApiModelProperty(value = "需知") + private java.lang.String details; + /**是否签到*/ + @Excel(name = "是否签到", width = 15) + @ApiModelProperty(value = "是否签到") + private java.lang.String open; + /**溯源活动*/ + @Excel(name = "溯源活动", width = 15, dictTable = "popularize_activity", dicText = "title", dicCode = "id") + @Dict(dictTable = "popularize_activity", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "溯源活动") + private java.lang.String activityOrderId; + /**溯源旅行*/ + @Excel(name = "溯源旅行", width = 15, dictTable = "popularize_travel", dicText = "title", dicCode = "id") + @Dict(dictTable = "popularize_travel", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "溯源旅行") + private java.lang.String travelOrderId; + /**用户标识*/ + @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; + /**支付金额*/ + @Excel(name = "支付金额", width = 15) + @ApiModelProperty(value = "支付金额") + private java.math.BigDecimal payPrice; + /**支付时间*/ + @Excel(name = "支付时间", width = 15) + @ApiModelProperty(value = "支付时间") + private java.util.Date payTime; + /**购票数量*/ + @Excel(name = "购票数量", width = 15) + @ApiModelProperty(value = "购票数量") + private java.lang.Integer num; + /**是否已开票*/ + @Excel(name = "是否已开票", width = 15) + @ApiModelProperty(value = "是否已开票") + private java.lang.String isFp; + /**是否已评价*/ + @Excel(name = "是否已评价", width = 15) + @ApiModelProperty(value = "是否已评价") + private java.lang.String isPj; +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/mapper/PopularizeOrderMapper.java b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/mapper/PopularizeOrderMapper.java new file mode 100644 index 0000000..d35d343 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/mapper/PopularizeOrderMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.popularizeOrder.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.popularizeOrder.entity.PopularizeOrder; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 订单列表 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface PopularizeOrderMapper extends BaseMapper { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/mapper/xml/PopularizeOrderMapper.xml b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/mapper/xml/PopularizeOrderMapper.xml new file mode 100644 index 0000000..88fe0aa --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/mapper/xml/PopularizeOrderMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/service/IPopularizeOrderService.java b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/service/IPopularizeOrderService.java new file mode 100644 index 0000000..0ab4a38 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/service/IPopularizeOrderService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.popularizeOrder.service; + +import org.jeecg.modules.popularizeOrder.entity.PopularizeOrder; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 订单列表 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface IPopularizeOrderService extends IService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/service/impl/PopularizeOrderServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/service/impl/PopularizeOrderServiceImpl.java new file mode 100644 index 0000000..2c9f8ac --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/service/impl/PopularizeOrderServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.popularizeOrder.service.impl; + +import org.jeecg.modules.popularizeOrder.entity.PopularizeOrder; +import org.jeecg.modules.popularizeOrder.mapper.PopularizeOrderMapper; +import org.jeecg.modules.popularizeOrder.service.IPopularizeOrderService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 订单列表 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +@Service +public class PopularizeOrderServiceImpl extends ServiceImpl implements IPopularizeOrderService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/PopularizeOrderList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/PopularizeOrderList.vue new file mode 100644 index 0000000..3c036e2 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/PopularizeOrderList.vue @@ -0,0 +1,303 @@ + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/modules/PopularizeOrderForm.vue b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/modules/PopularizeOrderForm.vue new file mode 100644 index 0000000..2fb0938 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/modules/PopularizeOrderForm.vue @@ -0,0 +1,179 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/modules/PopularizeOrderModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/modules/PopularizeOrderModal.Style#Drawer.vue new file mode 100644 index 0000000..e67ec50 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/modules/PopularizeOrderModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/modules/PopularizeOrderModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/modules/PopularizeOrderModal.vue new file mode 100644 index 0000000..c20cc9e --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/modules/PopularizeOrderModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue3/PopularizeOrder.api.ts b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue3/PopularizeOrder.api.ts new file mode 100644 index 0000000..997d2a5 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue3/PopularizeOrder.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/popularizeOrder/popularizeOrder/list', + save='/popularizeOrder/popularizeOrder/add', + edit='/popularizeOrder/popularizeOrder/edit', + deleteOne = '/popularizeOrder/popularizeOrder/delete', + deleteBatch = '/popularizeOrder/popularizeOrder/deleteBatch', + importExcel = '/popularizeOrder/popularizeOrder/importExcel', + exportXls = '/popularizeOrder/popularizeOrder/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/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue3/PopularizeOrder.data.ts b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue3/PopularizeOrder.data.ts new file mode 100644 index 0000000..32cf880 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue3/PopularizeOrder.data.ts @@ -0,0 +1,239 @@ +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", + sorter: true, + dataIndex: 'createTime' + }, + { + title: '订单状态', + align:"center", + dataIndex: 'state_dictText' + }, + { + title: '订单标题', + align:"center", + dataIndex: 'title' + }, + { + title: '订单图片', + align:"center", + dataIndex: 'image', + customRender:render.renderAvatar, + }, + { + title: '类型', + align:"center", + dataIndex: 'type_dictText' + }, + { + title: '时间', + align:"center", + dataIndex: 'startTime' + }, + { + title: '地点', + align:"center", + dataIndex: 'address' + }, + { + title: '价格', + align:"center", + dataIndex: 'price' + }, + { + title: '是否签到', + align:"center", + dataIndex: 'open', + customRender:({text}) => { + return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]) + }, + }, + { + title: '溯源活动', + align:"center", + dataIndex: 'activityOrderId_dictText' + }, + { + title: '溯源旅行', + align:"center", + dataIndex: 'travelOrderId_dictText' + }, + { + title: '用户标识', + align:"center", + dataIndex: 'userId_dictText' + }, + { + title: '支付金额', + align:"center", + dataIndex: 'payPrice' + }, + { + title: '支付时间', + align:"center", + dataIndex: 'payTime' + }, + { + title: '购票数量', + align:"center", + dataIndex: 'num' + }, + { + title: '是否已开票', + align:"center", + dataIndex: 'isFp', + customRender:({text}) => { + return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]) + }, + }, + { + title: '是否已评价', + align:"center", + dataIndex: 'isPj', + customRender:({text}) => { + return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]) + }, + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ + { + label: "订单状态", + field: "state", + component: 'JDictSelectTag', + componentProps:{ + dictCode:"order_state" + }, + colProps: {span: 6}, + }, + { + label: "类型", + field: "type", + component: 'JDictSelectTag', + componentProps:{ + dictCode:"order_type" + }, + colProps: {span: 6}, + }, + { + label: "用户标识", + field: "userId", + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + colProps: {span: 6}, + }, +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '订单状态', + field: 'state', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"order_state" + }, + }, + { + label: '订单标题', + field: 'title', + component: 'Input', + }, + { + label: '订单图片', + field: 'image', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '类型', + field: 'type', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"order_type" + }, + }, + { + label: '时间', + field: 'startTime', + component: 'Input', + }, + { + label: '地点', + field: 'address', + component: 'Input', + }, + { + label: '价格', + field: 'price', + component: 'Input', + }, + { + label: '是否签到', + field: 'open', + component: 'JSwitch', + componentProps:{ + }, + }, + { + label: '溯源活动', + field: 'activityOrderId', + component: 'JSearchSelect', + componentProps:{ + dict:"popularize_activity,title,id" + }, + }, + { + label: '溯源旅行', + field: 'travelOrderId', + component: 'JSearchSelect', + componentProps:{ + dict:"popularize_travel,title,id" + }, + }, + { + label: '用户标识', + field: 'userId', + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + }, + { + label: '支付金额', + field: 'payPrice', + component: 'InputNumber', + }, + { + label: '支付时间', + field: 'payTime', + component: 'Input', + }, + { + label: '购票数量', + field: 'num', + component: 'InputNumber', + }, + { + label: '是否已开票', + field: 'isFp', + component: 'JSwitch', + componentProps:{ + }, + }, + { + label: '是否已评价', + field: 'isPj', + component: 'JSwitch', + componentProps:{ + }, + }, +]; diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue3/PopularizeOrderList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue3/PopularizeOrderList.vue new file mode 100644 index 0000000..01412c4 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue3/PopularizeOrderList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue3/components/PopularizeOrderModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue3/components/PopularizeOrderModal.vue new file mode 100644 index 0000000..bcbe42a --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue3/components/PopularizeOrderModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/controller/PopularizeRecruitController.java b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/controller/PopularizeRecruitController.java new file mode 100644 index 0000000..1c4e244 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/controller/PopularizeRecruitController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.popularizeRecruit.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.popularizeRecruit.entity.PopularizeRecruit; +import org.jeecg.modules.popularizeRecruit.service.IPopularizeRecruitService; + +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-12-19 + * @Version: V1.0 + */ +@Api(tags="招募信息") +@RestController +@RequestMapping("/popularizeRecruit/popularizeRecruit") +@Slf4j +public class PopularizeRecruitController extends JeecgController { + @Autowired + private IPopularizeRecruitService popularizeRecruitService; + + /** + * 分页列表查询 + * + * @param popularizeRecruit + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "招募信息-分页列表查询") + @ApiOperation(value="招募信息-分页列表查询", notes="招募信息-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(PopularizeRecruit popularizeRecruit, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(popularizeRecruit, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = popularizeRecruitService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param popularizeRecruit + * @return + */ + @AutoLog(value = "招募信息-添加") + @ApiOperation(value="招募信息-添加", notes="招募信息-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PopularizeRecruit popularizeRecruit) { + popularizeRecruitService.save(popularizeRecruit); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param popularizeRecruit + * @return + */ + @AutoLog(value = "招募信息-编辑") + @ApiOperation(value="招募信息-编辑", notes="招募信息-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody PopularizeRecruit popularizeRecruit) { + popularizeRecruitService.updateById(popularizeRecruit); + 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) { + popularizeRecruitService.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.popularizeRecruitService.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) { + PopularizeRecruit popularizeRecruit = popularizeRecruitService.getById(id); + if(popularizeRecruit==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(popularizeRecruit); + } + + /** + * 导出excel + * + * @param request + * @param popularizeRecruit + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PopularizeRecruit popularizeRecruit) { + return super.exportXls(request, popularizeRecruit, PopularizeRecruit.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, PopularizeRecruit.class); + } + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/entity/PopularizeRecruit.java b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/entity/PopularizeRecruit.java new file mode 100644 index 0000000..df4dbe7 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/entity/PopularizeRecruit.java @@ -0,0 +1,95 @@ +package org.jeecg.modules.popularizeRecruit.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-12-19 + * @Version: V1.0 + */ +@Data +@TableName("popularize_recruit") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="popularize_recruit对象", description="招募信息") +public class PopularizeRecruit 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 enTitle; + /**图片*/ + @Excel(name = "图片", width = 15) + @ApiModelProperty(value = "图片") + private java.lang.String image; + /**时间*/ + @Excel(name = "时间", width = 15) + @ApiModelProperty(value = "时间") + private java.util.Date startTime; + /**中文-地址*/ + @Excel(name = "中文-地址", width = 15) + @ApiModelProperty(value = "中文-地址") + private java.lang.String address; + /**英文-地址*/ + @Excel(name = "英文-地址", width = 15) + @ApiModelProperty(value = "英文-地址") + private java.lang.String enAddress; + /**中文-标签*/ + @Excel(name = "中文-标签", width = 15) + @ApiModelProperty(value = "中文-标签") + private java.lang.String iconText; + /**英文标签*/ + @Excel(name = "英文标签", width = 15) + @ApiModelProperty(value = "英文标签") + private java.lang.String enIconText; + /**是否上架 */ + @Excel(name = "是否上架 ", width = 15) + @ApiModelProperty(value = "是否上架 ") + private java.lang.String isOpen; + /**是否成行*/ + @Excel(name = "是否成行", width = 15, dicCode = "is_xc") + @Dict(dicCode = "is_xc") + @ApiModelProperty(value = "是否成行") + private java.lang.Integer state; + /**参与人数*/ + @Excel(name = "参与人数", width = 15) + @ApiModelProperty(value = "参与人数") + private java.lang.Integer num; +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/mapper/PopularizeRecruitMapper.java b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/mapper/PopularizeRecruitMapper.java new file mode 100644 index 0000000..59dad44 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/mapper/PopularizeRecruitMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.popularizeRecruit.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.popularizeRecruit.entity.PopularizeRecruit; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 招募信息 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface PopularizeRecruitMapper extends BaseMapper { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/mapper/xml/PopularizeRecruitMapper.xml b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/mapper/xml/PopularizeRecruitMapper.xml new file mode 100644 index 0000000..9de0abe --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/mapper/xml/PopularizeRecruitMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/service/IPopularizeRecruitService.java b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/service/IPopularizeRecruitService.java new file mode 100644 index 0000000..53b5b66 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/service/IPopularizeRecruitService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.popularizeRecruit.service; + +import org.jeecg.modules.popularizeRecruit.entity.PopularizeRecruit; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 招募信息 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface IPopularizeRecruitService extends IService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/service/impl/PopularizeRecruitServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/service/impl/PopularizeRecruitServiceImpl.java new file mode 100644 index 0000000..f638db4 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/service/impl/PopularizeRecruitServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.popularizeRecruit.service.impl; + +import org.jeecg.modules.popularizeRecruit.entity.PopularizeRecruit; +import org.jeecg.modules.popularizeRecruit.mapper.PopularizeRecruitMapper; +import org.jeecg.modules.popularizeRecruit.service.IPopularizeRecruitService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 招募信息 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +@Service +public class PopularizeRecruitServiceImpl extends ServiceImpl implements IPopularizeRecruitService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/PopularizeRecruitList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/PopularizeRecruitList.vue new file mode 100644 index 0000000..c5d4313 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/PopularizeRecruitList.vue @@ -0,0 +1,295 @@ + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/modules/PopularizeRecruitForm.vue b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/modules/PopularizeRecruitForm.vue new file mode 100644 index 0000000..ce40092 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/modules/PopularizeRecruitForm.vue @@ -0,0 +1,154 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/modules/PopularizeRecruitModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/modules/PopularizeRecruitModal.Style#Drawer.vue new file mode 100644 index 0000000..0ed92d0 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/modules/PopularizeRecruitModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/modules/PopularizeRecruitModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/modules/PopularizeRecruitModal.vue new file mode 100644 index 0000000..062e0da --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/modules/PopularizeRecruitModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue3/PopularizeRecruit.api.ts b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue3/PopularizeRecruit.api.ts new file mode 100644 index 0000000..ab3bfb7 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue3/PopularizeRecruit.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/popularizeRecruit/popularizeRecruit/list', + save='/popularizeRecruit/popularizeRecruit/add', + edit='/popularizeRecruit/popularizeRecruit/edit', + deleteOne = '/popularizeRecruit/popularizeRecruit/delete', + deleteBatch = '/popularizeRecruit/popularizeRecruit/deleteBatch', + importExcel = '/popularizeRecruit/popularizeRecruit/importExcel', + exportXls = '/popularizeRecruit/popularizeRecruit/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/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue3/PopularizeRecruit.data.ts b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue3/PopularizeRecruit.data.ts new file mode 100644 index 0000000..b57d692 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue3/PopularizeRecruit.data.ts @@ -0,0 +1,190 @@ +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: 'createBy' + }, + { + title: '创建日期', + align:"center", + sorter: true, + dataIndex: 'createTime' + }, + { + title: '中文-招募标题', + align:"center", + dataIndex: 'title' + }, + { + title: '英文-招募标题', + align:"center", + dataIndex: 'enTitle' + }, + { + title: '图片', + align:"center", + dataIndex: 'image', + customRender:render.renderAvatar, + }, + { + title: '时间', + align:"center", + dataIndex: 'startTime' + }, + { + title: '中文-地址', + align:"center", + dataIndex: 'address' + }, + { + title: '英文-地址', + align:"center", + dataIndex: 'enAddress' + }, + { + title: '中文-标签', + align:"center", + dataIndex: 'iconText' + }, + { + title: '英文标签', + align:"center", + dataIndex: 'enIconText' + }, + { + title: '是否上架 ', + align:"center", + dataIndex: 'isOpen', + customRender:({text}) => { + return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]) + }, + }, + { + title: '是否成行', + align:"center", + dataIndex: 'state_dictText' + }, + { + title: '参与人数', + align:"center", + dataIndex: 'num' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ + { + label: "中文-招募标题", + field: "title", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "英文-招募标题", + field: "enTitle", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "中文-地址", + field: "address", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "英文-地址", + field: "enAddress", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "中文-标签", + field: "iconText", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "英文标签", + field: "enIconText", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "是否成行", + field: "state", + component: 'JDictSelectTag', + componentProps:{ + dictCode:"is_xc" + }, + colProps: {span: 6}, + }, +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '中文-招募标题', + field: 'title', + component: 'Input', + }, + { + label: '英文-招募标题', + field: 'enTitle', + component: 'Input', + }, + { + label: '图片', + field: 'image', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '时间', + field: 'startTime', + component: 'Input', + }, + { + label: '中文-地址', + field: 'address', + component: 'Input', + }, + { + label: '英文-地址', + field: 'enAddress', + component: 'Input', + }, + { + label: '中文-标签', + field: 'iconText', + component: 'Input', + }, + { + label: '英文标签', + field: 'enIconText', + component: 'Input', + }, + { + label: '是否上架 ', + field: 'isOpen', + component: 'JSwitch', + componentProps:{ + }, + }, + { + label: '是否成行', + field: 'state', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"is_xc" + }, + }, + { + label: '参与人数', + field: 'num', + component: 'InputNumber', + }, +]; diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue3/PopularizeRecruitList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue3/PopularizeRecruitList.vue new file mode 100644 index 0000000..f182594 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue3/PopularizeRecruitList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue3/components/PopularizeRecruitModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue3/components/PopularizeRecruitModal.vue new file mode 100644 index 0000000..67d69a7 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue3/components/PopularizeRecruitModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSchool/controller/PopularizeSchoolController.java b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/controller/PopularizeSchoolController.java new file mode 100644 index 0000000..c363115 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/controller/PopularizeSchoolController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.popularizeSchool.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.popularizeSchool.entity.PopularizeSchool; +import org.jeecg.modules.popularizeSchool.service.IPopularizeSchoolService; + +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-12-19 + * @Version: V1.0 + */ +@Api(tags="学院名称") +@RestController +@RequestMapping("/popularizeSchool/popularizeSchool") +@Slf4j +public class PopularizeSchoolController extends JeecgController { + @Autowired + private IPopularizeSchoolService popularizeSchoolService; + + /** + * 分页列表查询 + * + * @param popularizeSchool + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "学院名称-分页列表查询") + @ApiOperation(value="学院名称-分页列表查询", notes="学院名称-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(PopularizeSchool popularizeSchool, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(popularizeSchool, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = popularizeSchoolService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param popularizeSchool + * @return + */ + @AutoLog(value = "学院名称-添加") + @ApiOperation(value="学院名称-添加", notes="学院名称-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PopularizeSchool popularizeSchool) { + popularizeSchoolService.save(popularizeSchool); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param popularizeSchool + * @return + */ + @AutoLog(value = "学院名称-编辑") + @ApiOperation(value="学院名称-编辑", notes="学院名称-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody PopularizeSchool popularizeSchool) { + popularizeSchoolService.updateById(popularizeSchool); + 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) { + popularizeSchoolService.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.popularizeSchoolService.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) { + PopularizeSchool popularizeSchool = popularizeSchoolService.getById(id); + if(popularizeSchool==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(popularizeSchool); + } + + /** + * 导出excel + * + * @param request + * @param popularizeSchool + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PopularizeSchool popularizeSchool) { + return super.exportXls(request, popularizeSchool, PopularizeSchool.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, PopularizeSchool.class); + } + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSchool/entity/PopularizeSchool.java b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/entity/PopularizeSchool.java new file mode 100644 index 0000000..6f44b19 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/entity/PopularizeSchool.java @@ -0,0 +1,78 @@ +package org.jeecg.modules.popularizeSchool.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-12-19 + * @Version: V1.0 + */ +@Data +@TableName("popularize_school") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="popularize_school对象", description="学院名称") +public class PopularizeSchool 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 schoolName; + /**学院名称-英文*/ + @Excel(name = "学院名称-英文", width = 15) + @ApiModelProperty(value = "学院名称-英文") + private java.lang.String enSchoolName; + /**中文-地点*/ + @Excel(name = "中文-地点", width = 15) + @ApiModelProperty(value = "中文-地点") + private java.lang.String address; + /**英文-地点*/ + @Excel(name = "英文-地点", width = 15) + @ApiModelProperty(value = "英文-地点") + private java.lang.String enAddress; + /**排序*/ + @Excel(name = "排序", width = 15) + @ApiModelProperty(value = "排序") + private java.lang.Integer sort; + /**标签-中文*/ + @Excel(name = "标签-中文", width = 15) + @ApiModelProperty(value = "标签-中文") + private java.lang.String icon; + /**标签-英文*/ + @Excel(name = "标签-英文", width = 15) + @ApiModelProperty(value = "标签-英文") + private java.lang.String iconEn; +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSchool/mapper/PopularizeSchoolMapper.java b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/mapper/PopularizeSchoolMapper.java new file mode 100644 index 0000000..0e18300 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/mapper/PopularizeSchoolMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.popularizeSchool.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.popularizeSchool.entity.PopularizeSchool; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 学院名称 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface PopularizeSchoolMapper extends BaseMapper { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSchool/mapper/xml/PopularizeSchoolMapper.xml b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/mapper/xml/PopularizeSchoolMapper.xml new file mode 100644 index 0000000..d2dde37 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/mapper/xml/PopularizeSchoolMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSchool/service/IPopularizeSchoolService.java b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/service/IPopularizeSchoolService.java new file mode 100644 index 0000000..0a725a9 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/service/IPopularizeSchoolService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.popularizeSchool.service; + +import org.jeecg.modules.popularizeSchool.entity.PopularizeSchool; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 学院名称 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface IPopularizeSchoolService extends IService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSchool/service/impl/PopularizeSchoolServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/service/impl/PopularizeSchoolServiceImpl.java new file mode 100644 index 0000000..096c3e4 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/service/impl/PopularizeSchoolServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.popularizeSchool.service.impl; + +import org.jeecg.modules.popularizeSchool.entity.PopularizeSchool; +import org.jeecg.modules.popularizeSchool.mapper.PopularizeSchoolMapper; +import org.jeecg.modules.popularizeSchool.service.IPopularizeSchoolService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 学院名称 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +@Service +public class PopularizeSchoolServiceImpl extends ServiceImpl implements IPopularizeSchoolService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue/PopularizeSchoolList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue/PopularizeSchoolList.vue new file mode 100644 index 0000000..66bed61 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue/PopularizeSchoolList.vue @@ -0,0 +1,227 @@ + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue/modules/PopularizeSchoolForm.vue b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue/modules/PopularizeSchoolForm.vue new file mode 100644 index 0000000..71fcb44 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue/modules/PopularizeSchoolForm.vue @@ -0,0 +1,134 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue/modules/PopularizeSchoolModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue/modules/PopularizeSchoolModal.Style#Drawer.vue new file mode 100644 index 0000000..f2a22df --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue/modules/PopularizeSchoolModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue/modules/PopularizeSchoolModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue/modules/PopularizeSchoolModal.vue new file mode 100644 index 0000000..98c4846 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue/modules/PopularizeSchoolModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue3/PopularizeSchool.api.ts b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue3/PopularizeSchool.api.ts new file mode 100644 index 0000000..58ca4ec --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue3/PopularizeSchool.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/popularizeSchool/popularizeSchool/list', + save='/popularizeSchool/popularizeSchool/add', + edit='/popularizeSchool/popularizeSchool/edit', + deleteOne = '/popularizeSchool/popularizeSchool/delete', + deleteBatch = '/popularizeSchool/popularizeSchool/deleteBatch', + importExcel = '/popularizeSchool/popularizeSchool/importExcel', + exportXls = '/popularizeSchool/popularizeSchool/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/module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue3/PopularizeSchool.data.ts b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue3/PopularizeSchool.data.ts new file mode 100644 index 0000000..4128104 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue3/PopularizeSchool.data.ts @@ -0,0 +1,95 @@ +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: 'schoolName' + }, + { + title: '学院名称-英文', + align:"center", + dataIndex: 'enSchoolName' + }, + { + title: '中文-地点', + align:"center", + dataIndex: 'address' + }, + { + title: '英文-地点', + align:"center", + dataIndex: 'enAddress' + }, + { + title: '排序', + align:"center", + dataIndex: 'sort' + }, + { + title: '标签-中文', + align:"center", + dataIndex: 'icon' + }, + { + title: '标签-英文', + align:"center", + dataIndex: 'iconEn' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ + { + label: "学院名称-中文", + field: "schoolName", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "学院名称-英文", + field: "enSchoolName", + component: 'Input', + colProps: {span: 6}, + }, +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '学院名称-中文', + field: 'schoolName', + component: 'Input', + }, + { + label: '学院名称-英文', + field: 'enSchoolName', + component: 'Input', + }, + { + label: '中文-地点', + field: 'address', + component: 'Input', + }, + { + label: '英文-地点', + field: 'enAddress', + component: 'Input', + }, + { + label: '排序', + field: 'sort', + component: 'InputNumber', + }, + { + label: '标签-中文', + field: 'icon', + component: 'Input', + }, + { + label: '标签-英文', + field: 'iconEn', + component: 'Input', + }, +]; diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue3/PopularizeSchoolList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue3/PopularizeSchoolList.vue new file mode 100644 index 0000000..57d368d --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue3/PopularizeSchoolList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue3/components/PopularizeSchoolModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue3/components/PopularizeSchoolModal.vue new file mode 100644 index 0000000..5cad212 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSchool/vue3/components/PopularizeSchoolModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/controller/PopularizeTravelController.java b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/controller/PopularizeTravelController.java new file mode 100644 index 0000000..d4eff71 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/controller/PopularizeTravelController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.popularizeTravel.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.popularizeTravel.entity.PopularizeTravel; +import org.jeecg.modules.popularizeTravel.service.IPopularizeTravelService; + +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-12-19 + * @Version: V1.0 + */ +@Api(tags="旅行信息表") +@RestController +@RequestMapping("/popularizeTravel/popularizeTravel") +@Slf4j +public class PopularizeTravelController extends JeecgController { + @Autowired + private IPopularizeTravelService popularizeTravelService; + + /** + * 分页列表查询 + * + * @param popularizeTravel + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "旅行信息表-分页列表查询") + @ApiOperation(value="旅行信息表-分页列表查询", notes="旅行信息表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(PopularizeTravel popularizeTravel, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(popularizeTravel, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = popularizeTravelService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param popularizeTravel + * @return + */ + @AutoLog(value = "旅行信息表-添加") + @ApiOperation(value="旅行信息表-添加", notes="旅行信息表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PopularizeTravel popularizeTravel) { + popularizeTravelService.save(popularizeTravel); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param popularizeTravel + * @return + */ + @AutoLog(value = "旅行信息表-编辑") + @ApiOperation(value="旅行信息表-编辑", notes="旅行信息表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody PopularizeTravel popularizeTravel) { + popularizeTravelService.updateById(popularizeTravel); + 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) { + popularizeTravelService.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.popularizeTravelService.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) { + PopularizeTravel popularizeTravel = popularizeTravelService.getById(id); + if(popularizeTravel==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(popularizeTravel); + } + + /** + * 导出excel + * + * @param request + * @param popularizeTravel + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PopularizeTravel popularizeTravel) { + return super.exportXls(request, popularizeTravel, PopularizeTravel.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, PopularizeTravel.class); + } + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/entity/PopularizeTravel.java b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/entity/PopularizeTravel.java new file mode 100644 index 0000000..72cb7c1 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/entity/PopularizeTravel.java @@ -0,0 +1,156 @@ +package org.jeecg.modules.popularizeTravel.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-12-19 + * @Version: V1.0 + */ +@Data +@TableName("popularize_travel") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="popularize_travel对象", description="旅行信息表") +public class PopularizeTravel 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 no; + /**中文-旅行标题*/ + @Excel(name = "中文-旅行标题", width = 15) + @ApiModelProperty(value = "中文-旅行标题") + private java.lang.String title; + /**英文-旅行标题*/ + @Excel(name = "英文-旅行标题", width = 15) + @ApiModelProperty(value = "英文-旅行标题") + private java.lang.String enTitle; + /**旅行类型*/ + @Excel(name = "旅行类型", width = 15) + @ApiModelProperty(value = "旅行类型") + private java.lang.String type; + /**旅行封面*/ + @Excel(name = "旅行封面", width = 15) + @ApiModelProperty(value = "旅行封面") + private java.lang.String image; + /**开始时间*/ + @Excel(name = "开始时间", width = 15) + @ApiModelProperty(value = "开始时间") + private java.util.Date startTime; + /**中文-旅行地址*/ + @Excel(name = "中文-旅行地址", width = 15) + @ApiModelProperty(value = "中文-旅行地址") + private java.lang.String address; + /**英文-旅行地址*/ + @Excel(name = "英文-旅行地址", width = 15) + @ApiModelProperty(value = "英文-旅行地址") + private java.lang.String enAddress; + /**活动人数*/ + @Excel(name = "活动人数", width = 15) + @ApiModelProperty(value = "活动人数") + private java.lang.String sum; + /**报名人数*/ + @Excel(name = "报名人数", width = 15) + @ApiModelProperty(value = "报名人数") + private java.lang.String num; + /**报名价格*/ + @Excel(name = "报名价格", width = 15) + @ApiModelProperty(value = "报名价格") + private java.lang.String price; + /**主理人*/ + @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 adminUser; + /**签到人数*/ + @Excel(name = "签到人数", width = 15) + @ApiModelProperty(value = "签到人数") + private java.lang.String openNum; + /**是否上架*/ + @Excel(name = "是否上架", width = 15) + @ApiModelProperty(value = "是否上架") + private java.lang.String isOpen; + /**活动状态*/ + @Excel(name = "活动状态", width = 15, dicCode = "no_state") + @Dict(dicCode = "no_state") + @ApiModelProperty(value = "活动状态") + private java.lang.String state; + /**详情图*/ + @Excel(name = "详情图", width = 15) + @ApiModelProperty(value = "详情图") + private java.lang.String iconImage; + /**中文-介绍说明*/ + @Excel(name = "中文-介绍说明", width = 15) + @ApiModelProperty(value = "中文-介绍说明") + private java.lang.String js; + /**英文-介绍说明*/ + @Excel(name = "英文-介绍说明", width = 15) + @ApiModelProperty(value = "英文-介绍说明") + private java.lang.String enJs; + /**中文-路线说明*/ + @Excel(name = "中文-路线说明", width = 15) + @ApiModelProperty(value = "中文-路线说明") + private java.lang.String lx; + /**英文-路线说明*/ + @Excel(name = "英文-路线说明", width = 15) + @ApiModelProperty(value = "英文-路线说明") + private java.lang.String enLx; + /**中文-费用说明*/ + @Excel(name = "中文-费用说明", width = 15) + @ApiModelProperty(value = "中文-费用说明") + private java.lang.String fy; + /**英文-费用说明*/ + @Excel(name = "英文-费用说明", width = 15) + @ApiModelProperty(value = "英文-费用说明") + private java.lang.String enFy; + /**中文-需知说明*/ + @Excel(name = "中文-需知说明", width = 15) + @ApiModelProperty(value = "中文-需知说明") + private java.lang.String xz; + /**英文-需知说明*/ + @Excel(name = "英文-需知说明", width = 15) + @ApiModelProperty(value = "英文-需知说明") + private java.lang.String enXz; + /**中文-代理说明*/ + @Excel(name = "中文-代理说明", width = 15) + @ApiModelProperty(value = "中文-代理说明") + private java.lang.String dl; + /**英文-代理说明*/ + @Excel(name = "英文-代理说明", width = 15) + @ApiModelProperty(value = "英文-代理说明") + private java.lang.String enDl; +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/mapper/PopularizeTravelMapper.java b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/mapper/PopularizeTravelMapper.java new file mode 100644 index 0000000..8dc7e46 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/mapper/PopularizeTravelMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.popularizeTravel.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.popularizeTravel.entity.PopularizeTravel; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 旅行信息表 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface PopularizeTravelMapper extends BaseMapper { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/mapper/xml/PopularizeTravelMapper.xml b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/mapper/xml/PopularizeTravelMapper.xml new file mode 100644 index 0000000..228b2f2 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/mapper/xml/PopularizeTravelMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/service/IPopularizeTravelService.java b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/service/IPopularizeTravelService.java new file mode 100644 index 0000000..064b67a --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/service/IPopularizeTravelService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.popularizeTravel.service; + +import org.jeecg.modules.popularizeTravel.entity.PopularizeTravel; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 旅行信息表 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface IPopularizeTravelService extends IService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/service/impl/PopularizeTravelServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/service/impl/PopularizeTravelServiceImpl.java new file mode 100644 index 0000000..780a758 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/service/impl/PopularizeTravelServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.popularizeTravel.service.impl; + +import org.jeecg.modules.popularizeTravel.entity.PopularizeTravel; +import org.jeecg.modules.popularizeTravel.mapper.PopularizeTravelMapper; +import org.jeecg.modules.popularizeTravel.service.IPopularizeTravelService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 旅行信息表 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +@Service +public class PopularizeTravelServiceImpl extends ServiceImpl implements IPopularizeTravelService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/PopularizeTravelList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/PopularizeTravelList.vue new file mode 100644 index 0000000..75ecdc7 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/PopularizeTravelList.vue @@ -0,0 +1,318 @@ + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/modules/PopularizeTravelForm.vue b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/modules/PopularizeTravelForm.vue new file mode 100644 index 0000000..f2f8ad0 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/modules/PopularizeTravelForm.vue @@ -0,0 +1,219 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/modules/PopularizeTravelModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/modules/PopularizeTravelModal.Style#Drawer.vue new file mode 100644 index 0000000..3fd0c79 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/modules/PopularizeTravelModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/modules/PopularizeTravelModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/modules/PopularizeTravelModal.vue new file mode 100644 index 0000000..33262c4 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/modules/PopularizeTravelModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue3/PopularizeTravel.api.ts b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue3/PopularizeTravel.api.ts new file mode 100644 index 0000000..9e2539a --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue3/PopularizeTravel.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/popularizeTravel/popularizeTravel/list', + save='/popularizeTravel/popularizeTravel/add', + edit='/popularizeTravel/popularizeTravel/edit', + deleteOne = '/popularizeTravel/popularizeTravel/delete', + deleteBatch = '/popularizeTravel/popularizeTravel/deleteBatch', + importExcel = '/popularizeTravel/popularizeTravel/importExcel', + exportXls = '/popularizeTravel/popularizeTravel/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/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue3/PopularizeTravel.data.ts b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue3/PopularizeTravel.data.ts new file mode 100644 index 0000000..eb21ce2 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue3/PopularizeTravel.data.ts @@ -0,0 +1,274 @@ +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: 'createBy' + }, + { + title: '创建日期', + align:"center", + sorter: true, + dataIndex: 'createTime' + }, + { + title: '中文-旅行标题', + align:"center", + dataIndex: 'title' + }, + { + title: '英文-旅行标题', + align:"center", + dataIndex: 'enTitle' + }, + { + title: '旅行封面', + align:"center", + dataIndex: 'image', + customRender:render.renderAvatar, + }, + { + title: '开始时间', + align:"center", + dataIndex: 'startTime' + }, + { + title: '中文-旅行地址', + align:"center", + dataIndex: 'address' + }, + { + title: '英文-旅行地址', + align:"center", + dataIndex: 'enAddress' + }, + { + title: '活动人数', + align:"center", + dataIndex: 'sum' + }, + { + title: '报名人数', + align:"center", + dataIndex: 'num' + }, + { + title: '报名价格', + align:"center", + dataIndex: 'price' + }, + { + title: '主理人', + align:"center", + dataIndex: 'adminUser_dictText' + }, + { + title: '签到人数', + align:"center", + dataIndex: 'openNum' + }, + { + title: '是否上架', + align:"center", + dataIndex: 'isOpen', + customRender:({text}) => { + return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]) + }, + }, + { + title: '活动状态', + align:"center", + dataIndex: 'state_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ + { + label: "中文-旅行标题", + field: "title", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "英文-旅行标题", + field: "enTitle", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "开始时间", + field: "startTime", + component: 'DatePicker', + componentProps: { + showTime:true + }, + colProps: {span: 6}, + }, + { + label: "中文-旅行地址", + field: "address", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "英文-旅行地址", + field: "enAddress", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "主理人", + field: "adminUser", + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + colProps: {span: 6}, + }, + { + label: "活动状态", + field: "state", + component: 'JDictSelectTag', + componentProps:{ + dictCode:"no_state" + }, + colProps: {span: 6}, + }, +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '中文-旅行标题', + field: 'title', + component: 'Input', + }, + { + label: '英文-旅行标题', + field: 'enTitle', + component: 'Input', + }, + { + label: '旅行封面', + field: 'image', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '开始时间', + field: 'startTime', + component: 'Input', + }, + { + label: '中文-旅行地址', + field: 'address', + component: 'Input', + }, + { + label: '英文-旅行地址', + field: 'enAddress', + component: 'Input', + }, + { + label: '活动人数', + field: 'sum', + component: 'Input', + }, + { + label: '报名人数', + field: 'num', + component: 'Input', + }, + { + label: '报名价格', + field: 'price', + component: 'Input', + }, + { + label: '主理人', + field: 'adminUser', + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + }, + { + label: '签到人数', + field: 'openNum', + component: 'Input', + }, + { + label: '是否上架', + field: 'isOpen', + component: 'JSwitch', + componentProps:{ + }, + }, + { + label: '活动状态', + field: 'state', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"no_state" + }, + }, + { + label: '详情图', + field: 'iconImage', + component: 'JCodeEditor', //TODO String后缀暂未添加 + }, + { + label: '中文-介绍说明', + field: 'js', + component: 'JCodeEditor', //TODO String后缀暂未添加 + }, + { + label: '英文-介绍说明', + field: 'enJs', + component: 'JCodeEditor', //TODO String后缀暂未添加 + }, + { + label: '中文-路线说明', + field: 'lx', + component: 'InputTextArea',//TODO 注意string转换问题 + }, + { + label: '英文-路线说明', + field: 'enLx', + component: 'InputTextArea',//TODO 注意string转换问题 + }, + { + label: '中文-费用说明', + field: 'fy', + component: 'InputTextArea',//TODO 注意string转换问题 + }, + { + label: '英文-费用说明', + field: 'enFy', + component: 'InputTextArea',//TODO 注意string转换问题 + }, + { + label: '中文-需知说明', + field: 'xz', + component: 'InputTextArea',//TODO 注意string转换问题 + }, + { + label: '英文-需知说明', + field: 'enXz', + component: 'InputTextArea',//TODO 注意string转换问题 + }, + { + label: '中文-代理说明', + field: 'dl', + component: 'InputTextArea',//TODO 注意string转换问题 + }, + { + label: '英文-代理说明', + field: 'enDl', + component: 'InputTextArea',//TODO 注意string转换问题 + }, +]; diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue3/PopularizeTravelList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue3/PopularizeTravelList.vue new file mode 100644 index 0000000..91928db --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue3/PopularizeTravelList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue3/components/PopularizeTravelModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue3/components/PopularizeTravelModal.vue new file mode 100644 index 0000000..d7ff56d --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue3/components/PopularizeTravelModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file