diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/biz/controller/CourseBizController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/biz/controller/CourseBizController.java index 6b051b84..4db0e0e1 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/biz/controller/CourseBizController.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/biz/controller/CourseBizController.java @@ -194,6 +194,17 @@ public class CourseBizController { return Result.OK(courseBizService.addStudents(courseId, ids, sysUser)); } + @GetMapping("/{courseId}/progress") + @Operation(summary = "查询课程学习进度") + public Result> queryCourseProgress(@PathVariable(value = "courseId") String courseId, HttpServletRequest request, HttpServletResponse response) { + String token = request.getHeader(CommonConstant.X_ACCESS_TOKEN); + String username = JwtUtil.getUsername(token); + LoginUser sysUser = sysBaseApi.getUserByName(username); + + Map progress = courseBizService.getCourseProgress(courseId, sysUser.getId()); + return Result.OK(progress); + } + @GetMapping("/test") @IgnoreAuth public Result test() { diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/biz/service/CourseBizService.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/biz/service/CourseBizService.java index 2cff3ced..3d49a6fa 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/biz/service/CourseBizService.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/biz/service/CourseBizService.java @@ -91,6 +91,9 @@ public interface CourseBizService extends IService { * @return */ Map addStudents(String courseId, String ids, LoginUser sysUser); + + + Map getCourseProgress(String courseId, String id); } diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/biz/service/impl/CourseBizServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/biz/service/impl/CourseBizServiceImpl.java index 0e9a13f2..144c7d78 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/biz/service/impl/CourseBizServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/biz/service/impl/CourseBizServiceImpl.java @@ -23,6 +23,8 @@ import org.jeecg.modules.gen.coursesignup.mapper.CourseSignupMapper; import org.jeecg.modules.gen.courseteacher.entity.CourseTeacher; import org.jeecg.modules.gen.courseteacher.mapper.CourseTeacherMapper; import org.jeecg.modules.gen.homework.mapper.HomeworkMapper; +import org.jeecg.modules.gen.learnprogress.entity.LearnProgress; +import org.jeecg.modules.gen.learnprogress.mapper.LearnProgressMapper; import org.jeecg.modules.gen.resource.mapper.ResourceMapper; import org.jeecg.modules.gen.userinfo.entity.UserInfo; import org.jeecg.modules.gen.userinfo.mapper.UserInfoMapper; @@ -48,6 +50,7 @@ import java.nio.file.Path; import java.nio.file.StandardCopyOption; import java.util.*; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; import java.util.stream.Stream; import java.util.Date; @@ -85,6 +88,9 @@ public class CourseBizServiceImpl extends ServiceImpl impl @Autowired private CourseSignupMapper courseSignupMapper; + @Autowired + private LearnProgressMapper learnProgressMapper; + private static final ObjectMapper objectMapper = new ObjectMapper(); /** @@ -566,6 +572,110 @@ public class CourseBizServiceImpl extends ServiceImpl impl } return result; } + + @Override + public Map getCourseProgress(String courseId, String userId) { + // 1. 参数校验 + if (courseId == null || courseId.trim().isEmpty()) { + throw new RuntimeException("课程ID不能为空"); + } + if (userId == null || userId.trim().isEmpty()) { + throw new RuntimeException("用户ID不能为空"); + } + + // 2. 分别查询视频、考试、作业章节 + List videoSections = getCourseSectionsByType(courseId, 0); // 视频 + List examSections = getCourseSectionsByType(courseId, 2); // 考试 + List homeworkSections = getCourseSectionsByType(courseId, 3); // 作业 + + // 3. 分别查询各类型章节的完成情况 + int videoCompleted = getCompletedSectionCount(courseId, userId, videoSections); + int examCompleted = getCompletedSectionCount(courseId, userId, examSections); + int homeworkCompleted = getCompletedSectionCount(courseId, userId, homeworkSections); + + // 4. 计算各类型进度百分比 + int videoProgress = calculateProgress(videoCompleted, videoSections.size()); + int examProgress = calculateProgress(examCompleted, examSections.size()); + int homeworkProgress = calculateProgress(homeworkCompleted, homeworkSections.size()); + + // 5. 计算总进度 + int totalSections = videoSections.size() + examSections.size() + homeworkSections.size(); + int totalCompleted = videoCompleted + examCompleted + homeworkCompleted; + int totalProgress = calculateProgress(totalCompleted, totalSections); + + // 6. 构建返回结果 + Map result = new HashMap<>(); + + // 视频进度 + Map videoInfo = new HashMap<>(); + videoInfo.put("total", videoSections.size()); + videoInfo.put("completed", videoCompleted); + videoInfo.put("progress", videoProgress); + result.put("video", videoInfo); + + // 考试进度 + Map examInfo = new HashMap<>(); + examInfo.put("total", examSections.size()); + examInfo.put("completed", examCompleted); + examInfo.put("progress", examProgress); + result.put("exam", examInfo); + + // 作业进度 + Map homeworkInfo = new HashMap<>(); + homeworkInfo.put("total", homeworkSections.size()); + homeworkInfo.put("completed", homeworkCompleted); + homeworkInfo.put("progress", homeworkProgress); + result.put("homework", homeworkInfo); + + // 总进度 + Map totalInfo = new HashMap<>(); + totalInfo.put("total", totalSections); + totalInfo.put("completed", totalCompleted); + totalInfo.put("progress", totalProgress); + result.put("total", totalInfo); + + return result; + } + + /** + * 根据类型查询课程章节 + */ + private List getCourseSectionsByType(String courseId, Integer type) { + QueryWrapper query = new QueryWrapper<>(); + query.eq("course_id", courseId).eq("type", type).eq("level", 2); + return courseSectionMapper.selectList(query); + } + + /** + * 获取已完成的章节数量 + */ + private int getCompletedSectionCount(String courseId, String userId, List sections) { + if (sections.isEmpty()) { + return 0; + } + + List sectionIds = sections.stream() + .map(CourseSection::getId) + .collect(Collectors.toList()); + + QueryWrapper progressQuery = new QueryWrapper<>(); + progressQuery.eq("user_id", userId) + .eq("course_id", courseId) + .in("section_id", sectionIds) + .eq("status", 2); // status=2表示学习完成 + + return Math.toIntExact(learnProgressMapper.selectCount(progressQuery)); + } + + /** + * 计算进度百分比 + */ + private int calculateProgress(int completed, int total) { + if (total == 0) { + return 100; // 如果没有章节,认为已完成 + } + return Math.round((float) completed / total * 100); + } } diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/controller/LearnProgressController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/controller/LearnProgressController.java new file mode 100644 index 00000000..b7fc02e2 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/controller/LearnProgressController.java @@ -0,0 +1,182 @@ +package org.jeecg.modules.gen.learnprogress.controller; + +import java.util.Arrays; +import java.util.HashMap; +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.system.query.QueryRuleEnum; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.gen.learnprogress.entity.LearnProgress; +import org.jeecg.modules.gen.learnprogress.service.ILearnProgressService; + +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.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + /** + * @Description: 学习进度 + * @Author: jeecg-boot + * @Date: 2025-08-22 + * @Version: V1.0 + */ +@Tag(name="学习进度") +@RestController +@RequestMapping("/gen/learnprogress/learnProgress") +@Slf4j +public class LearnProgressController extends JeecgController { + @Autowired + private ILearnProgressService learnProgressService; + + /** + * 分页列表查询 + * + * @param learnProgress + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "学习进度-分页列表查询") + @Operation(summary="学习进度-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(LearnProgress learnProgress, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + + + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(learnProgress, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = learnProgressService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param learnProgress + * @return + */ + @AutoLog(value = "学习进度-添加") + @Operation(summary="学习进度-添加") + @RequiresPermissions("gen.learnprogress:learn_progress:add") + @PostMapping(value = "/add") + public Result add(@RequestBody LearnProgress learnProgress) { + learnProgressService.save(learnProgress); + + return Result.OK("添加成功!"); + } + + /** + * 编辑 + * + * @param learnProgress + * @return + */ + @AutoLog(value = "学习进度-编辑") + @Operation(summary="学习进度-编辑") + @RequiresPermissions("gen.learnprogress:learn_progress:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody LearnProgress learnProgress) { + learnProgressService.updateById(learnProgress); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "学习进度-通过id删除") + @Operation(summary="学习进度-通过id删除") + @RequiresPermissions("gen.learnprogress:learn_progress:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + learnProgressService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "学习进度-批量删除") + @Operation(summary="学习进度-批量删除") + @RequiresPermissions("gen.learnprogress:learn_progress:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.learnProgressService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "学习进度-通过id查询") + @Operation(summary="学习进度-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + LearnProgress learnProgress = learnProgressService.getById(id); + if(learnProgress==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(learnProgress); + } + + /** + * 导出excel + * + * @param request + * @param learnProgress + */ + @RequiresPermissions("gen.learnprogress:learn_progress:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, LearnProgress learnProgress) { + return super.exportXls(request, learnProgress, LearnProgress.class, "学习进度"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("gen.learnprogress:learn_progress:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, LearnProgress.class); + } + +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/entity/LearnProgress.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/entity/LearnProgress.java new file mode 100644 index 00000000..18751644 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/entity/LearnProgress.java @@ -0,0 +1,80 @@ +package org.jeecg.modules.gen.learnprogress.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 com.baomidou.mybatisplus.annotation.TableLogic; +import org.jeecg.common.constant.ProvinceCityArea; +import org.jeecg.common.util.SpringContextUtils; +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.v3.oas.annotations.media.Schema; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 学习进度 + * @Author: jeecg-boot + * @Date: 2025-08-22 + * @Version: V1.0 + */ +@Data +@TableName("learn_progress") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@Schema(description="学习进度") +public class LearnProgress implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description = "主键") + private java.lang.String id; + /**用户id*/ + @Excel(name = "用户id", width = 15) + @Schema(description = "用户id") + private java.lang.String userId; + /**课程id*/ + @Excel(name = "课程id", width = 15) + @Schema(description = "课程id") + private java.lang.String courseId; + /**章节id*/ + @Excel(name = "章节id", width = 15) + @Schema(description = "章节id") + private java.lang.String sectionId; + /**进度*/ + @Excel(name = "进度", width = 15) + @Schema(description = "进度") + private java.lang.Integer progress; + /**时长*/ + @Excel(name = "时长", width = 15) + @Schema(description = "时长") + private java.lang.Integer duration; + /**状态*/ + @Excel(name = "状态", width = 15) + @Schema(description = "状态") + private java.lang.Integer status; + /**创建人*/ + @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; +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/mapper/LearnProgressMapper.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/mapper/LearnProgressMapper.java new file mode 100644 index 00000000..2efda3eb --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/mapper/LearnProgressMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.gen.learnprogress.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.gen.learnprogress.entity.LearnProgress; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 学习进度 + * @Author: jeecg-boot + * @Date: 2025-08-22 + * @Version: V1.0 + */ +public interface LearnProgressMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/mapper/xml/LearnProgressMapper.xml b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/mapper/xml/LearnProgressMapper.xml new file mode 100644 index 00000000..fa1f2764 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/mapper/xml/LearnProgressMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/service/ILearnProgressService.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/service/ILearnProgressService.java new file mode 100644 index 00000000..6efdbcd1 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/service/ILearnProgressService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.gen.learnprogress.service; + +import org.jeecg.modules.gen.learnprogress.entity.LearnProgress; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 学习进度 + * @Author: jeecg-boot + * @Date: 2025-08-22 + * @Version: V1.0 + */ +public interface ILearnProgressService extends IService { + +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/service/impl/LearnProgressServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/service/impl/LearnProgressServiceImpl.java new file mode 100644 index 00000000..6da9cdb9 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/service/impl/LearnProgressServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.gen.learnprogress.service.impl; + +import org.jeecg.modules.gen.learnprogress.entity.LearnProgress; +import org.jeecg.modules.gen.learnprogress.mapper.LearnProgressMapper; +import org.jeecg.modules.gen.learnprogress.service.ILearnProgressService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 学习进度 + * @Author: jeecg-boot + * @Date: 2025-08-22 + * @Version: V1.0 + */ +@Service +public class LearnProgressServiceImpl extends ServiceImpl implements ILearnProgressService { + +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/uniapp/LearnProgressForm.vue b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/uniapp/LearnProgressForm.vue new file mode 100644 index 00000000..4573d41b --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/uniapp/LearnProgressForm.vue @@ -0,0 +1,113 @@ + + + diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/uniapp/LearnProgressList.vue b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/uniapp/LearnProgressList.vue new file mode 100644 index 00000000..f880b2f9 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/uniapp/LearnProgressList.vue @@ -0,0 +1,44 @@ + + + + diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/uniapp3/LearnProgressData.ts b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/uniapp3/LearnProgressData.ts new file mode 100644 index 00000000..289d5dea --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/uniapp3/LearnProgressData.ts @@ -0,0 +1,34 @@ +import { render } from '@/common/renderUtils'; +//列表数据 +export const columns = [ + { + title: '用户id', + align:"center", + dataIndex: 'userId' + }, + { + title: '课程id', + align:"center", + dataIndex: 'courseId' + }, + { + title: '章节id', + align:"center", + dataIndex: 'sectionId' + }, + { + title: '进度', + align:"center", + dataIndex: 'progress' + }, + { + title: '时长', + align:"center", + dataIndex: 'duration' + }, + { + title: '状态', + align:"center", + dataIndex: 'status' + }, +]; \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/uniapp3/LearnProgressForm.vue b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/uniapp3/LearnProgressForm.vue new file mode 100644 index 00000000..60d0b5ce --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/uniapp3/LearnProgressForm.vue @@ -0,0 +1,277 @@ + +{ +layout: 'default', +style: { +navigationStyle: 'custom', +navigationBarTitleText: '学习进度', +}, +} + + + + + + diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/uniapp3/LearnProgressList.vue b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/uniapp3/LearnProgressList.vue new file mode 100644 index 00000000..6f988d83 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/uniapp3/LearnProgressList.vue @@ -0,0 +1,148 @@ + +{ +layout: 'default', +style: { +navigationBarTitleText: '学习进度', +navigationStyle: 'custom', +}, +} + + + + + + diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/vue3/LearnProgress.api.ts b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/vue3/LearnProgress.api.ts new file mode 100644 index 00000000..24fa4299 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/vue3/LearnProgress.api.ts @@ -0,0 +1,64 @@ +import {defHttp} from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/gen/learnprogress/learnProgress/list', + save='/gen/learnprogress/learnProgress/add', + edit='/gen/learnprogress/learnProgress/edit', + deleteOne = '/gen/learnprogress/learnProgress/delete', + deleteBatch = '/gen/learnprogress/learnProgress/deleteBatch', + importExcel = '/gen/learnprogress/learnProgress/importExcel', + exportXls = '/gen/learnprogress/learnProgress/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) => { + createConfirm({ + iconType: 'warning', + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/vue3/LearnProgress.data.ts b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/vue3/LearnProgress.data.ts new file mode 100644 index 00000000..ee5b6156 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/vue3/LearnProgress.data.ts @@ -0,0 +1,100 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +import { getWeekMonthQuarterYear } from '/@/utils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '用户id', + align:"center", + dataIndex: 'userId' + }, + { + title: '课程id', + align:"center", + dataIndex: 'courseId' + }, + { + title: '章节id', + align:"center", + dataIndex: 'sectionId' + }, + { + title: '进度', + align:"center", + dataIndex: 'progress' + }, + { + title: '时长', + align:"center", + dataIndex: 'duration' + }, + { + title: '状态', + align:"center", + dataIndex: 'status' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '用户id', + field: 'userId', + component: 'Input', + }, + { + label: '课程id', + field: 'courseId', + component: 'Input', + }, + { + label: '章节id', + field: 'sectionId', + component: 'Input', + }, + { + label: '进度', + field: 'progress', + component: 'InputNumber', + }, + { + label: '时长', + field: 'duration', + component: 'InputNumber', + }, + { + label: '状态', + field: 'status', + component: 'InputNumber', + }, + // TODO 主键隐藏字段,目前写死为ID + { + label: '', + field: 'id', + component: 'Input', + show: false + }, +]; + +// 高级查询数据 +export const superQuerySchema = { + userId: {title: '用户id',order: 0,view: 'text', type: 'string',}, + courseId: {title: '课程id',order: 1,view: 'text', type: 'string',}, + sectionId: {title: '章节id',order: 2,view: 'text', type: 'string',}, + progress: {title: '进度',order: 3,view: 'number', type: 'number',}, + duration: {title: '时长',order: 4,view: 'number', type: 'number',}, + status: {title: '状态',order: 5,view: 'number', type: 'number',}, +}; + +/** +* 流程表单调用这个方法获取formSchema +* @param param +*/ +export function getBpmFormSchema(_formData): FormSchema[]{ + // 默认和原始表单保持一致 如果流程中配置了权限数据,这里需要单独处理formSchema + return formSchema; +} \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/vue3/LearnProgressList.vue b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/vue3/LearnProgressList.vue new file mode 100644 index 00000000..1314ec19 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/vue3/LearnProgressList.vue @@ -0,0 +1,206 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/vue3/V20250822_1__menu_insert_LearnProgress.sql b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/vue3/V20250822_1__menu_insert_LearnProgress.sql new file mode 100644 index 00000000..6ecd1d87 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/vue3/V20250822_1__menu_insert_LearnProgress.sql @@ -0,0 +1,26 @@ +-- 注意:该页面对应的前台目录为views/gen/learnprogress文件夹下 +-- 如果你想更改到其他目录,请修改sql中component字段对应的值 + + +INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) +VALUES ('202508220307680080', NULL, '学习进度', '/gen/learnprogress/learnProgressList', 'gen/learnprogress/LearnProgressList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2025-08-22 15:07:08', NULL, NULL, 0); + +-- 权限控制sql +-- 新增 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('202508220307680081', '202508220307680080', '添加学习进度', NULL, NULL, 0, NULL, NULL, 2, 'gen.learnprogress:learn_progress:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-22 15:07:08', NULL, NULL, 0, 0, '1', 0); +-- 编辑 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('202508220307680082', '202508220307680080', '编辑学习进度', NULL, NULL, 0, NULL, NULL, 2, 'gen.learnprogress:learn_progress:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-22 15:07:08', NULL, NULL, 0, 0, '1', 0); +-- 删除 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('202508220307680083', '202508220307680080', '删除学习进度', NULL, NULL, 0, NULL, NULL, 2, 'gen.learnprogress:learn_progress:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-22 15:07:08', NULL, NULL, 0, 0, '1', 0); +-- 批量删除 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('202508220307680084', '202508220307680080', '批量删除学习进度', NULL, NULL, 0, NULL, NULL, 2, 'gen.learnprogress:learn_progress:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-22 15:07:08', NULL, NULL, 0, 0, '1', 0); +-- 导出excel +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('202508220307680085', '202508220307680080', '导出excel_学习进度', NULL, NULL, 0, NULL, NULL, 2, 'gen.learnprogress:learn_progress:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-22 15:07:08', NULL, NULL, 0, 0, '1', 0); +-- 导入excel +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('202508220307680086', '202508220307680080', '导入excel_学习进度', NULL, NULL, 0, NULL, NULL, 2, 'gen.learnprogress:learn_progress:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-22 15:07:08', NULL, NULL, 0, 0, '1', 0); \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/vue3/components/LearnProgressForm.vue b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/vue3/components/LearnProgressForm.vue new file mode 100644 index 00000000..1d59afbf --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/vue3/components/LearnProgressForm.vue @@ -0,0 +1,70 @@ + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/vue3/components/LearnProgressModal.vue b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/vue3/components/LearnProgressModal.vue new file mode 100644 index 00000000..b94b44ab --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/learnprogress/vue3/components/LearnProgressModal.vue @@ -0,0 +1,99 @@ + + + + + \ No newline at end of file