走马灯调整

src/main/java/com/izouma/nineth/domain/MetaQuestion.java

@@ -46,5 +46,5 @@ public class MetaQuestion extends BaseEntity{
 
     @ApiModelProperty("用途")
     @ExcelProperty("用途")
-    private Long purpose;
+    private int application;
 }

src/main/java/com/izouma/nineth/repo/MetaQuestionRepo.java

@@ -15,5 +15,5 @@ public interface MetaQuestionRepo extends JpaRepository<MetaQuestion, Long>, Jpa
     @Transactional
     void softDelete(Long id);
 
-    List<MetaQuestion> findAllByPurpose(Long purpose);
+    List<MetaQuestion> findAllByApplicationAndDel(int application, boolean del);
 }

src/main/java/com/izouma/nineth/web/MetaQuestionController.java

@@ -59,12 +59,12 @@ public class MetaQuestionController extends BaseController {
         ExcelUtils.export(response, data);
     }
 
-    @GetMapping("/purpose/{purpose}/{num}")
-    public MetaRestResult<List<MetaQuestion>> purpose(@PathVariable Long purpose, @PathVariable int num){
-        List<MetaQuestion> metaQuestions = metaQuestionRepo.findAllByPurpose(purpose);
+    @GetMapping("/queryByApplication/{application}/{num}")
+    public MetaRestResult<List<MetaQuestion>> queryByApplication(@PathVariable int application, @PathVariable int num) {
+        List<MetaQuestion> metaQuestions = metaQuestionRepo.findAllByApplicationAndDel(application, false);
+        // 乱序
         Collections.shuffle(metaQuestions);
-        List<MetaQuestion> ometaQuestions = metaQuestions.subList(0,num);
-            return MetaRestResult.returnSuccess(ometaQuestions);
+        return MetaRestResult.returnSuccess(metaQuestions.subList(0, num));
     }
 }
 

src/main/vue/src/views/MetaEmailList.vue

@@ -46,7 +46,7 @@
 			<el-table-column prop="id" align="center" label="ID" width="100"> </el-table-column>
 			<el-table-column prop="title" align="center" label="邮件标题" width="200"> </el-table-column>
 			<el-table-column prop="author" align="center" label="邮件作者" width="100"> </el-table-column>
-			<el-table-column prop="description" align="center" label="邮件内容" width="500"> </el-table-column>
+			<el-table-column prop="description" align="center" label="邮件内容"> </el-table-column>
             <el-table-column prop="publish" align="center" label="是否发布" width="80">
                 <template slot-scope="{ row }">
                     <el-tag :type="row.publish ? '' : 'info'"> {{ row.publish }} </el-tag>

src/main/vue/src/views/MetaQuestionList.vue

@@ -51,6 +51,7 @@
 			<el-table-column prop="optionC" label="选项C"> </el-table-column>
 			<el-table-column prop="optionD" label="选项D"> </el-table-column>
 			<el-table-column prop="correct" label="正确选项" :formatter="correctFormatter"> </el-table-column>
+			<el-table-column prop="purpose" label="用途"> </el-table-column>
 			<el-table-column label="操作" align="center" fixed="right" width="150">
 				<template slot-scope="{ row }">
 					<el-button @click="editRow(row)" type="primary" size="mini" plain> 编辑 </el-button>