From 7ed9529c59d6e982f4ee840ead9f50b0bc0ebc54 Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Wed, 23 Jul 2025 20:22:17 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MoseBannerController.java | 2 +- .../modules/moseBanner/entity/MoseBanner.java | 2 +- .../moseBanner/mapper/MoseBannerMapper.java | 2 +- .../moseBanner/service/IMoseBannerService.java | 2 +- .../service/impl/MoseBannerServiceImpl.java | 2 +- .../modules/moseBanner/vue/MoseBannerList.vue | 5 ++-- .../moseBanner/vue/modules/MoseBannerForm.vue | 2 +- .../modules/moseBanner/vue3/MoseBanner.data.ts | 5 ++-- .../controller/MoseCommunityController.java | 2 +- .../moseCommunity/entity/MoseCommunity.java | 6 ++++- .../moseCommunity/mapper/MoseCommunityMapper.java | 2 +- .../service/IMoseCommunityService.java | 2 +- .../service/impl/MoseCommunityServiceImpl.java | 2 +- .../moseCommunity/vue/MoseCommunityList.vue | 7 ++++++ .../vue/modules/MoseCommunityForm.vue | 5 ++++ .../moseCommunity/vue3/MoseCommunity.data.ts | 13 ++++++++++ .../controller/MoseCourseController.java | 2 +- .../modules/moseCourse/entity/MoseCourse.java | 6 ++++- .../moseCourse/mapper/MoseCourseMapper.java | 2 +- .../moseCourse/service/IMoseCourseService.java | 2 +- .../service/impl/MoseCourseServiceImpl.java | 2 +- .../modules/moseCourse/vue/MoseCourseList.vue | 7 ++++++ .../moseCourse/vue/modules/MoseCourseForm.vue | 5 ++++ .../modules/moseCourse/vue3/MoseCourse.data.ts | 13 ++++++++++ .../controller/MoseEcosystemController.java | 2 +- .../moseEcosystem/entity/MoseEcosystem.java | 10 +++++++- .../moseEcosystem/mapper/MoseEcosystemMapper.java | 2 +- .../service/IMoseEcosystemService.java | 2 +- .../service/impl/MoseEcosystemServiceImpl.java | 2 +- .../moseEcosystem/vue/MoseEcosystemList.vue | 18 ++++++++++++-- .../vue/modules/MoseEcosystemForm.vue | 12 +++++++++- .../moseEcosystem/vue3/MoseEcosystem.data.ts | 28 ++++++++++++++++++++-- .../moseMedia/controller/MoseMediaController.java | 2 +- .../jeecg/modules/moseMedia/entity/MoseMedia.java | 6 ++++- .../modules/moseMedia/mapper/MoseMediaMapper.java | 2 +- .../moseMedia/service/IMoseMediaService.java | 2 +- .../service/impl/MoseMediaServiceImpl.java | 2 +- .../jeecg/modules/moseMedia/vue/MoseMediaList.vue | 6 +++++ .../moseMedia/vue/modules/MoseMediaForm.vue | 5 ++++ .../jeecg/modules/moseMedia/vue3/MoseMedia.data.ts | 10 ++++++++ .../api/service/impl/EcosystemServiceImpl.java | 4 ++-- .../src/main/resources/application-dev.yml | 4 ++-- 42 files changed, 180 insertions(+), 39 deletions(-) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/controller/MoseBannerController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/controller/MoseBannerController.java index 49a5931..5f7ab82 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/controller/MoseBannerController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/controller/MoseBannerController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 轮播图表 * @Author: jeecg-boot - * @Date: 2025-07-15 + * @Date: 2025-07-20 * @Version: V1.0 */ @Api(tags="轮播图表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/entity/MoseBanner.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/entity/MoseBanner.java index 85e9abc..4b3de65 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/entity/MoseBanner.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/entity/MoseBanner.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 轮播图表 * @Author: jeecg-boot - * @Date: 2025-07-15 + * @Date: 2025-07-20 * @Version: V1.0 */ @Data diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/mapper/MoseBannerMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/mapper/MoseBannerMapper.java index 1866ba3..c92ace9 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/mapper/MoseBannerMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/mapper/MoseBannerMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 轮播图表 * @Author: jeecg-boot - * @Date: 2025-07-15 + * @Date: 2025-07-20 * @Version: V1.0 */ public interface MoseBannerMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/service/IMoseBannerService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/service/IMoseBannerService.java index 938321f..d4d3e5b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/service/IMoseBannerService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/service/IMoseBannerService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 轮播图表 * @Author: jeecg-boot - * @Date: 2025-07-15 + * @Date: 2025-07-20 * @Version: V1.0 */ public interface IMoseBannerService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/service/impl/MoseBannerServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/service/impl/MoseBannerServiceImpl.java index 549ed0b..915f8e7 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/service/impl/MoseBannerServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/service/impl/MoseBannerServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 轮播图表 * @Author: jeecg-boot - * @Date: 2025-07-15 + * @Date: 2025-07-20 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/vue/MoseBannerList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/vue/MoseBannerList.vue index cf564a4..e662840 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/vue/MoseBannerList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/vue/MoseBannerList.vue @@ -124,7 +124,8 @@ { title:'标题', align:"center", - dataIndex: 'title' + dataIndex: 'title', + scopedSlots: {customRender: 'htmlSlot'} }, { title:'图片', @@ -171,7 +172,7 @@ }, getSuperFieldList(){ let fieldList=[]; - fieldList.push({type:'string',value:'title',text:'标题',dictCode:''}) + fieldList.push({type:'Text',value:'title',text:'标题',dictCode:''}) fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''}) fieldList.push({type:'int',value:'orderNo',text:'排序编号',dictCode:''}) this.superFieldList = fieldList diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/vue/modules/MoseBannerForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/vue/modules/MoseBannerForm.vue index dba8a86..98be454 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/vue/modules/MoseBannerForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/vue/modules/MoseBannerForm.vue @@ -5,7 +5,7 @@ - + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/vue3/MoseBanner.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/vue3/MoseBanner.data.ts index be4c852..ce3d173 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/vue3/MoseBanner.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseBanner/vue3/MoseBanner.data.ts @@ -7,7 +7,8 @@ export const columns: BasicColumn[] = [ { title: '标题', align:"center", - dataIndex: 'title' + dataIndex: 'title', + slots: { customRender: 'htmlSlot' }, }, { title: '图片', @@ -29,7 +30,7 @@ export const formSchema: FormSchema[] = [ { label: '标题', field: 'title', - component: 'Input', + component: 'JCodeEditor', //TODO String后缀暂未添加 }, { label: '图片', diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/controller/MoseCommunityController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/controller/MoseCommunityController.java index 3ed57f9..af9ea71 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/controller/MoseCommunityController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/controller/MoseCommunityController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 社区信息表 * @Author: jeecg-boot - * @Date: 2025-07-15 + * @Date: 2025-07-23 * @Version: V1.0 */ @Api(tags="社区信息表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/entity/MoseCommunity.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/entity/MoseCommunity.java index 0427d78..22ef26b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/entity/MoseCommunity.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/entity/MoseCommunity.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 社区信息表 * @Author: jeecg-boot - * @Date: 2025-07-15 + * @Date: 2025-07-23 * @Version: V1.0 */ @Data @@ -59,4 +59,8 @@ public class MoseCommunity implements Serializable { @Excel(name = "内容", width = 15) @ApiModelProperty(value = "内容") private java.lang.String content; + /**视频*/ + @Excel(name = "视频", width = 15) + @ApiModelProperty(value = "视频") + private java.lang.String video; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/mapper/MoseCommunityMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/mapper/MoseCommunityMapper.java index 7c1043e..27e307d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/mapper/MoseCommunityMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/mapper/MoseCommunityMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 社区信息表 * @Author: jeecg-boot - * @Date: 2025-07-15 + * @Date: 2025-07-23 * @Version: V1.0 */ public interface MoseCommunityMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/service/IMoseCommunityService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/service/IMoseCommunityService.java index 7abce2e..ca519c0 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/service/IMoseCommunityService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/service/IMoseCommunityService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 社区信息表 * @Author: jeecg-boot - * @Date: 2025-07-15 + * @Date: 2025-07-23 * @Version: V1.0 */ public interface IMoseCommunityService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/service/impl/MoseCommunityServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/service/impl/MoseCommunityServiceImpl.java index 89b27d8..4861433 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/service/impl/MoseCommunityServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/service/impl/MoseCommunityServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 社区信息表 * @Author: jeecg-boot - * @Date: 2025-07-15 + * @Date: 2025-07-23 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/vue/MoseCommunityList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/vue/MoseCommunityList.vue index b6a46cf..1268f05 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/vue/MoseCommunityList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/vue/MoseCommunityList.vue @@ -138,6 +138,12 @@ dataIndex: 'content', scopedSlots: {customRender: 'htmlSlot'} }, + { + title:'视频', + align:"center", + dataIndex: 'video', + scopedSlots: {customRender: 'fileSlot'} + }, { title: '操作', dataIndex: 'action', @@ -175,6 +181,7 @@ fieldList.push({type:'string',value:'title',text:'标题',dictCode:''}) fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''}) fieldList.push({type:'Text',value:'content',text:'内容',dictCode:''}) + fieldList.push({type:'Text',value:'video',text:'视频',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/vue/modules/MoseCommunityForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/vue/modules/MoseCommunityForm.vue index beac0c1..5f058dc 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/vue/modules/MoseCommunityForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/vue/modules/MoseCommunityForm.vue @@ -18,6 +18,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/vue3/MoseCommunity.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/vue3/MoseCommunity.data.ts index 0c0fdfc..b957254 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/vue3/MoseCommunity.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCommunity/vue3/MoseCommunity.data.ts @@ -21,6 +21,12 @@ export const columns: BasicColumn[] = [ dataIndex: 'content', slots: { customRender: 'htmlSlot' }, }, + { + title: '视频', + align:"center", + dataIndex: 'video', + slots: { customRender: 'fileSlot' }, + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -44,4 +50,11 @@ export const formSchema: FormSchema[] = [ field: 'content', component: 'JCodeEditor', //TODO String后缀暂未添加 }, + { + label: '视频', + field: 'video', + component: 'JUpload', + componentProps:{ + }, + }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/controller/MoseCourseController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/controller/MoseCourseController.java index 23f03d7..bfe116a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/controller/MoseCourseController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/controller/MoseCourseController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 发展历程表 * @Author: jeecg-boot - * @Date: 2025-07-15 + * @Date: 2025-07-19 * @Version: V1.0 */ @Api(tags="发展历程表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/entity/MoseCourse.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/entity/MoseCourse.java index 6249c95..f7b8d97 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/entity/MoseCourse.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/entity/MoseCourse.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 发展历程表 * @Author: jeecg-boot - * @Date: 2025-07-15 + * @Date: 2025-07-19 * @Version: V1.0 */ @Data @@ -55,4 +55,8 @@ public class MoseCourse implements Serializable { @Excel(name = "描述", width = 15) @ApiModelProperty(value = "描述") private java.lang.String description; + /**底图*/ + @Excel(name = "底图", width = 15) + @ApiModelProperty(value = "底图") + private java.lang.String image; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/mapper/MoseCourseMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/mapper/MoseCourseMapper.java index 81238f2..f34850c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/mapper/MoseCourseMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/mapper/MoseCourseMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 发展历程表 * @Author: jeecg-boot - * @Date: 2025-07-15 + * @Date: 2025-07-19 * @Version: V1.0 */ public interface MoseCourseMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/service/IMoseCourseService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/service/IMoseCourseService.java index 57c0222..bfd1184 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/service/IMoseCourseService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/service/IMoseCourseService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 发展历程表 * @Author: jeecg-boot - * @Date: 2025-07-15 + * @Date: 2025-07-19 * @Version: V1.0 */ public interface IMoseCourseService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/service/impl/MoseCourseServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/service/impl/MoseCourseServiceImpl.java index 87eac95..15a4349 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/service/impl/MoseCourseServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/service/impl/MoseCourseServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 发展历程表 * @Author: jeecg-boot - * @Date: 2025-07-15 + * @Date: 2025-07-19 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/vue/MoseCourseList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/vue/MoseCourseList.vue index 350006e..edab870 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/vue/MoseCourseList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/vue/MoseCourseList.vue @@ -132,6 +132,12 @@ dataIndex: 'description', scopedSlots: {customRender: 'htmlSlot'} }, + { + title:'底图', + align:"center", + dataIndex: 'image', + scopedSlots: {customRender: 'imgSlot'} + }, { title: '操作', dataIndex: 'action', @@ -168,6 +174,7 @@ let fieldList=[]; fieldList.push({type:'string',value:'title',text:'标题',dictCode:''}) fieldList.push({type:'Text',value:'description',text:'描述',dictCode:''}) + fieldList.push({type:'Text',value:'image',text:'底图',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/vue/modules/MoseCourseForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/vue/modules/MoseCourseForm.vue index f3ee3b4..0e09cd6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/vue/modules/MoseCourseForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/vue/modules/MoseCourseForm.vue @@ -13,6 +13,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/vue3/MoseCourse.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/vue3/MoseCourse.data.ts index 955c6b3..5dd379a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/vue3/MoseCourse.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseCourse/vue3/MoseCourse.data.ts @@ -15,6 +15,12 @@ export const columns: BasicColumn[] = [ dataIndex: 'description', slots: { customRender: 'htmlSlot' }, }, + { + title: '底图', + align:"center", + dataIndex: 'image', + customRender:render.renderAvatar, + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -31,4 +37,11 @@ export const formSchema: FormSchema[] = [ field: 'description', component: 'JCodeEditor', //TODO String后缀暂未添加 }, + { + label: '底图', + field: 'image', + component: 'JImageUpload', + componentProps:{ + }, + }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/controller/MoseEcosystemController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/controller/MoseEcosystemController.java index b69259d..a8e953d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/controller/MoseEcosystemController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/controller/MoseEcosystemController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 生态表 * @Author: jeecg-boot - * @Date: 2025-07-15 + * @Date: 2025-07-23 * @Version: V1.0 */ @Api(tags="生态表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/entity/MoseEcosystem.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/entity/MoseEcosystem.java index 7690872..c6e144b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/entity/MoseEcosystem.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/entity/MoseEcosystem.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 生态表 * @Author: jeecg-boot - * @Date: 2025-07-15 + * @Date: 2025-07-23 * @Version: V1.0 */ @Data @@ -55,4 +55,12 @@ public class MoseEcosystem implements Serializable { @Excel(name = "描述", width = 15) @ApiModelProperty(value = "描述") private java.lang.String description; + /**底图*/ + @Excel(name = "底图", width = 15) + @ApiModelProperty(value = "底图") + private java.lang.String image; + /**排序字段*/ + @Excel(name = "排序字段", width = 15) + @ApiModelProperty(value = "排序字段") + private java.lang.Integer orderNo; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/mapper/MoseEcosystemMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/mapper/MoseEcosystemMapper.java index 5e8c068..33e7170 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/mapper/MoseEcosystemMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/mapper/MoseEcosystemMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 生态表 * @Author: jeecg-boot - * @Date: 2025-07-15 + * @Date: 2025-07-23 * @Version: V1.0 */ public interface MoseEcosystemMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/service/IMoseEcosystemService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/service/IMoseEcosystemService.java index d91f4f4..8be1b85 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/service/IMoseEcosystemService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/service/IMoseEcosystemService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 生态表 * @Author: jeecg-boot - * @Date: 2025-07-15 + * @Date: 2025-07-23 * @Version: V1.0 */ public interface IMoseEcosystemService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/service/impl/MoseEcosystemServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/service/impl/MoseEcosystemServiceImpl.java index 0e8a555..1aca6ef 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/service/impl/MoseEcosystemServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/service/impl/MoseEcosystemServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 生态表 * @Author: jeecg-boot - * @Date: 2025-07-15 + * @Date: 2025-07-23 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/vue/MoseEcosystemList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/vue/MoseEcosystemList.vue index 4299509..7a76ea5 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/vue/MoseEcosystemList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/vue/MoseEcosystemList.vue @@ -124,7 +124,8 @@ { title:'标题', align:"center", - dataIndex: 'title' + dataIndex: 'title', + scopedSlots: {customRender: 'htmlSlot'} }, { title:'描述', @@ -132,6 +133,17 @@ dataIndex: 'description', scopedSlots: {customRender: 'htmlSlot'} }, + { + title:'底图', + align:"center", + dataIndex: 'image', + scopedSlots: {customRender: 'imgSlot'} + }, + { + title:'排序字段', + align:"center", + dataIndex: 'orderNo' + }, { title: '操作', dataIndex: 'action', @@ -166,8 +178,10 @@ }, getSuperFieldList(){ let fieldList=[]; - fieldList.push({type:'string',value:'title',text:'标题',dictCode:''}) + fieldList.push({type:'Text',value:'title',text:'标题',dictCode:''}) fieldList.push({type:'Text',value:'description',text:'描述',dictCode:''}) + fieldList.push({type:'Text',value:'image',text:'底图',dictCode:''}) + fieldList.push({type:'int',value:'orderNo',text:'排序字段',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/vue/modules/MoseEcosystemForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/vue/modules/MoseEcosystemForm.vue index 0329203..eabbb6b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/vue/modules/MoseEcosystemForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/vue/modules/MoseEcosystemForm.vue @@ -5,7 +5,7 @@ - + @@ -13,6 +13,16 @@ + + + + + + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/vue3/MoseEcosystem.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/vue3/MoseEcosystem.data.ts index 955c6b3..f8bf7fc 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/vue3/MoseEcosystem.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseEcosystem/vue3/MoseEcosystem.data.ts @@ -7,7 +7,8 @@ export const columns: BasicColumn[] = [ { title: '标题', align:"center", - dataIndex: 'title' + dataIndex: 'title', + slots: { customRender: 'htmlSlot' }, }, { title: '描述', @@ -15,6 +16,17 @@ export const columns: BasicColumn[] = [ dataIndex: 'description', slots: { customRender: 'htmlSlot' }, }, + { + title: '底图', + align:"center", + dataIndex: 'image', + customRender:render.renderAvatar, + }, + { + title: '排序字段', + align:"center", + dataIndex: 'orderNo' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -24,11 +36,23 @@ export const formSchema: FormSchema[] = [ { label: '标题', field: 'title', - component: 'Input', + component: 'JCodeEditor', //TODO String后缀暂未添加 }, { label: '描述', field: 'description', component: 'JCodeEditor', //TODO String后缀暂未添加 }, + { + label: '底图', + field: 'image', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '排序字段', + field: 'orderNo', + component: 'InputNumber', + }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/controller/MoseMediaController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/controller/MoseMediaController.java index 41c4d92..eacc154 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/controller/MoseMediaController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/controller/MoseMediaController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 媒体logo墙表 * @Author: jeecg-boot - * @Date: 2025-07-15 + * @Date: 2025-07-23 * @Version: V1.0 */ @Api(tags="媒体logo墙表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/entity/MoseMedia.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/entity/MoseMedia.java index de40ebf..32b6993 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/entity/MoseMedia.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/entity/MoseMedia.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 媒体logo墙表 * @Author: jeecg-boot - * @Date: 2025-07-15 + * @Date: 2025-07-23 * @Version: V1.0 */ @Data @@ -59,4 +59,8 @@ public class MoseMedia implements Serializable { @Excel(name = "描述", width = 15) @ApiModelProperty(value = "描述") private java.lang.String description; + /**视频*/ + @Excel(name = "视频", width = 15) + @ApiModelProperty(value = "视频") + private java.lang.String video; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/mapper/MoseMediaMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/mapper/MoseMediaMapper.java index 3b67513..34f52b7 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/mapper/MoseMediaMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/mapper/MoseMediaMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 媒体logo墙表 * @Author: jeecg-boot - * @Date: 2025-07-15 + * @Date: 2025-07-23 * @Version: V1.0 */ public interface MoseMediaMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/service/IMoseMediaService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/service/IMoseMediaService.java index 5c677d7..4aa0a6b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/service/IMoseMediaService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/service/IMoseMediaService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 媒体logo墙表 * @Author: jeecg-boot - * @Date: 2025-07-15 + * @Date: 2025-07-23 * @Version: V1.0 */ public interface IMoseMediaService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/service/impl/MoseMediaServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/service/impl/MoseMediaServiceImpl.java index 20236eb..b44a2f3 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/service/impl/MoseMediaServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/service/impl/MoseMediaServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 媒体logo墙表 * @Author: jeecg-boot - * @Date: 2025-07-15 + * @Date: 2025-07-23 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/vue/MoseMediaList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/vue/MoseMediaList.vue index f3e57a3..2944403 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/vue/MoseMediaList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/vue/MoseMediaList.vue @@ -138,6 +138,11 @@ dataIndex: 'description', scopedSlots: {customRender: 'htmlSlot'} }, + { + title:'视频', + align:"center", + dataIndex: 'video' + }, { title: '操作', dataIndex: 'action', @@ -175,6 +180,7 @@ fieldList.push({type:'string',value:'title',text:'标题',dictCode:''}) fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''}) fieldList.push({type:'Text',value:'description',text:'描述',dictCode:''}) + fieldList.push({type:'Text',value:'video',text:'视频',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/vue/modules/MoseMediaForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/vue/modules/MoseMediaForm.vue index 137e733..9426e0d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/vue/modules/MoseMediaForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/vue/modules/MoseMediaForm.vue @@ -18,6 +18,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/vue3/MoseMedia.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/vue3/MoseMedia.data.ts index aeb9c31..a68a7f6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/vue3/MoseMedia.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/moseMedia/vue3/MoseMedia.data.ts @@ -21,6 +21,11 @@ export const columns: BasicColumn[] = [ dataIndex: 'description', slots: { customRender: 'htmlSlot' }, }, + { + title: '视频', + align:"center", + dataIndex: 'video' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -44,4 +49,9 @@ export const formSchema: FormSchema[] = [ field: 'description', component: 'JCodeEditor', //TODO String后缀暂未添加 }, + { + label: '视频', + field: 'video', + component: 'Input', + }, ]; diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/EcosystemServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/EcosystemServiceImpl.java index 035b0fb..af631e0 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/EcosystemServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/EcosystemServiceImpl.java @@ -51,8 +51,8 @@ public class EcosystemServiceImpl implements EcosystemService { //组装查询条件 - //按照创建时间降序排列 - query.orderByDesc(MoseEcosystem::getCreateTime); + //按照排序字段升序排列 + query.orderByAsc(MoseEcosystem::getOrderNo); //获取生态信息 pageList = query.page(page); diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml index 14fcc1f..bf4bcca 100644 --- a/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -22,8 +22,8 @@ management: spring: servlet: multipart: - max-file-size: 10MB - max-request-size: 10MB + max-file-size: 50MB + max-request-size: 50MB mail: host: smtp.qq.com username: