diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/controller/CourseController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/controller/CourseController.java index 4518332d..36a55142 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/controller/CourseController.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/controller/CourseController.java @@ -39,12 +39,12 @@ import io.swagger.v3.oas.annotations.Operation; import org.jeecg.common.aspect.annotation.AutoLog; import org.apache.shiro.authz.annotation.RequiresPermissions; /** - * @Description: 课程 + * @Description: 课程表 * @Author: jeecg-boot * @Date: 2025-08-07 * @Version: V1.0 */ -@Tag(name="课程") +@Tag(name="课程表") @RestController @RequestMapping("/gen/course") @Slf4j @@ -61,8 +61,8 @@ public class CourseController extends JeecgController { * @param req * @return */ - //@AutoLog(value = "课程-分页列表查询") - @Operation(summary="课程-分页列表查询") + //@AutoLog(value = "课程表-分页列表查询") + @Operation(summary="课程表-分页列表查询") @GetMapping(value = "/list") public Result> queryPageList(Course course, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -70,11 +70,7 @@ public class CourseController extends JeecgController { HttpServletRequest req) { - // 自定义查询规则 - Map customeRuleMap = new HashMap<>(); - // 自定义多选的查询规则为：LIKE_WITH_OR - customeRuleMap.put("categoryId", QueryRuleEnum.LIKE_WITH_OR); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(course, req.getParameterMap(),customeRuleMap); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(course, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = courseService.page(page, queryWrapper); return Result.OK(pageList); @@ -86,8 +82,8 @@ public class CourseController extends JeecgController { * @param course * @return */ - @AutoLog(value = "课程-添加") - @Operation(summary="课程-添加") + @AutoLog(value = "课程表-添加") + @Operation(summary="课程表-添加") @RequiresPermissions("gen:course:add") @PostMapping(value = "/add") public Result add(@RequestBody Course course) { @@ -102,8 +98,8 @@ public class CourseController extends JeecgController { * @param course * @return */ - @AutoLog(value = "课程-编辑") - @Operation(summary="课程-编辑") + @AutoLog(value = "课程表-编辑") + @Operation(summary="课程表-编辑") @RequiresPermissions("gen:course:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result edit(@RequestBody Course course) { @@ -117,8 +113,8 @@ public class CourseController extends JeecgController { * @param id * @return */ - @AutoLog(value = "课程-通过id删除") - @Operation(summary="课程-通过id删除") + @AutoLog(value = "课程表-通过id删除") + @Operation(summary="课程表-通过id删除") @RequiresPermissions("gen:course:delete") @DeleteMapping(value = "/delete") public Result delete(@RequestParam(name="id",required=true) String id) { @@ -132,8 +128,8 @@ public class CourseController extends JeecgController { * @param ids * @return */ - @AutoLog(value = "课程-批量删除") - @Operation(summary="课程-批量删除") + @AutoLog(value = "课程表-批量删除") + @Operation(summary="课程表-批量删除") @RequiresPermissions("gen:course:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { @@ -147,8 +143,8 @@ public class CourseController extends JeecgController { * @param id * @return */ - //@AutoLog(value = "课程-通过id查询") - @Operation(summary="课程-通过id查询") + //@AutoLog(value = "课程表-通过id查询") + @Operation(summary="课程表-通过id查询") @GetMapping(value = "/queryById") public Result queryById(@RequestParam(name="id",required=true) String id) { Course course = courseService.getById(id); @@ -167,7 +163,7 @@ public class CourseController extends JeecgController { @RequiresPermissions("gen:course:exportXls") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, Course course) { - return super.exportXls(request, course, Course.class, "课程"); + return super.exportXls(request, course, Course.class, "课程表"); } /** diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/entity/Course.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/entity/Course.java index fc4bbf54..128986ce 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/entity/Course.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/entity/Course.java @@ -20,7 +20,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - * @Description: 课程 + * @Description: 课程表 * @Author: jeecg-boot * @Date: 2025-08-07 * @Version: V1.0 @@ -29,7 +29,7 @@ import lombok.experimental.Accessors; @TableName("course") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@Schema(description="课程") +@Schema(description="课程表") public class Course implements Serializable { private static final long serialVersionUID = 1L; @@ -37,44 +37,110 @@ public class Course implements Serializable { @TableId(type = IdType.ASSIGN_ID) @Schema(description = "主键") private java.lang.String id; - /**创建人*/ - @Schema(description = "创建人") - private java.lang.String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @Schema(description = "创建日期") - private java.util.Date createTime; - /**更新人*/ - @Schema(description = "更新人") - private java.lang.String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @Schema(description = "更新日期") - private java.util.Date updateTime; - /**所属部门*/ - @Schema(description = "所属部门") - private java.lang.String sysOrgCode; /**课程名*/ @Excel(name = "课程名", width = 15) @Schema(description = "课程名") private java.lang.String name; - /**图片*/ - @Excel(name = "图片", width = 15) - @Schema(description = "图片") + /**封面图*/ + @Excel(name = "封面图", width = 15) + @Schema(description = "封面图") private java.lang.String cover; - /**描述*/ - @Excel(name = "描述", width = 15) - @Schema(description = "描述") - private java.lang.String description; /**所属分类*/ - @Excel(name = "所属分类", width = 15, dictTable = "demo", dicText = "name", dicCode = "id") - @Dict(dictTable = "demo", dicText = "name", dicCode = "id") + @Excel(name = "所属分类", width = 15) @Schema(description = "所属分类") private java.lang.String categoryId; - /**teasta*/ - @Excel(name = "teasta", width = 15) - @Schema(description = "teasta") - private java.lang.String teststst; + /**介绍视频*/ + @Excel(name = "介绍视频", width = 15) + @Schema(description = "介绍视频") + private java.lang.String video; + /**学校*/ + @Excel(name = "学校", width = 15) + @Schema(description = "学校") + private java.lang.String school; + /**课程概述*/ + @Excel(name = "课程概述", width = 15) + @Schema(description = "课程概述") + private java.lang.String description; + /**课程类型*/ + @Excel(name = "课程类型", width = 15,replace = {"是_Y","否_N"} ) + @Schema(description = "课程类型") + private java.lang.Integer type; + /**授课目标*/ + @Excel(name = "授课目标", width = 15) + @Schema(description = "授课目标") + private java.lang.String target; + /**课程难度*/ + @Excel(name = "课程难度", width = 15) + @Schema(description = "课程难度") + private java.lang.Integer difficulty; + /**所属专题*/ + @Excel(name = "所属专题", width = 15) + @Schema(description = "所属专题") + private java.lang.String subject; + /**课程大纲*/ + @Excel(name = "课程大纲", width = 15) + @Schema(description = "课程大纲") + private java.lang.String outline; + /**预备知识*/ + @Excel(name = "预备知识", width = 15) + @Schema(description = "预备知识") + private java.lang.String prerequisite; + /**参考资料*/ + @Excel(name = "参考资料", width = 15) + @Schema(description = "参考资料") + private java.lang.String reference; + /**学时安排*/ + @Excel(name = "学时安排", width = 15) + @Schema(description = "学时安排") + private java.lang.String arrangement; + /**开课时间*/ + @Excel(name = "开课时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Schema(description = "开课时间") + private java.util.Date startTime; + /**结课时间*/ + @Excel(name = "结课时间", width = 15) + @Schema(description = "结课时间") + private java.lang.Integer endTime; + /**已报名人数*/ + @Excel(name = "已报名人数", width = 15) + @Schema(description = "已报名人数") + private java.lang.Integer enrollCount; + /**最大报名人数*/ + @Excel(name = "最大报名人数", width = 15) + @Schema(description = "最大报名人数") + private java.lang.Integer maxEnroll; + /**状态*/ + @Excel(name = "状态", width = 15) + @Schema(description = "状态") + private java.lang.Integer status; + /**常见问题*/ + @Excel(name = "常见问题", width = 15) + @Schema(description = "常见问题") + private java.lang.String question; + /**乐观锁*/ + @Excel(name = "乐观锁", width = 15) + @Schema(description = "乐观锁") + private java.lang.Integer revision; + /**创建人*/ + @Excel(name = "创建人", width = 15) + @Schema(description = "创建人") + private java.lang.String createdBy; + /**创建时间*/ + @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Schema(description = "创建时间") + private java.util.Date createdTime; + /**更新人*/ + @Excel(name = "更新人", width = 15) + @Schema(description = "更新人") + private java.lang.String updatedBy; + /**更新时间*/ + @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Schema(description = "更新时间") + private java.util.Date updatedTime; } diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/mapper/CourseMapper.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/mapper/CourseMapper.java index 11101e30..fff5fc3d 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/mapper/CourseMapper.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/mapper/CourseMapper.java @@ -7,7 +7,7 @@ import org.jeecg.modules.learn.gen.entity.Course; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: 课程 + * @Description: 课程表 * @Author: jeecg-boot * @Date: 2025-08-07 * @Version: V1.0 diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/service/ICourseService.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/service/ICourseService.java index cf7e9b0f..c35531c8 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/service/ICourseService.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/service/ICourseService.java @@ -4,7 +4,7 @@ import org.jeecg.modules.learn.gen.entity.Course; import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: 课程 + * @Description: 课程表 * @Author: jeecg-boot * @Date: 2025-08-07 * @Version: V1.0 diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/service/impl/CourseServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/service/impl/CourseServiceImpl.java index 34c78bea..86b728b2 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/service/impl/CourseServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/service/impl/CourseServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** - * @Description: 课程 + * @Description: 课程表 * @Author: jeecg-boot * @Date: 2025-08-07 * @Version: V1.0 diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/Course.data.ts b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/Course.data.ts index 213d7b7d..c6423147 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/Course.data.ts +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/Course.data.ts @@ -11,38 +11,132 @@ export const columns: BasicColumn[] = [ dataIndex: 'name' }, { - title: '图片', + title: '封面图', align:"center", dataIndex: 'cover', customRender:render.renderImage, }, - { - title: '描述', - align:"center", - dataIndex: 'description', - }, { title: '所属分类', align:"center", dataIndex: 'categoryId_dictText' }, { - title: 'teasta', + title: '介绍视频', align:"center", - dataIndex: 'teststst' + dataIndex: 'video', + }, + { + title: '学校', + align:"center", + dataIndex: 'school' + }, + { + title: '课程概述', + align:"center", + dataIndex: 'description' + }, + { + title: '课程类型', + align:"center", + dataIndex: 'type', + customRender:({text}) => { + return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]) + }, + }, + { + title: '授课目标', + align:"center", + dataIndex: 'target' + }, + { + title: '课程难度', + align:"center", + dataIndex: 'difficulty_dictText' + }, + { + title: '所属专题', + align:"center", + dataIndex: 'subject_dictText' + }, + { + title: '课程大纲', + align:"center", + dataIndex: 'outline' + }, + { + title: '预备知识', + align:"center", + dataIndex: 'prerequisite' + }, + { + title: '参考资料', + align:"center", + dataIndex: 'reference' + }, + { + title: '学时安排', + align:"center", + dataIndex: 'arrangement' + }, + { + title: '开课时间', + align:"center", + dataIndex: 'startTime' + }, + { + title: '结课时间', + align:"center", + dataIndex: 'endTime' + }, + { + title: '已报名人数', + align:"center", + dataIndex: 'enrollCount' + }, + { + title: '最大报名人数', + align:"center", + dataIndex: 'maxEnroll' + }, + { + title: '状态', + align:"center", + dataIndex: 'status_dictText' + }, + { + title: '常见问题', + align:"center", + dataIndex: 'question', + }, + { + title: '乐观锁', + align:"center", + dataIndex: 'revision' + }, + { + title: '创建人', + align:"center", + dataIndex: 'createdBy' + }, + { + title: '创建时间', + align:"center", + dataIndex: 'createdTime' + }, + { + title: '更新人', + align:"center", + dataIndex: 'updatedBy' + }, + { + title: '更新时间', + align:"center", + dataIndex: 'updatedTime' }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ - { - label: "所属分类", - field: 'categoryId', - component: 'JSelectMultiple', - componentProps:{ - dictCode:"demo,name,id" - }, - //colProps: {span: 6}, - }, ]; //表单数据 export const formSchema: FormSchema[] = [ @@ -52,30 +146,157 @@ export const formSchema: FormSchema[] = [ component: 'Input', }, { - label: '图片', + label: '封面图', field: 'cover', component: 'JImageUpload', componentProps:{ fileMax: 0 }, }, - { - label: '描述', - field: 'description', - component: 'JEditor', - }, { label: '所属分类', field: 'categoryId', - component: 'JDictSelectTag', + component: 'JSelectMultiple', componentProps:{ - dictCode:"demo,name,id" + dictCode:"" }, }, { - label: 'teasta', - field: 'teststst', + label: '介绍视频', + field: 'video', + component: 'JUpload', + componentProps:{ + }, + }, + { + label: '学校', + field: 'school', component: 'Input', + }, + { + label: '课程概述', + field: 'description', + component: 'Input', + }, + { + label: '课程类型', + field: 'type', + component: 'JSwitch', + componentProps:{ + }, + }, + { + label: '授课目标', + field: 'target', + component: 'Input', + }, + { + label: '课程难度', + field: 'difficulty', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"" + }, + }, + { + label: '所属专题', + field: 'subject', + component: 'JSelectMultiple', + componentProps:{ + dictCode:"" + }, + }, + { + label: '课程大纲', + field: 'outline', + component: 'Input', + }, + { + label: '预备知识', + field: 'prerequisite', + component: 'Input', + }, + { + label: '参考资料', + field: 'reference', + component: 'Input', + }, + { + label: '学时安排', + field: 'arrangement', + component: 'Input', + }, + { + label: '开课时间', + field: 'startTime', + component: 'DatePicker', + componentProps: { + showTime: true, + valueFormat: 'YYYY-MM-DD HH:mm:ss' + }, + }, + { + label: '结课时间', + field: 'endTime', + component: 'InputNumber', + }, + { + label: '已报名人数', + field: 'enrollCount', + component: 'InputNumber', + }, + { + label: '最大报名人数', + field: 'maxEnroll', + component: 'InputNumber', + }, + { + label: '状态', + field: 'status', + component: 'JPopupDict', + componentProps: { + placeholder: '请选择状态', + dictCode: ',,status', + multi: true + }, + }, + { + label: '常见问题', + field: 'question', + component: 'JEditor', + }, + { + label: '乐观锁', + field: 'revision', + component: 'InputNumber', + }, + { + label: '创建人', + field: 'createdBy', + component: 'Input', + }, + { + label: '创建时间', + field: 'createdTime', + component: 'DatePicker', + componentProps: { + showTime: true, + valueFormat: 'YYYY-MM-DD HH:mm:ss' + }, + }, + { + label: '更新人', + field: 'updatedBy', + component: 'Input', + }, + { + label: '更新时间', + field: 'updatedTime', + component: 'DatePicker', + componentProps: { + showTime: true, + valueFormat: 'YYYY-MM-DD HH:mm:ss' + }, }, // TODO 主键隐藏字段，目前写死为ID { @@ -89,10 +310,30 @@ export const formSchema: FormSchema[] = [ // 高级查询数据 export const superQuerySchema = { name: {title: '课程名',order: 0,view: 'text', type: 'string',}, - cover: {title: '图片',order: 1,view: 'image', type: 'string',}, - description: {title: '描述',order: 2,view: 'umeditor', type: 'string',}, - categoryId: {title: '所属分类',order: 3,view: 'list', type: 'string',dictTable: "demo", dictCode: 'id', dictText: 'name',}, - teststst: {title: 'teasta',order: 4,view: 'text', type: 'string',}, + cover: {title: '封面图',order: 1,view: 'image', type: 'string',}, + categoryId: {title: '所属分类',order: 2,view: 'list_multi', type: 'string',dictCode: '',}, + video: {title: '介绍视频',order: 3,view: 'file', type: 'string',}, + school: {title: '学校',order: 4,view: 'text', type: 'string',}, + description: {title: '课程概述',order: 5,view: 'text', type: 'string',}, + type: {title: '课程类型',order: 6,view: 'number', type: 'number',}, + target: {title: '授课目标',order: 7,view: 'text', type: 'string',}, + difficulty: {title: '课程难度',order: 8,view: 'number', type: 'number',dictCode: '',}, + subject: {title: '所属专题',order: 9,view: 'list_multi', type: 'string',dictCode: '',}, + outline: {title: '课程大纲',order: 10,view: 'text', type: 'string',}, + prerequisite: {title: '预备知识',order: 11,view: 'text', type: 'string',}, + reference: {title: '参考资料',order: 12,view: 'text', type: 'string',}, + arrangement: {title: '学时安排',order: 13,view: 'text', type: 'string',}, + startTime: {title: '开课时间',order: 14,view: 'datetime', type: 'string',}, + endTime: {title: '结课时间',order: 15,view: 'number', type: 'number',}, + enrollCount: {title: '已报名人数',order: 16,view: 'number', type: 'number',}, + maxEnroll: {title: '最大报名人数',order: 17,view: 'number', type: 'number',}, + status: {title: '状态',order: 18,view: 'number', type: 'number',}, + question: {title: '常见问题',order: 19,view: 'umeditor', type: 'string',}, + revision: {title: '乐观锁',order: 20,view: 'number', type: 'number',}, + createdBy: {title: '创建人',order: 21,view: 'text', type: 'string',}, + createdTime: {title: '创建时间',order: 22,view: 'datetime', type: 'string',}, + updatedBy: {title: '更新人',order: 23,view: 'text', type: 'string',}, + updatedTime: {title: '更新时间',order: 24,view: 'datetime', type: 'string',}, }; /** diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/CourseList.vue b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/CourseList.vue index d3103737..1eaf67c2 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/CourseList.vue +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/gen/vue3/CourseList.vue @@ -30,7 +30,12 @@