From 3fae025239c5af9dc0977a991b57202691354e65 Mon Sep 17 00:00:00 2001 From: zhujunjieit Date: Fri, 18 Jan 2019 23:34:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F/=E6=88=91?= =?UTF-8?q?=E7=9A=84=E9=94=99=E9=A2=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/tool/UploadFileController.java | 35 +++++++++ .../ApiUserCollectionQuestionController.java | 2 +- .../exam/domain/ExamUserErrorQuestionVO.java | 6 +- .../ExamUserCollectionQuestionMapper.java | 9 ++- .../mapper/ExamUserErrorQuestionMapper.java | 25 +++++-- ...ExamUserCollectionQuestionServiceImpl.java | 36 +++++----- .../ExamUserErrorQuestionServiceImpl.java | 2 +- .../exam/ExamUserCollectionQuestionMapper.xml | 67 +++++++++++++++-- .../exam/ExamUserErrorQuestionMapper.xml | 72 ++++++++++++++++++- .../train/course/trainCourse/add.html | 4 +- .../train/course/trainCourse/edit.html | 7 +- .../train/course/trainCourseSection/add.html | 4 +- 12 files changed, 223 insertions(+), 46 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/UploadFileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/UploadFileController.java index 230380206..5ab33479a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/UploadFileController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/UploadFileController.java @@ -10,14 +10,19 @@ import com.ruoyi.common.utils.ExcelUtil; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.framework.shiro.service.SysPasswordService; import com.ruoyi.framework.web.base.BaseController; +import com.ruoyi.framework.web.exception.user.OssException; import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.framework.web.util.FileUploadUtils; import com.ruoyi.framework.web.util.ShiroUtils; +import com.ruoyi.system.domain.SysOss; import com.ruoyi.system.domain.SysUser; +import com.ruoyi.system.service.ISysOssService; import com.ruoyi.system.service.ISysPostService; import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysUserService; import com.ruoyi.web.controller.system.SysProfileController; +import com.ruoyi.web.controller.system.cloud.CloudStorageService; +import com.ruoyi.web.controller.system.cloud.OSSFactory; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,6 +34,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.io.File; +import java.util.Date; import java.util.List; /** @@ -42,6 +48,8 @@ public class UploadFileController extends BaseController { private static final Logger log = LoggerFactory.getLogger( UploadFileController.class ); + @Autowired + private ISysOssService sysOssService; /** * 上传文件 */ @@ -71,4 +79,31 @@ public class UploadFileController extends BaseController { } } + /** + * 上传文件 + */ + /** + * 上传文件 + */ + @Log(title = "OSS上传文件", businessType = BusinessType.INSERT) + @PostMapping("/oss") + public AjaxResult upload(@RequestParam("file") MultipartFile file, String module) throws Exception { + if (file.isEmpty()) { + throw new OssException( "上传文件不能为空" ); + } + // 上传文件 + String fileName = file.getOriginalFilename(); + String suffix = fileName.substring( fileName.lastIndexOf( "." ) ); + CloudStorageService storage = OSSFactory.build(); + String url = storage.uploadSuffix( file.getBytes(), suffix ); + // 保存文件信息 + SysOss ossEntity = new SysOss(); + ossEntity.setUrl( url ); + ossEntity.setFileSuffix( suffix ); + ossEntity.setCreateBy( ShiroUtils.getLoginName() ); + ossEntity.setFileName( fileName ); + ossEntity.setCreateTime( new Date() ); + ossEntity.setService( storage.getService() ); + return toAjax( sysOssService.save( ossEntity ) ).put( "data", ossEntity.getUrl() ); + } } \ No newline at end of file diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiUserCollectionQuestionController.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiUserCollectionQuestionController.java index 9bde72c98..b753b5f2c 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiUserCollectionQuestionController.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiUserCollectionQuestionController.java @@ -78,7 +78,7 @@ public class ApiUserCollectionQuestionController extends BaseController { ExamUserCollectionQuestionVO examUserCollectionQuestion = new ExamUserCollectionQuestionVO(); SysUser sysUser = sysUserService.selectUserByLoginName( JwtUtil.getLoginName() ); examUserCollectionQuestion.setVipUserId( sysUser.getUserId().intValue() ); - List list = examUserCollectionQuestionService.selectExamUserCollectionQuestionPage( examUserCollectionQuestion ); + List list = examUserCollectionQuestionService.selectExamUserCollectionQuestionList( examUserCollectionQuestion ); AjaxResult success = success( "查询我的收藏成功" ); success.put( "data", list ); return success; diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamUserErrorQuestionVO.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamUserErrorQuestionVO.java index 7e4f65785..8d90684e7 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamUserErrorQuestionVO.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamUserErrorQuestionVO.java @@ -4,13 +4,13 @@ package com.ruoyi.exam.domain; * Created by flower on 2019/1/10. */ public class ExamUserErrorQuestionVO extends ExamUserErrorQuestion { - private ExamQuestion question; + private ExamQuestionVO question; - public ExamQuestion getQuestion() { + public ExamQuestionVO getQuestion() { return question; } - public void setQuestion(ExamQuestion question) { + public void setQuestion(ExamQuestionVO question) { this.question = question; } } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamUserCollectionQuestionMapper.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamUserCollectionQuestionMapper.java index eb2ad976d..ff0034889 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamUserCollectionQuestionMapper.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamUserCollectionQuestionMapper.java @@ -22,5 +22,12 @@ public interface ExamUserCollectionQuestionMapper extends MyMapper selectExamUserCollectionQuestionList(ExamUserCollectionQuestionVO examUserCollectionQuestion); - + /** + * 查询我的收藏列表详情（包含题目选项） + * + * @param examUserCollectionQuestion 我的收藏信息 + * @return 我的收藏集合 + */ + public List selectExamUserCollectionQuestionDetailList(ExamUserCollectionQuestionVO examUserCollectionQuestion); + } \ No newline at end of file diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamUserErrorQuestionMapper.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamUserErrorQuestionMapper.java index 000645b74..ab236d3bc 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamUserErrorQuestionMapper.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamUserErrorQuestionMapper.java @@ -8,7 +8,7 @@ import com.ruoyi.framework.web.base.MyMapper; /** * 我的错题 数据层 - * + * * @author zhujj * @date 2019-01-10 */ @@ -16,12 +16,25 @@ public interface ExamUserErrorQuestionMapper extends MyMapper selectExamUserErrorQuestionList(ExamUserErrorQuestion examUserErrorQuestion); + /** + * 查询错题列表 + * @param examUserErrorQuestion + * @return + */ List selectExamUserErrorQuestionDetailPage(ExamUserErrorQuestion examUserErrorQuestion); + + /** + * 查询错题列表（包含选项） + * @param examUserErrorQuestion + * @return + */ + List selectExamUserErrorQuestionDetailList(ExamUserErrorQuestion examUserErrorQuestion); + } \ No newline at end of file diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamUserCollectionQuestionServiceImpl.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamUserCollectionQuestionServiceImpl.java index 0cc7a9fbd..b9f989bc8 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamUserCollectionQuestionServiceImpl.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamUserCollectionQuestionServiceImpl.java @@ -22,24 +22,6 @@ public class ExamUserCollectionQuestionServiceImpl extends AbstractBaseServiceIm @Autowired private ExamUserCollectionQuestionMapper examUserCollectionQuestionMapper; - - /** - * 查询我的收藏列表 - * - * @param examUserCollectionQuestion 我的收藏信息 - * @return 我的收藏集合 - */ - @Override - public List selectExamUserCollectionQuestionList(ExamUserCollectionQuestionVO examUserCollectionQuestion) - { - return examUserCollectionQuestionMapper.selectExamUserCollectionQuestionList(examUserCollectionQuestion); - } - - @Override - public int insertSelectiveBySelf(ExamUserCollectionQuestion examUserCollectionQuestion) { - return examUserCollectionQuestionMapper.insertSelective(examUserCollectionQuestion); - } - /** * 查询我的收藏分页列表 * @@ -52,5 +34,23 @@ public class ExamUserCollectionQuestionServiceImpl extends AbstractBaseServiceIm startPage(); return examUserCollectionQuestionMapper.selectExamUserCollectionQuestionList(examUserCollectionQuestion); } + /** + * 查询我的收藏列表(包含题目选项) + * + * @param examUserCollectionQuestion 我的收藏信息 + * @return 我的收藏集合 + */ + @Override + public List selectExamUserCollectionQuestionList(ExamUserCollectionQuestionVO examUserCollectionQuestion) + { + return examUserCollectionQuestionMapper.selectExamUserCollectionQuestionDetailList(examUserCollectionQuestion); + } + + @Override + public int insertSelectiveBySelf(ExamUserCollectionQuestion examUserCollectionQuestion) { + return examUserCollectionQuestionMapper.insertSelective(examUserCollectionQuestion); + } + + } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamUserErrorQuestionServiceImpl.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamUserErrorQuestionServiceImpl.java index d9a902c79..754742584 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamUserErrorQuestionServiceImpl.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamUserErrorQuestionServiceImpl.java @@ -41,7 +41,7 @@ public class ExamUserErrorQuestionServiceImpl extends AbstractBaseServiceImpl selectExamUserErrorQuestionDetailList(ExamUserErrorQuestion examUserErrorQuestion) { - return examUserErrorQuestionMapper.selectExamUserErrorQuestionDetailPage(examUserErrorQuestion); + return examUserErrorQuestionMapper.selectExamUserErrorQuestionDetailList(examUserErrorQuestion); } @Override public int insertError(ExamUserErrorQuestion examUserErrorQuestion) { diff --git a/ruoyi-exam/src/main/resources/mapper/exam/ExamUserCollectionQuestionMapper.xml b/ruoyi-exam/src/main/resources/mapper/exam/ExamUserCollectionQuestionMapper.xml index 5c233cf7e..95a699f1c 100644 --- a/ruoyi-exam/src/main/resources/mapper/exam/ExamUserCollectionQuestionMapper.xml +++ b/ruoyi-exam/src/main/resources/mapper/exam/ExamUserCollectionQuestionMapper.xml @@ -15,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -30,7 +30,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + eucq.id, eucq.vip_user_id, eucq.exam_question_id, eucq.create_by, eucq.create_date, eucq.update_by, eucq.update_date, eucq.remarks, eucq.del_flag @@ -44,10 +77,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" eq.type as eq_type, eq.label as eq_label, eq.category_id as eq_category_id, - eq.create_by as eq_create_by, - eq.create_date as eq_create_date, - eq.update_by as eq_update_by, - eq.update_date as eq_update_date, eq.remarks as eq_remarks, eq.del_flag as eq_del_flag from exam_user_collection_question eucq @@ -60,5 +89,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + \ No newline at end of file diff --git a/ruoyi-exam/src/main/resources/mapper/exam/ExamUserErrorQuestionMapper.xml b/ruoyi-exam/src/main/resources/mapper/exam/ExamUserErrorQuestionMapper.xml index 8d45bdda4..15dac5e1f 100644 --- a/ruoyi-exam/src/main/resources/mapper/exam/ExamUserErrorQuestionMapper.xml +++ b/ruoyi-exam/src/main/resources/mapper/exam/ExamUserErrorQuestionMapper.xml @@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -41,7 +41,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + euq.id, euq.vip_user_id, euq.exam_question_id, euq.create_by, euq.create_date, euq.update_by, euq.update_date, euq.remarks, euq.del_flag @@ -91,5 +123,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + \ No newline at end of file diff --git a/ruoyi-train/src/main/resources/templates/train/course/trainCourse/add.html b/ruoyi-train/src/main/resources/templates/train/course/trainCourse/add.html index a9f014cf5..e4cdf0a96 100644 --- a/ruoyi-train/src/main/resources/templates/train/course/trainCourse/add.html +++ b/ruoyi-train/src/main/resources/templates/train/course/trainCourse/add.html @@ -107,7 +107,7 @@ //普通图片上传 var uploadInst = upload.render({ elem: '#test1' - ,url: '/upload/files' + ,url: '/upload/oss' ,data:{module:"train/course"}//文件存放路径 ,before: function(obj){ //预读本地文件示例，不支持ie8 @@ -122,7 +122,7 @@ } //上传成功 if(res.code ==200){ - $("#cover").val(res.fileName) + $("#cover").val(res.data) return layer.msg('上传成功'); } } diff --git a/ruoyi-train/src/main/resources/templates/train/course/trainCourse/edit.html b/ruoyi-train/src/main/resources/templates/train/course/trainCourse/edit.html index bbb567dfd..537a82e85 100644 --- a/ruoyi-train/src/main/resources/templates/train/course/trainCourse/edit.html +++ b/ruoyi-train/src/main/resources/templates/train/course/trainCourse/edit.html @@ -39,7 +39,7 @@
- +

@@ -108,7 +108,7 @@ //普通图片上传 var uploadInst = upload.render({ elem: '#test1' - ,url: '/upload/files' + ,url: '/upload/oss' ,data:{module:"train/course"}//文件存放路径 ,before: function(obj){ //预读本地文件示例，不支持ie8 @@ -117,13 +117,14 @@ }); } ,done: function(res){ + debugger; //如果上传失败 if(res.code !=200){ return layer.msg('上传失败'); } //上传成功 if(res.code ==200){ - $("#cover").val(res.fileName) + $("#cover").val(res.data) return layer.msg('上传成功'); } } diff --git a/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/add.html b/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/add.html index 4fd198bca..2cf79009d 100644 --- a/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/add.html +++ b/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/add.html @@ -81,7 +81,7 @@ var demoListView = $('#demoList') ,uploadListIns = upload.render({ elem: '#testList' - ,url: '/upload/files' + ,url: '/upload/oss' ,data:{module:"train/courseware"}//文件存放路径 ,accept: 'file' ,multiple: true @@ -122,7 +122,7 @@ ,tds = tr.children(); tds.eq(2).html('上传成功'); tds.eq(3).html(''); //清空操作 - fileList.push(res.fileName); + fileList.push(res.data); return delete this.files[index]; //删除文件队列已经上传成功的文件 } this.error(index, upload);