diff --git a/inspur-service/inspur-admin/pom.xml b/inspur-service/inspur-admin/pom.xml index eed141b..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 + @@ -84,7 +90,12 @@ 3.8.7 compile - + + com.inspur + inspur-community + 3.8.7 + compile + diff --git a/inspur-service/inspur-admin/src/main/java/com/inspur/web/controller/community/CommunityPostInfoController.java b/inspur-service/inspur-admin/src/main/java/com/inspur/web/controller/community/CommunityPostInfoController.java new file mode 100644 index 0000000..c4f6f42 --- /dev/null +++ b/inspur-service/inspur-admin/src/main/java/com/inspur/web/controller/community/CommunityPostInfoController.java @@ -0,0 +1,118 @@ +package com.inspur.web.controller.community; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.inspur.community.domain.vo.CommunityPostInfoVO; +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.community.domain.CommunityPostInfo; +import com.inspur.community.service.ICommunityPostInfoService; +import com.inspur.common.utils.poi.ExcelUtil; +import com.inspur.common.core.page.TableDataInfo; + +/** + * 社区帖子信息Controller + * + * @author inspur + * @date 2024-04-26 + */ +@RestController +@RequestMapping("/community/info") +public class CommunityPostInfoController extends BaseController +{ + @Autowired + private ICommunityPostInfoService communityPostInfoService; + + /** + * 查询社区帖子信息列表 + */ + @PreAuthorize("@ss.hasPermi('community:info:list')") + @GetMapping("/list") + public TableDataInfo list(CommunityPostInfo communityPostInfo) + { + startPage(); + List list = communityPostInfoService.selectCommunityPostInfoList(communityPostInfo); + return getDataTable(list); + } + + /** + * 导出社区帖子信息列表 + */ + @PreAuthorize("@ss.hasPermi('community:info:export')") + @Log(title = "社区帖子信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, CommunityPostInfo communityPostInfo) + { + List list = communityPostInfoService.selectCommunityPostInfoList(communityPostInfo); + ExcelUtil util = new ExcelUtil(CommunityPostInfoVO.class); + util.exportExcel(response, list, "社区帖子信息数据"); + } + + /** + * 获取社区帖子信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('community:info:query')") + @GetMapping(value = "/{postId}") + public AjaxResult getInfo(@PathVariable("postId") String postId) + { + return success(communityPostInfoService.selectCommunityPostInfoByPostId(postId)); + } + + /** + * 新增社区帖子信息 + */ + @PreAuthorize("@ss.hasPermi('community:info:add')") + @Log(title = "社区帖子信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody CommunityPostInfo communityPostInfo) + { + return toAjax(communityPostInfoService.insertCommunityPostInfo(communityPostInfo)); + } + + + /** + * 修改社区帖子信息 + */ + @PreAuthorize("@ss.hasPermi('community:info:edit')") + @Log(title = "社区帖子信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody CommunityPostInfo communityPostInfo) + { + return toAjax(communityPostInfoService.updateCommunityPostInfo(communityPostInfo)); + } + + /** + * 添加浏览量 + */ + @Log(title = "社区帖子信息", businessType = BusinessType.UPDATE) + @PutMapping("/addViews/{postId}") + public AjaxResult addViews(@PathVariable("postId") String postId) + { + return toAjax(communityPostInfoService.addViews(postId)); + } + + /** + * 删除社区帖子信息 + */ + @PreAuthorize("@ss.hasPermi('community:info:remove')") + @Log(title = "社区帖子信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{postIds}") + public AjaxResult remove(@PathVariable String[] postIds) + { + return toAjax(communityPostInfoService.deleteCommunityPostInfoByPostIds(postIds)); + } +} + 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-community/pom.xml b/inspur-service/inspur-community/pom.xml new file mode 100644 index 0000000..9d1285d --- /dev/null +++ b/inspur-service/inspur-community/pom.xml @@ -0,0 +1,32 @@ + + + + inspur + com.inspur + 3.8.7 + + + 4.0.0 + + inspur-community + + 运维社区模块 + + + + com.inspur + inspur-common + + + + com.inspur + inspur-system + + + org.projectlombok + lombok + + + diff --git a/inspur-service/inspur-community/src/main/java/com/inspur/community/domain/CommunityPostInfo.java b/inspur-service/inspur-community/src/main/java/com/inspur/community/domain/CommunityPostInfo.java new file mode 100644 index 0000000..2552249 --- /dev/null +++ b/inspur-service/inspur-community/src/main/java/com/inspur/community/domain/CommunityPostInfo.java @@ -0,0 +1,183 @@ +package com.inspur.community.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.inspur.common.annotation.Excel; +import com.inspur.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 社区帖子信息对象 community_post_info + * + * @author zhangjunwen + * @date 2024-04-26 + */ +public class CommunityPostInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String postId; + + /** 帖子类型，0 经验交流 1 困难求助 2 观点吐槽 3 其他 */ + @Excel(name = "帖子类型，0 经验交流 1 困难求助 2 观点吐槽 3 其他") + private String postType; + + /** 运维领域：0故障机理、1信号采集方案、2信号处理方法、3维保策略 */ + @Excel(name = "运维领域：0故障机理、1信号采集方案、2信号处理方法、3维保策略") + private String omField; + + /** 运维行业：0 纺织，1 陶瓷，2 化工 */ + @Excel(name = "运维行业：0 纺织，1 陶瓷，2 化工") + private String omIndustry; + + /** 帖子标题 */ + @Excel(name = "帖子标题") + private String postTitle; + + /** 帖子内容 */ + @Excel(name = "帖子内容") + private String postContent; + + /** 发布时间 */ + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") + @Excel(name = "发布时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss") + private Date postTime; + + /** 发布人 */ + @Excel(name = "发布人") + private Long userId; + + /** 最后编辑时间 */ + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") + @Excel(name = "最后编辑时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss") + private Date lastEditTime; + + /** + * 浏览量 + */ + private String views; + + /** 状态：0 正常；1 封禁；2 删除 */ + @Excel(name = "状态：0 正常；1 封禁；2 删除") + private String status; + + public void setPostId(String postId) + { + this.postId = postId; + } + + public String getPostId() + { + return postId; + } + public void setPostType(String postType) + { + this.postType = postType; + } + + public String getPostType() + { + return postType; + } + public void setOmField(String omField) + { + this.omField = omField; + } + + public String getOmField() + { + return omField; + } + public void setOmIndustry(String omIndustry) + { + this.omIndustry = omIndustry; + } + + public String getOmIndustry() + { + return omIndustry; + } + public void setPostTitle(String postTitle) + { + this.postTitle = postTitle; + } + + public String getPostTitle() + { + return postTitle; + } + public void setPostContent(String postContent) + { + this.postContent = postContent; + } + + public String getPostContent() + { + return postContent; + } + public void setPostTime(Date postTime) + { + this.postTime = postTime; + } + + public Date getPostTime() + { + return postTime; + } + public void setUserId(Long userId) + { + this.userId = userId; + } + + public Long getUserId() + { + return userId; + } + public void setLastEditTime(Date lastEditTime) + { + this.lastEditTime = lastEditTime; + } + + public Date getLastEditTime() + { + return lastEditTime; + } + + public String getViews() { + return views; + } + + public void setViews(String views) { + this.views = views; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("postId", getPostId()) + .append("postType", getPostType()) + .append("omField", getOmField()) + .append("omIndustry", getOmIndustry()) + .append("postTitle", getPostTitle()) + .append("postContent", getPostContent()) + .append("postTime", getPostTime()) + .append("userId", getUserId()) + .append("lastEditTime", getLastEditTime()) + .append("views", getViews()) + .append("status", getStatus()) + .toString(); + } +} + diff --git a/inspur-service/inspur-community/src/main/java/com/inspur/community/domain/vo/CommunityPostInfoVO.java b/inspur-service/inspur-community/src/main/java/com/inspur/community/domain/vo/CommunityPostInfoVO.java new file mode 100644 index 0000000..e480966 --- /dev/null +++ b/inspur-service/inspur-community/src/main/java/com/inspur/community/domain/vo/CommunityPostInfoVO.java @@ -0,0 +1,43 @@ +package com.inspur.community.domain.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.inspur.common.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * @Author zhangjunwen + * @create 2024/4/30 + */ +@Data +public class CommunityPostInfoVO { + + private String postId; + + private String postType; + + private String omField; + + private String omIndustry; + + private String postTitle; + + private String postContent; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date postTime; + + private Long userId; + + private String userName; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date lastEditTime; + + private long views; + + private String status; + + +} diff --git a/inspur-service/inspur-community/src/main/java/com/inspur/community/mapper/CommunityPostInfoMapper.java b/inspur-service/inspur-community/src/main/java/com/inspur/community/mapper/CommunityPostInfoMapper.java new file mode 100644 index 0000000..52cb930 --- /dev/null +++ b/inspur-service/inspur-community/src/main/java/com/inspur/community/mapper/CommunityPostInfoMapper.java @@ -0,0 +1,70 @@ +package com.inspur.community.mapper; + +import java.util.List; +import com.inspur.community.domain.CommunityPostInfo; +import com.inspur.community.domain.vo.CommunityPostInfoVO; + +/** + * 社区帖子信息Mapper接口 + * + * @author inspur + * @date 2024-04-26 + */ +public interface CommunityPostInfoMapper +{ + /** + * 查询社区帖子信息 + * + * @param postId 社区帖子信息主键 + * @return 社区帖子信息 + */ + public CommunityPostInfoVO selectCommunityPostInfoByPostId(String postId); + + /** + * 查询社区帖子信息列表 + * + * @param communityPostInfo 社区帖子信息 + * @return 社区帖子信息集合 + */ + public List selectCommunityPostInfoList(CommunityPostInfo communityPostInfo); + + /** + * 新增社区帖子信息 + * + * @param communityPostInfo 社区帖子信息 + * @return 结果 + */ + public int insertCommunityPostInfo(CommunityPostInfo communityPostInfo); + + /** + * 修改社区帖子信息 + * + * @param communityPostInfo 社区帖子信息 + * @return 结果 + */ + public int updateCommunityPostInfo(CommunityPostInfo communityPostInfo); + + /** + * 添加浏览量 + * @param postId + * @return + */ + public int addViews(String postId); + + /** + * 删除社区帖子信息 + * + * @param postId 社区帖子信息主键 + * @return 结果 + */ + public int deleteCommunityPostInfoByPostId(String postId); + + /** + * 批量删除社区帖子信息 + * + * @param postIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteCommunityPostInfoByPostIds(String[] postIds); +} + diff --git a/inspur-service/inspur-community/src/main/java/com/inspur/community/service/ICommunityPostInfoService.java b/inspur-service/inspur-community/src/main/java/com/inspur/community/service/ICommunityPostInfoService.java new file mode 100644 index 0000000..2d7c1b5 --- /dev/null +++ b/inspur-service/inspur-community/src/main/java/com/inspur/community/service/ICommunityPostInfoService.java @@ -0,0 +1,70 @@ +package com.inspur.community.service; + +import java.util.List; +import com.inspur.community.domain.CommunityPostInfo; +import com.inspur.community.domain.vo.CommunityPostInfoVO; + +/** + * 社区帖子信息Service接口 + * + * @author zhangjunwen + * @date 2024-04-26 + */ +public interface ICommunityPostInfoService +{ + /** + * 查询社区帖子信息 + * + * @param postId 社区帖子信息主键 + * @return 社区帖子信息 + */ + public CommunityPostInfoVO selectCommunityPostInfoByPostId(String postId); + + /** + * 查询社区帖子信息列表 + * + * @param communityPostInfo 社区帖子信息 + * @return 社区帖子信息集合 + */ + public List selectCommunityPostInfoList(CommunityPostInfo communityPostInfo); + + /** + * 新增社区帖子信息 + * + * @param communityPostInfo 社区帖子信息 + * @return 结果 + */ + public int insertCommunityPostInfo(CommunityPostInfo communityPostInfo); + + /** + * 修改社区帖子信息 + * + * @param communityPostInfo 社区帖子信息 + * @return 结果 + */ + public int updateCommunityPostInfo(CommunityPostInfo communityPostInfo); + + /** + * 添加浏览量 + * @param postId + * @return + */ + public int addViews(String postId); + + /** + * 批量删除社区帖子信息 + * + * @param postIds 需要删除的社区帖子信息主键集合 + * @return 结果 + */ + public int deleteCommunityPostInfoByPostIds(String[] postIds); + + /** + * 删除社区帖子信息信息 + * + * @param postId 社区帖子信息主键 + * @return 结果 + */ + public int deleteCommunityPostInfoByPostId(String postId); +} + diff --git a/inspur-service/inspur-community/src/main/java/com/inspur/community/service/impl/CommunityPostInfoServiceImpl.java b/inspur-service/inspur-community/src/main/java/com/inspur/community/service/impl/CommunityPostInfoServiceImpl.java new file mode 100644 index 0000000..f44d830 --- /dev/null +++ b/inspur-service/inspur-community/src/main/java/com/inspur/community/service/impl/CommunityPostInfoServiceImpl.java @@ -0,0 +1,113 @@ +package com.inspur.community.service.impl; + +import java.util.Date; +import java.util.List; + +import com.inspur.common.utils.SecurityUtils; +import com.inspur.common.utils.uuid.IdUtils; +import com.inspur.community.domain.vo.CommunityPostInfoVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.inspur.community.mapper.CommunityPostInfoMapper; +import com.inspur.community.domain.CommunityPostInfo; +import com.inspur.community.service.ICommunityPostInfoService; + +/** + * 社区帖子信息Service业务层处理 + * + * @author zhangjunwen + * @date 2024-04-26 + */ +@Service +public class CommunityPostInfoServiceImpl implements ICommunityPostInfoService +{ + @Autowired + private CommunityPostInfoMapper communityPostInfoMapper; + + /** + * 查询社区帖子信息 + * + * @param postId 社区帖子信息主键 + * @return 社区帖子信息 + */ + @Override + public CommunityPostInfoVO selectCommunityPostInfoByPostId(String postId) + { + return communityPostInfoMapper.selectCommunityPostInfoByPostId(postId); + } + + /** + * 查询社区帖子信息列表 + * + * @param communityPostInfo 社区帖子信息 + * @return 社区帖子信息 + */ + @Override + public List selectCommunityPostInfoList(CommunityPostInfo communityPostInfo) + { + return communityPostInfoMapper.selectCommunityPostInfoList(communityPostInfo); + } + + /** + * 新增社区帖子信息 + * + * @param communityPostInfo 社区帖子信息 + * @return 结果 + */ + @Override + public int insertCommunityPostInfo(CommunityPostInfo communityPostInfo) + { + communityPostInfo.setPostId(IdUtils.simpleUUID()); + communityPostInfo.setPostTime(new Date()); + communityPostInfo.setUserId(SecurityUtils.getUserId()); + return communityPostInfoMapper.insertCommunityPostInfo(communityPostInfo); + } + + /** + * 修改社区帖子信息 + * + * @param communityPostInfo 社区帖子信息 + * @return 结果 + */ + @Override + public int updateCommunityPostInfo(CommunityPostInfo communityPostInfo) + { + communityPostInfo.setLastEditTime(new Date()); + return communityPostInfoMapper.updateCommunityPostInfo(communityPostInfo); + } + + /** + * 添加浏览量 + * @param postId + * @return + */ + @Override + public int addViews(String postId){ + return communityPostInfoMapper.addViews(postId); + } + + /** + * 批量删除社区帖子信息 + * + * @param postIds 需要删除的社区帖子信息主键 + * @return 结果 + */ + @Override + public int deleteCommunityPostInfoByPostIds(String[] postIds) + { + return communityPostInfoMapper.deleteCommunityPostInfoByPostIds(postIds); + } + + /** + * 删除社区帖子信息信息 + * + * @param postId 社区帖子信息主键 + * @return 结果 + */ + @Override + public int deleteCommunityPostInfoByPostId(String postId) + { + return communityPostInfoMapper.deleteCommunityPostInfoByPostId(postId); + } +} + diff --git a/inspur-service/inspur-community/src/main/resources/mapper/community/CommunityPostInfoMapper.xml b/inspur-service/inspur-community/src/main/resources/mapper/community/CommunityPostInfoMapper.xml new file mode 100644 index 0000000..6a02a37 --- /dev/null +++ b/inspur-service/inspur-community/src/main/resources/mapper/community/CommunityPostInfoMapper.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + select post_id, post_type, om_field, om_industry, post_title, post_content, post_time, a.user_id, last_edit_time,views, a.status, b.nick_name as user_name from community_post_info a + left join sys_user b on a.user_id = b.user_id + + + + + + + + insert into community_post_info + + post_id, + post_type, + om_field, + om_industry, + post_title, + post_content, + post_time, + user_id, + last_edit_time, + views, + mstatus, + + + #{postId}, + #{postType}, + #{omField}, + #{omIndustry}, + #{postTitle}, + #{postContent}, + #{postTime}, + #{userId}, + #{lastEditTime}, + #{views}, + #{status}, + + + + + update community_post_info + + post_type = #{postType}, + om_field = #{omField}, + om_industry = #{omIndustry}, + post_title = #{postTitle}, + post_content = #{postContent}, + post_time = #{postTime}, + user_id = #{userId}, + last_edit_time = #{lastEditTime}, + views = #{views}, + status = #{status}, + + where post_id = #{postId} + + + + + update community_post_info set views = views + 1 where post_id = #{postId} + + + + delete from community_post_info where post_id = #{postId} + + + + delete from community_post_info where post_id in + + #{postId} + + + \ No newline at end of file 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..29dac54 --- /dev/null +++ b/inspur-service/inspur-develop/src/main/java/com/inspur/develop/domain/LearningPathInfo.java @@ -0,0 +1,67 @@ +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; + + private String photoBase; + +} 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..e60ece6 --- /dev/null +++ b/inspur-service/inspur-develop/src/main/java/com/inspur/develop/service/impl/LearningPathInfoServiceImpl.java @@ -0,0 +1,148 @@ +package com.inspur.service.impl; + +import java.util.Base64; +import java.util.List; +import java.util.Objects; + +import cn.hutool.core.util.StrUtil; +import com.inspur.common.sftp.ISFTPServices; +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; + + @Autowired + private ISFTPServices sftpServices; + + /** + * 查询学习路径信息 + * + * @param id 学习路径信息主键 + * @return 学习路径信息 + */ + @Override + public LearningPathInfo selectLearningPathInfoById(String id) + { + LearningPathInfo learningPathInfo = learningPathInfoMapper.selectLearningPathInfoById(id); + if (Objects.nonNull(learningPathInfo)){ + learningPathInfo.setLearningPathCourseList(learningPathCourseService.selectLearningPathCourseByPathId(id)); + if (StringUtils.isNotEmpty(learningPathInfo.getFileName())){ + byte[] bytes = sftpServices.downLoadFile(learningPathInfo.getFileName()); + learningPathInfo.setPhotoBase("data:image/png;base64,"+Base64.getEncoder().encodeToString(bytes)); + } + } + 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 f4dc1bf..f38a8a6 100644 --- a/inspur-service/pom.xml +++ b/inspur-service/pom.xml @@ -174,6 +174,17 @@ inspur-order ${inspur.version} + + + com.inspur + inspur-community + ${inspur.version} + + + com.inspur + inspur-knowledgeBase + ${inspur.version} + @@ -186,8 +197,10 @@ inspur-common inspur-om inspur-order + inspur-community inspur-knowledgeBase inspur-operations + inspur-develop pom diff --git a/inspur-ui/src/api/community/info.js b/inspur-ui/src/api/community/info.js new file mode 100644 index 0000000..4e42fff --- /dev/null +++ b/inspur-ui/src/api/community/info.js @@ -0,0 +1,52 @@ +import request from "@/utils/request"; + +// 查询社区帖子信息列表 +export function listCommunityInfo(query) { + return request({ + url: "/community/info/list", + method: "get", + params: query, + }); +} + +// 查询社区帖子信息详细 +export function getCommunityInfo(postId) { + return request({ + url: "/community/info/" + postId, + method: "get", + }); +} + +// 新增社区帖子信息 +export function addCommunityInfo(data) { + return request({ + url: "/community/info", + method: "post", + data: data, + }); +} + +// 修改社区帖子信息 +export function updateCommunityInfo(data) { + return request({ + url: "/community/info", + method: "put", + data: data, + }); +} + +//浏览量加一 +export function addViews(postId) { + return request({ + url: "/community/info/addViews/" + postId, + method: "put", + }); +} + +// 删除社区帖子信息 +export function delCommunityInfo(postId) { + return request({ + url: "/community/info/" + postId, + method: "delete", + }); +} 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/components/Emoji/emoji.json b/inspur-ui/src/components/Emoji/emoji.json new file mode 100644 index 0000000..33975b6 --- /dev/null +++ b/inspur-ui/src/components/Emoji/emoji.json @@ -0,0 +1,3 @@ +{ + "data": ["😀","😁","😂","😃","😄","😅","😆","😉","😊","😋","😎","😍","😘","😗","😙","😚","😇","😐","😑","😶","😏","😣","😥","😮","😯","😪","😫","😴","😌","😛","😜","😝","😒","😓","😔","😕","😲","😷","😖","😞","😟","😤","😢","😭","😦","😧","😨","😬","😰","😱","😳","😵","😡","😠","💘","❤","💓","💔","💕","💖","💗","💙","💚","💛","💜","💝","💞","💟","❣","💪","👈","👉","☝","👆","👇","✌","✋","👌","👍","👎","✊","👊","👋","👏","👐","✍","🍇","🍈","🍉","🍊","🍋","🍌","🍍","🍎","🍏","🍐","🍑","🍒","🍓","🍅","🍆","🌽","🍄","🌰","🍞","🍖","🍗","🍔","🍟","🍕","🍳","🍲","🍱","🍘","🍙","🍚","🍛","🍜","🍝","🍠","🍢","🍣","🍤","🍥","🍡","🍦","🍧","🍨","🍩","🍪","🎂","🍰","🍫","🍬","🍭","🍮","🍯","🍼","☕","🍵","🍶","🍷","🍸","🍹","🍺","🍻","🍴","🌹","🍀","🍎","💰","📱","🌙","🍁","🍂","🍃","🌷","💎","🔪","🔫","🏀","⚽","⚡","👄","👍","🔥","🙈","🙉","🙊","🐵","🐒","🐶","🐕","🐩","🐺","🐱","😺","😸","😹","😻","😼","😽","🙀","😿","😾","🐈","🐯","🐅","🐆","🐴","🐎","🐮","🐂","🐃","🐄","🐷","🐖","🐗","🐽","🐏","🐑","🐐","🐪","🐫","🐘","🐭","🐁","🐀","🐹","🐰","🐇","🐻","🐨","🐼","🐾","🐔","🐓","🐣","🐤","🐥","🐦","🐧","🐸","🐊","🐢","🐍","🐲","🐉","🐳","🐋","🐬","🐟","🐠","🐡","🐙","🐚","🐌","🐛","🐜","🐝","🐞","🦋","😈","👿","👹","👺","💀","☠","👻","👽","👾","💣"] +} \ No newline at end of file diff --git a/inspur-ui/src/components/Emoji/index.vue b/inspur-ui/src/components/Emoji/index.vue new file mode 100644 index 0000000..431e7c6 --- /dev/null +++ b/inspur-ui/src/components/Emoji/index.vue @@ -0,0 +1,68 @@ + + + + + diff --git a/inspur-ui/src/views/community/comment/InputComponent.vue b/inspur-ui/src/views/community/comment/InputComponent.vue new file mode 100644 index 0000000..fcb6852 --- /dev/null +++ b/inspur-ui/src/views/community/comment/InputComponent.vue @@ -0,0 +1,204 @@ + + + + + diff --git a/inspur-ui/src/views/community/comment/Ipcomment.vue b/inspur-ui/src/views/community/comment/Ipcomment.vue new file mode 100644 index 0000000..d217f2b --- /dev/null +++ b/inspur-ui/src/views/community/comment/Ipcomment.vue @@ -0,0 +1,339 @@ + + + + + diff --git a/inspur-ui/src/views/community/comment/comments.vue b/inspur-ui/src/views/community/comment/comments.vue new file mode 100644 index 0000000..9b50ada --- /dev/null +++ b/inspur-ui/src/views/community/comment/comments.vue @@ -0,0 +1,369 @@ + + + + + + diff --git a/inspur-ui/src/views/community/forum/forumDetails.vue b/inspur-ui/src/views/community/forum/forumDetails.vue new file mode 100644 index 0000000..adbdf7c --- /dev/null +++ b/inspur-ui/src/views/community/forum/forumDetails.vue @@ -0,0 +1,437 @@ + + + + + + \ No newline at end of file diff --git a/inspur-ui/src/views/community/forum/forumForm.vue b/inspur-ui/src/views/community/forum/forumForm.vue new file mode 100644 index 0000000..ba78424 --- /dev/null +++ b/inspur-ui/src/views/community/forum/forumForm.vue @@ -0,0 +1,306 @@ + + + diff --git a/inspur-ui/src/views/community/forum/index.vue b/inspur-ui/src/views/community/forum/index.vue new file mode 100644 index 0000000..b4ca6e0 --- /dev/null +++ b/inspur-ui/src/views/community/forum/index.vue @@ -0,0 +1,927 @@ + + + + + + \ No newline at end of file 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..e451ed7 --- /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 }}