From 1b7ea03dbf5e784e8243d6ae6d06a4035643565c Mon Sep 17 00:00:00 2001 From: xusd Date: Tue, 30 Apr 2024 17:33:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B1=95=E8=A7=84=E5=88=92-=E5=AD=A6?= =?UTF-8?q?=E4=B9=A0=E8=B7=AF=E5=BE=84=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inspur-service/inspur-admin/pom.xml | 6 + .../develop/LearningPathInfoController.java | 105 +++ .../inspur/common/core/domain/BaseEntity.java | 4 +- .../common/sftp/impl/SFTPServicesImpl.java | 2 +- inspur-service/inspur-develop/pom.xml | 35 + .../develop/domain/LearningPathCourse.java | 36 + .../develop/domain/LearningPathInfo.java | 65 ++ .../mapper/LearningPathCourseMapper.java | 40 + .../mapper/LearningPathInfoMapper.java | 61 ++ .../service/ILearningPathCourseService.java | 42 + .../service/ILearningPathInfoService.java | 61 ++ .../impl/LearningPathCourseServiceImpl.java | 61 ++ .../impl/LearningPathInfoServiceImpl.java | 139 +++ .../mapper/LearningPathCourseMapper.xml | 64 ++ .../mapper/LearningPathInfoMapper.xml | 96 ++ .../mapper/CourseDocumentInfoMapper.xml | 1 + .../mapper/CourseOnlineInfoMapper.xml | 3 +- .../mapper/CourseVideoInfoMapper.xml | 1 + inspur-service/pom.xml | 1 + inspur-ui/src/api/develop/learningPath.js | 44 + .../src/views/develop/learningPath/index.vue | 840 ++++++++++++++++++ .../src/views/knowledgeBase/history/index.vue | 6 +- .../knowledgeBase/industry/ceramics/index.vue | 6 +- .../industry/chemicalIndustry/index.vue | 6 +- .../industry/papermaking/index.vue | 6 +- .../views/operations/courseOnline/index.vue | 4 + .../views/operations/courseVideo/index.vue | 4 + .../src/views/operations/document/index.vue | 10 +- .../src/views/operations/manage/index.vue | 6 +- 29 files changed, 1733 insertions(+), 22 deletions(-) create mode 100644 inspur-service/inspur-admin/src/main/java/com/inspur/web/controller/develop/LearningPathInfoController.java create mode 100644 inspur-service/inspur-develop/pom.xml create mode 100644 inspur-service/inspur-develop/src/main/java/com/inspur/develop/domain/LearningPathCourse.java create mode 100644 inspur-service/inspur-develop/src/main/java/com/inspur/develop/domain/LearningPathInfo.java create mode 100644 inspur-service/inspur-develop/src/main/java/com/inspur/develop/mapper/LearningPathCourseMapper.java create mode 100644 inspur-service/inspur-develop/src/main/java/com/inspur/develop/mapper/LearningPathInfoMapper.java create mode 100644 inspur-service/inspur-develop/src/main/java/com/inspur/develop/service/ILearningPathCourseService.java create mode 100644 inspur-service/inspur-develop/src/main/java/com/inspur/develop/service/ILearningPathInfoService.java create mode 100644 inspur-service/inspur-develop/src/main/java/com/inspur/develop/service/impl/LearningPathCourseServiceImpl.java create mode 100644 inspur-service/inspur-develop/src/main/java/com/inspur/develop/service/impl/LearningPathInfoServiceImpl.java create mode 100644 inspur-service/inspur-develop/src/main/resources/mapper/LearningPathCourseMapper.xml create mode 100644 inspur-service/inspur-develop/src/main/resources/mapper/LearningPathInfoMapper.xml create mode 100644 inspur-ui/src/api/develop/learningPath.js create mode 100644 inspur-ui/src/views/develop/learningPath/index.vue diff --git a/inspur-service/inspur-admin/pom.xml b/inspur-service/inspur-admin/pom.xml index 263972a..45ff544 100644 --- a/inspur-service/inspur-admin/pom.xml +++ b/inspur-service/inspur-admin/pom.xml @@ -54,6 +54,12 @@ com.inspur inspur-quartz + + com.inspur + inspur-develop + 3.8.7 + compile + diff --git a/inspur-service/inspur-admin/src/main/java/com/inspur/web/controller/develop/LearningPathInfoController.java b/inspur-service/inspur-admin/src/main/java/com/inspur/web/controller/develop/LearningPathInfoController.java new file mode 100644 index 0000000..855b56b --- /dev/null +++ b/inspur-service/inspur-admin/src/main/java/com/inspur/web/controller/develop/LearningPathInfoController.java @@ -0,0 +1,105 @@ +package com.inspur.web.controller.develop; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.inspur.develop.domain.LearningPathInfo; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.inspur.common.annotation.Log; +import com.inspur.common.core.controller.BaseController; +import com.inspur.common.core.domain.AjaxResult; +import com.inspur.common.enums.BusinessType; +import com.inspur.common.utils.poi.ExcelUtil; +import com.inspur.common.core.page.TableDataInfo; + +/** + * 学习路径信息Controller + * + * @author inspur + * @date 2024-04-29 + */ +@RestController +@RequestMapping("/develop/learningPath") +public class LearningPathInfoController extends BaseController +{ + @Autowired + private com.inspur.service.ILearningPathInfoService learningPathInfoService; + + /** + * 查询学习路径信息列表 + */ + @PreAuthorize("@ss.hasPermi('develop:learningPath:list')") + @GetMapping("/list") + public TableDataInfo list(LearningPathInfo learningPathInfo) + { + startPage(); + List list = learningPathInfoService.selectLearningPathInfoList(learningPathInfo); + return getDataTable(list); + } + + /** + * 导出学习路径信息列表 + */ + @PreAuthorize("@ss.hasPermi('develop:learningPath:export')") + @Log(title = "学习路径信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, LearningPathInfo learningPathInfo) + { + List list = learningPathInfoService.selectLearningPathInfoList(learningPathInfo); + ExcelUtil util = new ExcelUtil(LearningPathInfo.class); + util.exportExcel(response, list, "学习路径信息数据"); + } + + /** + * 获取学习路径信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('develop:learningPath:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return success(learningPathInfoService.selectLearningPathInfoById(id)); + } + + /** + * 新增学习路径信息 + */ + @PreAuthorize("@ss.hasPermi('develop:learningPath:add')") + @Log(title = "学习路径信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody LearningPathInfo learningPathInfo) + { + return toAjax(learningPathInfoService.insertLearningPathInfo(learningPathInfo)); + } + + /** + * 修改学习路径信息 + */ + @PreAuthorize("@ss.hasPermi('develop:learningPath:edit')") + @Log(title = "学习路径信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody LearningPathInfo learningPathInfo) + { + return toAjax(learningPathInfoService.updateLearningPathInfo(learningPathInfo)); + } + + /** + * 删除学习路径信息 + */ + @PreAuthorize("@ss.hasPermi('develop:learningPath:remove')") + @Log(title = "学习路径信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(learningPathInfoService.deleteLearningPathInfoByIds(ids)); + } + +} diff --git a/inspur-service/inspur-common/src/main/java/com/inspur/common/core/domain/BaseEntity.java b/inspur-service/inspur-common/src/main/java/com/inspur/common/core/domain/BaseEntity.java index d83142e..8fbbe64 100644 --- a/inspur-service/inspur-common/src/main/java/com/inspur/common/core/domain/BaseEntity.java +++ b/inspur-service/inspur-common/src/main/java/com/inspur/common/core/domain/BaseEntity.java @@ -25,14 +25,14 @@ public class BaseEntity implements Serializable private String createBy; /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; /** 更新者 */ private String updateBy; /** 更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; /** 备注 */ diff --git a/inspur-service/inspur-common/src/main/java/com/inspur/common/sftp/impl/SFTPServicesImpl.java b/inspur-service/inspur-common/src/main/java/com/inspur/common/sftp/impl/SFTPServicesImpl.java index 148388e..4e9308b 100644 --- a/inspur-service/inspur-common/src/main/java/com/inspur/common/sftp/impl/SFTPServicesImpl.java +++ b/inspur-service/inspur-common/src/main/java/com/inspur/common/sftp/impl/SFTPServicesImpl.java @@ -68,7 +68,7 @@ public class SFTPServicesImpl implements ISFTPServices { public String getSaveFile(String nameInfo) { if (StringUtils.isBlank(nameInfo)) return "other"; - if (nameInfo.toLowerCase().contains("png") || nameInfo.toLowerCase().contains("jpg")) { + if (nameInfo.toLowerCase().contains("png") || nameInfo.toLowerCase().contains("jpg") || nameInfo.toLowerCase().contains("jpeg")) { return "image"; } else if (nameInfo.contains("doc") || nameInfo.contains("xls") || nameInfo.contains("ppt")) { return "doc"; diff --git a/inspur-service/inspur-develop/pom.xml b/inspur-service/inspur-develop/pom.xml new file mode 100644 index 0000000..c217150 --- /dev/null +++ b/inspur-service/inspur-develop/pom.xml @@ -0,0 +1,35 @@ + + + 4.0.0 + + com.inspur + inspur + 3.8.7 + + + inspur-develop + + + 8 + 8 + UTF-8 + + + + com.inspur + inspur-common + + + org.projectlombok + lombok + + + cn.hutool + hutool-all + 5.0.7 + + + + \ No newline at end of file diff --git a/inspur-service/inspur-develop/src/main/java/com/inspur/develop/domain/LearningPathCourse.java b/inspur-service/inspur-develop/src/main/java/com/inspur/develop/domain/LearningPathCourse.java new file mode 100644 index 0000000..431f589 --- /dev/null +++ b/inspur-service/inspur-develop/src/main/java/com/inspur/develop/domain/LearningPathCourse.java @@ -0,0 +1,36 @@ +package com.inspur.develop.domain; + +import lombok.Data; + +/** + * 学习路径与课程关联表 + * + * @Author xusd + * @Date 2024/4/30 14:52 + **/ +@Data +public class LearningPathCourse { + + /** + * 学习路径id + */ + private String learningPathId; + + /** + * 课程id + */ + private String courseId; + + /** + * 课程名称 + */ + private String courseName; + + /** + * 课程类型（0 在线课程，1 视频课程，2 培训资料） + */ + private String type; + + private String typeName; + +} diff --git a/inspur-service/inspur-develop/src/main/java/com/inspur/develop/domain/LearningPathInfo.java b/inspur-service/inspur-develop/src/main/java/com/inspur/develop/domain/LearningPathInfo.java new file mode 100644 index 0000000..a7892ff --- /dev/null +++ b/inspur-service/inspur-develop/src/main/java/com/inspur/develop/domain/LearningPathInfo.java @@ -0,0 +1,65 @@ +package com.inspur.develop.domain; + +import com.inspur.common.annotation.Excel; +import com.inspur.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +/** + * 学习路径信息对象 learning_path_info + * + * @author inspur + * @date 2024-04-29 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class LearningPathInfo extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * id + */ + private String id; + + /** + * 学习路径名称 + */ + @Excel(name = "学习路径名称") + private String learningPathName; + + /** + * 适用领域 + */ + @Excel(name = "适用领域") + private String applicableField; + + /** + * 适用人员 + */ + @Excel(name = "适用人员") + private String applicablePersonnel; + + /** + * 描述 + */ + @Excel(name = "描述") + private String description; + + /** + * 文件名称 + */ + private String fileName; + + /** + * sftp文件名称 + */ + private String sftpFileName; + + /** + * 学习路径与课程关联 + */ + private List learningPathCourseList; + +} diff --git a/inspur-service/inspur-develop/src/main/java/com/inspur/develop/mapper/LearningPathCourseMapper.java b/inspur-service/inspur-develop/src/main/java/com/inspur/develop/mapper/LearningPathCourseMapper.java new file mode 100644 index 0000000..bdf4f3c --- /dev/null +++ b/inspur-service/inspur-develop/src/main/java/com/inspur/develop/mapper/LearningPathCourseMapper.java @@ -0,0 +1,40 @@ +package com.inspur.develop.mapper; + +import com.inspur.develop.domain.LearningPathCourse; + +import java.util.List; + +/** + * @Author xusd + * @Date 2024/4/30 14:56 + **/ +public interface LearningPathCourseMapper { + + /** + * 新增学习路径课程关联 + * + * @param learningPathCourse 学习路径课程关联 + * @return 结果 + */ + int insertLearningPathCourse(LearningPathCourse learningPathCourse); + + /** + * 根据学习路径id删除学习路径与课程关联信息 + * + * @Author xusd + * @Date 15:10 2024/4/30 + * @param pathId 学习路径id + * @return int + */ + int deleteLearningPathCourseByPathId(String pathId); + + /** + * 根据学习路径id查询学习路径与课程关联信息 + * + * @Author xusd + * @Date 15:10 2024/4/30 + * @param pathId 学习路径id + * @return int + */ + List selectLearningPathCourseByPathId(String pathId); +} diff --git a/inspur-service/inspur-develop/src/main/java/com/inspur/develop/mapper/LearningPathInfoMapper.java b/inspur-service/inspur-develop/src/main/java/com/inspur/develop/mapper/LearningPathInfoMapper.java new file mode 100644 index 0000000..0ea350f --- /dev/null +++ b/inspur-service/inspur-develop/src/main/java/com/inspur/develop/mapper/LearningPathInfoMapper.java @@ -0,0 +1,61 @@ +package com.inspur.develop.mapper; + +import java.util.List; +import com.inspur.develop.domain.LearningPathInfo; + +/** + * 学习路径信息Mapper接口 + * + * @author inspur + * @date 2024-04-29 + */ +public interface LearningPathInfoMapper +{ + /** + * 查询学习路径信息 + * + * @param id 学习路径信息主键 + * @return 学习路径信息 + */ + public LearningPathInfo selectLearningPathInfoById(String id); + + /** + * 查询学习路径信息列表 + * + * @param learningPathInfo 学习路径信息 + * @return 学习路径信息集合 + */ + public List selectLearningPathInfoList(LearningPathInfo learningPathInfo); + + /** + * 新增学习路径信息 + * + * @param learningPathInfo 学习路径信息 + * @return 结果 + */ + public int insertLearningPathInfo(LearningPathInfo learningPathInfo); + + /** + * 修改学习路径信息 + * + * @param learningPathInfo 学习路径信息 + * @return 结果 + */ + public int updateLearningPathInfo(LearningPathInfo learningPathInfo); + + /** + * 删除学习路径信息 + * + * @param id 学习路径信息主键 + * @return 结果 + */ + public int deleteLearningPathInfoById(String id); + + /** + * 批量删除学习路径信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteLearningPathInfoByIds(String[] ids); +} diff --git a/inspur-service/inspur-develop/src/main/java/com/inspur/develop/service/ILearningPathCourseService.java b/inspur-service/inspur-develop/src/main/java/com/inspur/develop/service/ILearningPathCourseService.java new file mode 100644 index 0000000..156c9ce --- /dev/null +++ b/inspur-service/inspur-develop/src/main/java/com/inspur/develop/service/ILearningPathCourseService.java @@ -0,0 +1,42 @@ +package com.inspur.develop.service; + +import com.inspur.develop.domain.LearningPathCourse; + +import java.util.List; + +/** + * 学习路径与课程关联表 + * + * @Author xusd + * @Date 2024/4/30 14:55 + **/ +public interface ILearningPathCourseService { + + /** + * 新增学习路径课程关联 + * + * @param learningPathCourse 学习路径课程关联 + * @return 结果 + */ + int insertLearningPathCourse(LearningPathCourse learningPathCourse); + + /** + * 根据学习路径id删除学习路径与课程关联信息 + * + * @Author xusd + * @Date 15:10 2024/4/30 + * @param pathId 学习路径id + * @return int + */ + int deleteLearningPathCourseByPathId(String pathId); + + /** + * 根据学习路径id查询学习路径与课程关联信息 + * + * @Author xusd + * @Date 15:10 2024/4/30 + * @param pathId 学习路径id + * @return int + */ + List selectLearningPathCourseByPathId(String pathId); +} diff --git a/inspur-service/inspur-develop/src/main/java/com/inspur/develop/service/ILearningPathInfoService.java b/inspur-service/inspur-develop/src/main/java/com/inspur/develop/service/ILearningPathInfoService.java new file mode 100644 index 0000000..d3b88b0 --- /dev/null +++ b/inspur-service/inspur-develop/src/main/java/com/inspur/develop/service/ILearningPathInfoService.java @@ -0,0 +1,61 @@ +package com.inspur.service; + +import java.util.List; +import com.inspur.develop.domain.LearningPathInfo; + +/** + * 学习路径信息Service接口 + * + * @author inspur + * @date 2024-04-29 + */ +public interface ILearningPathInfoService +{ + /** + * 查询学习路径信息 + * + * @param id 学习路径信息主键 + * @return 学习路径信息 + */ + public LearningPathInfo selectLearningPathInfoById(String id); + + /** + * 查询学习路径信息列表 + * + * @param learningPathInfo 学习路径信息 + * @return 学习路径信息集合 + */ + public List selectLearningPathInfoList(LearningPathInfo learningPathInfo); + + /** + * 新增学习路径信息 + * + * @param learningPathInfo 学习路径信息 + * @return 结果 + */ + public int insertLearningPathInfo(LearningPathInfo learningPathInfo); + + /** + * 修改学习路径信息 + * + * @param learningPathInfo 学习路径信息 + * @return 结果 + */ + public int updateLearningPathInfo(LearningPathInfo learningPathInfo); + + /** + * 批量删除学习路径信息 + * + * @param ids 需要删除的学习路径信息主键集合 + * @return 结果 + */ + public int deleteLearningPathInfoByIds(String[] ids); + + /** + * 删除学习路径信息信息 + * + * @param id 学习路径信息主键 + * @return 结果 + */ + public int deleteLearningPathInfoById(String id); +} diff --git a/inspur-service/inspur-develop/src/main/java/com/inspur/develop/service/impl/LearningPathCourseServiceImpl.java b/inspur-service/inspur-develop/src/main/java/com/inspur/develop/service/impl/LearningPathCourseServiceImpl.java new file mode 100644 index 0000000..7a0af2f --- /dev/null +++ b/inspur-service/inspur-develop/src/main/java/com/inspur/develop/service/impl/LearningPathCourseServiceImpl.java @@ -0,0 +1,61 @@ +package com.inspur.develop.service.impl; + +import com.inspur.develop.domain.LearningPathCourse; +import com.inspur.develop.mapper.LearningPathCourseMapper; +import com.inspur.develop.service.ILearningPathCourseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.List; + +/** + * 学习路径与课程关联表 + * + * @Author xusd + * @Date 2024/4/30 14:55 + **/ +@Service +public class LearningPathCourseServiceImpl implements ILearningPathCourseService { + + @Autowired + private LearningPathCourseMapper learningPathCourseMapper; + + /** + * 新增学习路径课程关联 + * + * @param learningPathCourse 学习路径课程关联 + * @return 结果 + */ + @Override + public int insertLearningPathCourse(LearningPathCourse learningPathCourse) + { + return learningPathCourseMapper.insertLearningPathCourse(learningPathCourse); + } + + /** + * 根据学习路径id删除学习路径与课程关联信息 + * + * @Author xusd + * @Date 15:10 2024/4/30 + * @param pathId 学习路径id + * @return int + */ + @Override + public int deleteLearningPathCourseByPathId(String pathId) { + return learningPathCourseMapper.deleteLearningPathCourseByPathId(pathId); + } + + /** + * 根据学习路径id查询学习路径与课程关联信息 + * + * @Author xusd + * @Date 15:10 2024/4/30 + * @param pathId 学习路径id + * @return int + */ + @Override + public List selectLearningPathCourseByPathId(String pathId) { + return learningPathCourseMapper.selectLearningPathCourseByPathId(pathId); + } +} diff --git a/inspur-service/inspur-develop/src/main/java/com/inspur/develop/service/impl/LearningPathInfoServiceImpl.java b/inspur-service/inspur-develop/src/main/java/com/inspur/develop/service/impl/LearningPathInfoServiceImpl.java new file mode 100644 index 0000000..a5c837c --- /dev/null +++ b/inspur-service/inspur-develop/src/main/java/com/inspur/develop/service/impl/LearningPathInfoServiceImpl.java @@ -0,0 +1,139 @@ +package com.inspur.service.impl; + +import java.util.List; +import java.util.Objects; + +import cn.hutool.core.util.StrUtil; +import com.inspur.common.utils.DateUtils; +import com.inspur.common.utils.SecurityUtils; +import com.inspur.common.utils.StringUtils; +import com.inspur.common.utils.file.FileTypeUtils; +import com.inspur.common.utils.uuid.IdUtils; +import com.inspur.develop.domain.LearningPathCourse; +import com.inspur.develop.service.ILearningPathCourseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.inspur.develop.mapper.LearningPathInfoMapper; +import com.inspur.develop.domain.LearningPathInfo; +import com.inspur.service.ILearningPathInfoService; +import org.springframework.transaction.annotation.Transactional; + +/** + * 学习路径信息Service业务层处理 + * + * @author inspur + * @date 2024-04-29 + */ +@Service +public class LearningPathInfoServiceImpl implements ILearningPathInfoService +{ + @Autowired + private LearningPathInfoMapper learningPathInfoMapper; + + @Autowired + private ILearningPathCourseService learningPathCourseService; + + /** + * 查询学习路径信息 + * + * @param id 学习路径信息主键 + * @return 学习路径信息 + */ + @Override + public LearningPathInfo selectLearningPathInfoById(String id) + { + LearningPathInfo learningPathInfo = learningPathInfoMapper.selectLearningPathInfoById(id); + if (Objects.nonNull(learningPathInfo)){ + learningPathInfo.setLearningPathCourseList(learningPathCourseService.selectLearningPathCourseByPathId(id)); + } + return learningPathInfo; + } + + /** + * 查询学习路径信息列表 + * + * @param learningPathInfo 学习路径信息 + * @return 学习路径信息 + */ + @Override + public List selectLearningPathInfoList(LearningPathInfo learningPathInfo) + { + return learningPathInfoMapper.selectLearningPathInfoList(learningPathInfo); + } + + /** + * 新增学习路径信息 + * + * @param learningPathInfo 学习路径信息 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int insertLearningPathInfo(LearningPathInfo learningPathInfo) + { + learningPathInfo.setId(IdUtils.fastSimpleUUID()); + learningPathInfo.setCreateBy(String.valueOf(SecurityUtils.getUserId())); + learningPathInfo.setCreateTime(DateUtils.getNowDate()); + int i = learningPathInfoMapper.insertLearningPathInfo(learningPathInfo); + if (i > 0){ + if (StringUtils.isNotEmpty(learningPathInfo.getLearningPathCourseList())){ + List learningPathCourseList = learningPathInfo.getLearningPathCourseList(); + learningPathCourseList.forEach(item->{ + item.setLearningPathId(learningPathInfo.getId()); + learningPathCourseService.insertLearningPathCourse(item); + }); + } + } + return i; + } + + /** + * 修改学习路径信息 + * + * @param learningPathInfo 学习路径信息 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int updateLearningPathInfo(LearningPathInfo learningPathInfo) + { + learningPathInfo.setUpdateBy(String.valueOf(SecurityUtils.getUserId())); + learningPathInfo.setUpdateTime(DateUtils.getNowDate()); + int i = learningPathInfoMapper.updateLearningPathInfo(learningPathInfo); + if (i > 0){ + if (StringUtils.isNotEmpty(learningPathInfo.getLearningPathCourseList())){ + List learningPathCourseList = learningPathInfo.getLearningPathCourseList(); + learningPathCourseService.deleteLearningPathCourseByPathId(learningPathInfo.getId()); + learningPathCourseList.forEach(item->{ + item.setLearningPathId(learningPathInfo.getId()); + learningPathCourseService.insertLearningPathCourse(item); + }); + } + } + return i; + } + + /** + * 批量删除学习路径信息 + * + * @param ids 需要删除的学习路径信息主键 + * @return 结果 + */ + @Override + public int deleteLearningPathInfoByIds(String[] ids) + { + return learningPathInfoMapper.deleteLearningPathInfoByIds(ids); + } + + /** + * 删除学习路径信息信息 + * + * @param id 学习路径信息主键 + * @return 结果 + */ + @Override + public int deleteLearningPathInfoById(String id) + { + return learningPathInfoMapper.deleteLearningPathInfoById(id); + } +} diff --git a/inspur-service/inspur-develop/src/main/resources/mapper/LearningPathCourseMapper.xml b/inspur-service/inspur-develop/src/main/resources/mapper/LearningPathCourseMapper.xml new file mode 100644 index 0000000..b5e0ddb --- /dev/null +++ b/inspur-service/inspur-develop/src/main/resources/mapper/LearningPathCourseMapper.xml @@ -0,0 +1,64 @@ + + + + + + insert into learning_path_course + + learning_path_id, + course_id, + type, + + + #{learningPathId}, + #{courseId}, + #{type}, + + + + + delete from learning_path_course where learning_path_id = #{pathId} + + + + + \ No newline at end of file diff --git a/inspur-service/inspur-develop/src/main/resources/mapper/LearningPathInfoMapper.xml b/inspur-service/inspur-develop/src/main/resources/mapper/LearningPathInfoMapper.xml new file mode 100644 index 0000000..75d787e --- /dev/null +++ b/inspur-service/inspur-develop/src/main/resources/mapper/LearningPathInfoMapper.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + select id, applicable_field, applicable_personnel, learning_path_name, description, file_name, sftp_file_name, create_by, create_time, update_by, update_time from learning_path_info + + + + + + + + insert into learning_path_info + + id, + applicable_field, + applicable_personnel, + learning_path_name, + description, + file_name, + sftp_file_name, + create_by, + create_time, + update_by, + update_time, + + + #{id}, + #{applicableField}, + #{applicablePersonnel}, + #{learningPathName}, + #{description}, + #{fileName}, + #{sftpFileName}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update learning_path_info + + applicable_field = #{applicableField}, + applicable_personnel = #{applicablePersonnel}, + learning_path_name = #{learningPathName}, + description = #{description}, + file_name = #{fileName}, + sftp_file_name = #{sftpFileName}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from learning_path_info where id = #{id} + + + + delete from learning_path_info where id in + + #{id} + + + \ No newline at end of file diff --git a/inspur-service/inspur-operations/src/main/resources/mapper/CourseDocumentInfoMapper.xml b/inspur-service/inspur-operations/src/main/resources/mapper/CourseDocumentInfoMapper.xml index 5f70807..e309d3d 100644 --- a/inspur-service/inspur-operations/src/main/resources/mapper/CourseDocumentInfoMapper.xml +++ b/inspur-service/inspur-operations/src/main/resources/mapper/CourseDocumentInfoMapper.xml @@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and doc_name like concat('%', #{docName}, '%') and doc_type = #{docType} and status = #{status} + and doc_id = #{docId} order by create_time desc diff --git a/inspur-service/inspur-operations/src/main/resources/mapper/CourseOnlineInfoMapper.xml b/inspur-service/inspur-operations/src/main/resources/mapper/CourseOnlineInfoMapper.xml index b26fabd..9db6010 100644 --- a/inspur-service/inspur-operations/src/main/resources/mapper/CourseOnlineInfoMapper.xml +++ b/inspur-service/inspur-operations/src/main/resources/mapper/CourseOnlineInfoMapper.xml @@ -27,7 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/inspur-service/pom.xml b/inspur-service/pom.xml index 0bfe7df..f38a8a6 100644 --- a/inspur-service/pom.xml +++ b/inspur-service/pom.xml @@ -200,6 +200,7 @@ inspur-community inspur-knowledgeBase inspur-operations + inspur-develop pom diff --git a/inspur-ui/src/api/develop/learningPath.js b/inspur-ui/src/api/develop/learningPath.js new file mode 100644 index 0000000..ba0ce21 --- /dev/null +++ b/inspur-ui/src/api/develop/learningPath.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询学习路径信息列表 +export function listLearningPath(query) { + return request({ + url: '/develop/learningPath/list', + method: 'get', + params: query + }) +} + +// 查询学习路径信息详细 +export function getLearningPath(id) { + return request({ + url: '/develop/learningPath/' + id, + method: 'get' + }) +} + +// 新增学习路径信息 +export function addLearningPath(data) { + return request({ + url: '/develop/learningPath', + method: 'post', + data: data + }) +} + +// 修改学习路径信息 +export function updateLearningPath(data) { + return request({ + url: '/develop/learningPath', + method: 'put', + data: data + }) +} + +// 删除学习路径信息 +export function delLearningPath(id) { + return request({ + url: '/develop/learningPath/' + id, + method: 'delete' + }) +} diff --git a/inspur-ui/src/views/develop/learningPath/index.vue b/inspur-ui/src/views/develop/learningPath/index.vue new file mode 100644 index 0000000..2816966 --- /dev/null +++ b/inspur-ui/src/views/develop/learningPath/index.vue @@ -0,0 +1,840 @@ + + + + diff --git a/inspur-ui/src/views/knowledgeBase/history/index.vue b/inspur-ui/src/views/knowledgeBase/history/index.vue index c6e7046..0d355d0 100644 --- a/inspur-ui/src/views/knowledgeBase/history/index.vue +++ b/inspur-ui/src/views/knowledgeBase/history/index.vue @@ -206,10 +206,10 @@ - 上传文件 - 重新上传 + 上传文件 + 重新上传 - + {{ form.fileName }} diff --git a/inspur-ui/src/views/knowledgeBase/industry/ceramics/index.vue b/inspur-ui/src/views/knowledgeBase/industry/ceramics/index.vue index 31b80fa..5ed533d 100644 --- a/inspur-ui/src/views/knowledgeBase/industry/ceramics/index.vue +++ b/inspur-ui/src/views/knowledgeBase/industry/ceramics/index.vue @@ -181,10 +181,10 @@ - 上传文件 - 重新上传 + 上传文件 + 重新上传 - + {{ form.fileName }} diff --git a/inspur-ui/src/views/knowledgeBase/industry/chemicalIndustry/index.vue b/inspur-ui/src/views/knowledgeBase/industry/chemicalIndustry/index.vue index 8121037..5bc0267 100644 --- a/inspur-ui/src/views/knowledgeBase/industry/chemicalIndustry/index.vue +++ b/inspur-ui/src/views/knowledgeBase/industry/chemicalIndustry/index.vue @@ -181,10 +181,10 @@ - 上传文件 - 重新上传 + 上传文件 + 重新上传 - + {{ form.fileName }} diff --git a/inspur-ui/src/views/knowledgeBase/industry/papermaking/index.vue b/inspur-ui/src/views/knowledgeBase/industry/papermaking/index.vue index 9858dc3..0b64dd0 100644 --- a/inspur-ui/src/views/knowledgeBase/industry/papermaking/index.vue +++ b/inspur-ui/src/views/knowledgeBase/industry/papermaking/index.vue @@ -181,10 +181,10 @@ - 上传文件 - 重新上传 + 上传文件 + 重新上传 - + {{ form.fileName }} diff --git a/inspur-ui/src/views/operations/courseOnline/index.vue b/inspur-ui/src/views/operations/courseOnline/index.vue index 7ec52b7..a4b3af2 100644 --- a/inspur-ui/src/views/operations/courseOnline/index.vue +++ b/inspur-ui/src/views/operations/courseOnline/index.vue @@ -336,6 +336,10 @@ export default { getList() { this.loading = true; this.queryParams.status = '0'; + const classId = this.$route.query.id; + if (classId !== null){ + this.queryParams.classId = classId; + } listCourseOnline(this.queryParams).then(response => { this.courseOnlineList = response.rows; this.total = response.total; diff --git a/inspur-ui/src/views/operations/courseVideo/index.vue b/inspur-ui/src/views/operations/courseVideo/index.vue index 1f63d40..dc98f3a 100644 --- a/inspur-ui/src/views/operations/courseVideo/index.vue +++ b/inspur-ui/src/views/operations/courseVideo/index.vue @@ -337,6 +337,10 @@ export default { getList() { this.loading = true; this.queryParams.status = '0'; + const courseId = this.$route.query.id; + if (courseId !== null){ + this.queryParams.courseId = courseId; + } listCourseVideo(this.queryParams).then(response => { this.courseVideoList = response.rows; this.total = response.total; diff --git a/inspur-ui/src/views/operations/document/index.vue b/inspur-ui/src/views/operations/document/index.vue index bad7fdc..1164862 100644 --- a/inspur-ui/src/views/operations/document/index.vue +++ b/inspur-ui/src/views/operations/document/index.vue @@ -182,10 +182,10 @@ - 上传文件 - 重新上传 + 上传文件 + 重新上传 - + {{ form.fileName }} @@ -503,6 +503,10 @@ export default { getList() { this.loading = true; this.queryParams.status = '0'; + const docId = this.$route.query.id; + if (docId !== null){ + this.queryParams.docId = docId; + } listDocument(this.queryParams).then(response => { this.documentList = response.rows; this.total = response.total; diff --git a/inspur-ui/src/views/operations/manage/index.vue b/inspur-ui/src/views/operations/manage/index.vue index e34c673..19f6508 100644 --- a/inspur-ui/src/views/operations/manage/index.vue +++ b/inspur-ui/src/views/operations/manage/index.vue @@ -568,10 +568,10 @@ - 上传文件 - 重新上传 + 上传文件 + 重新上传 - + {{ form.fileName }}