From 789e2280550ddf053172a8e8216b0717f2b52783 Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Fri, 18 Feb 2022 16:52:17 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=AF=8F=E6=97=A5=E4=B8=80=E5=8F=A5?=
 =?UTF-8?q?=E5=B0=B1=E6=A8=A1=E5=9D=97=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96=E3=80=81=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/business/openapi/aword/index.vue    | 52 +++++++++----------
 .../aword/controller/ApiAWordController.java  |  3 +-
 .../java/com/xjs/aword/domain/ApiAWord.java   |  5 ++
 3 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/ruoyi-ui/src/views/business/openapi/aword/index.vue b/ruoyi-ui/src/views/business/openapi/aword/index.vue
index cedfc66b..31c34720 100644
--- a/ruoyi-ui/src/views/business/openapi/aword/index.vue
+++ b/ruoyi-ui/src/views/business/openapi/aword/index.vue
@@ -7,6 +7,7 @@
           placeholder="请输入句子内容"
           clearable
           size="small"
+          maxlength="100"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -16,6 +17,7 @@
           placeholder="请输入来源"
           clearable
           size="small"
+          maxlength="50"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -25,6 +27,7 @@
           placeholder="请输入释义"
           clearable
           size="small"
+          maxlength="100"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -61,28 +64,34 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="awordList" @selection-change="handleSelectionChange">
+    <el-table  v-loading="loading" :data="awordList" @selection-change="handleSelectionChange">
+      <el-table-column type="expand">
+        <template slot-scope="props">
+          <el-form label-position="left" inline class="">
+            <el-form-item label="">
+              <el-image
+                style="width: 108px; height: 141px"
+                :src="props.row.imgurl"
+                :preview-src-list="[props.row.imgurl]">
+              </el-image>
+            </el-form-item>
+          </el-form>
+        </template>
+      </el-table-column>
+
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="数据ID" align="center" prop="dataId" width="100px"/>
-      <el-table-column label="句子内容" align="center" prop="content"/>
-      <el-table-column label="来源" align="center" prop="source" width="150px"/>
-      <el-table-column label="释义" align="center" prop="note"/>
-      <el-table-column label="音频地址" align="center" prop="tts"width="350px">
+      <el-table-column label="句子内容" align="center" prop="content" :show-overflow-tooltip="true"/>
+      <el-table-column label="来源" align="center" prop="source" width="150px" :show-overflow-tooltip="true"/>
+      <el-table-column label="释义" align="center" prop="note" :show-overflow-tooltip="true"/>
+      <el-table-column label="音频地址" align="center" prop="tts" width="350px">
         <template slot-scope="scope">
           <audio :src="scope.row.tts" controls="controls">
             您的浏览器不支持 audio 标签。
           </audio>
         </template>
       </el-table-column>
-      <el-table-column label="图片地址" align="center" prop="imgurl">
-        <template slot-scope="scope">
-          <el-image
-            style="width: 108px; height: 141px"
-            :src="scope.row.imgurl"
-            :preview-src-list="[scope.row.imgurl]">
-          </el-image>
-        </template>
-      </el-table-column>
+
       <el-table-column label="句子产生时间" align="center" prop="date" width="150px">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.date, '{y}-{m}-{d}') }}</span>
@@ -110,19 +119,11 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改每日一句对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import {listAword, getAword, delAword} from "@/api/business/openapi/aword";
+import {listAword, delAword} from "@/api/business/openapi/aword";
 
 export default {
   name: "Aword",
@@ -149,15 +150,14 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 3,
+        pageSize: 7,
         content: null,
         source: null,
         note: null,
       },
       // 表单参数
       form: {},
-      // 表单校验
-      rules: {}
+
     };
   },
   created() {
diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/aword/controller/ApiAWordController.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/aword/controller/ApiAWordController.java
index f90ba64e..70991a27 100644
--- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/aword/controller/ApiAWordController.java
+++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/aword/controller/ApiAWordController.java
@@ -12,6 +12,7 @@ import com.xjs.aword.domain.ApiAWord;
 import com.xjs.aword.domain.RequestBody;
 import com.xjs.aword.factory.AWordFactory;
 import com.xjs.aword.service.ApiAWordService;
+import com.xjs.validation.group.SelectGroup;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,7 +57,7 @@ public class ApiAWordController extends BaseController {
     @ApiOperation("查询每日一句列表")
     @RequiresPermissions("openapi:aword:list")
     @GetMapping("/list")
-    public TableDataInfo list(ApiAWord apiAWord) {
+    public TableDataInfo list(@Validated({SelectGroup.class}) ApiAWord apiAWord) {
         startPage();
         List<ApiAWord> list = apiAWordService.selectApiAWordList(apiAWord);
         return getDataTable(list);
diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/aword/domain/ApiAWord.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/aword/domain/ApiAWord.java
index c18fcfc5..2818f22a 100644
--- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/aword/domain/ApiAWord.java
+++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/aword/domain/ApiAWord.java
@@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
+import com.xjs.validation.group.SelectGroup;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -32,14 +34,17 @@ public class ApiAWord implements Serializable {
 
     /** 句子内容 */
     @Excel(name = "句子内容")
+    @Size(max = 255, message = "请控制句子内容长度在255字符", groups = { SelectGroup.class})
     private String content;
 
     /** 来源 */
     @Excel(name = "来源")
+    @Size(max = 50, message = "请控制来源长度在50字符", groups = { SelectGroup.class})
     private String source;
 
     /** 释义 */
     @Excel(name = "释义")
+    @Size(max = 255, message = "请控制释义长度在255字符", groups = { SelectGroup.class})
     private String note;
 
     /** 音频地址 */