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

---
 .../src/views/business/log/apilog/index.vue   |   4 +-
 .../business/openapi/copywriting/index.vue    | 108 ++++++------------
 .../java/com/xjs/apilog/domain/ApiLog.java    |   4 +-
 .../controller/CopyWritingController.java     |   3 +-
 .../xjs/copywriting/domain/CopyWriting.java   |   4 +
 5 files changed, 48 insertions(+), 75 deletions(-)

diff --git a/ruoyi-ui/src/views/business/log/apilog/index.vue b/ruoyi-ui/src/views/business/log/apilog/index.vue
index 63dd4b46..0b95b222 100644
--- a/ruoyi-ui/src/views/business/log/apilog/index.vue
+++ b/ruoyi-ui/src/views/business/log/apilog/index.vue
@@ -33,7 +33,7 @@
           placeholder="请输入请求参数"
           clearable
           size="small"
-          maxlength="1000"
+          maxlength="100"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -44,7 +44,7 @@
           placeholder="请输入响应参数"
           clearable
           size="small"
-          maxlength="15000"
+          maxlength="100"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
diff --git a/ruoyi-ui/src/views/business/openapi/copywriting/index.vue b/ruoyi-ui/src/views/business/openapi/copywriting/index.vue
index 1a6811db..2fbb442c 100644
--- a/ruoyi-ui/src/views/business/openapi/copywriting/index.vue
+++ b/ruoyi-ui/src/views/business/openapi/copywriting/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>
@@ -36,6 +38,7 @@
           style="width: 240px"
           value-format="yyyy-MM-dd"
           type="daterange"
+          :picker-options="pickerOptions"
           range-separator="-"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
@@ -57,7 +60,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['openapi:copywriting:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -67,7 +71,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['openapi:copywriting:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
 
       <el-col :span="1.5">
@@ -78,15 +83,16 @@
           size="mini"
           @click="delRepeatCopyWriting"
           v-hasPermi="['openapi:copywriting:remove']"
-        >删除重复文案</el-button>
+        >删除重复文案
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="copyWritingList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="文案内容" align="center" prop="content" :show-overflow-tooltip="true" width="700px"/>
-      <el-table-column label="文案来源" align="center" prop="source" :show-overflow-tooltip="true" />
+      <el-table-column label="文案来源" align="center" prop="source" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180" :show-overflow-tooltip="true">
       </el-table-column>
       <el-table-column label="文案类型" align="center" prop="type" :show-overflow-tooltip="true">
@@ -97,20 +103,20 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px">
         <template slot-scope="scope">
           <el-tooltip class="item" effect="dark" content="点击查看详情" placement="top-start">
-          <el-button circle
-            type=""
-            icon="el-icon-view"
-            @click="handleView(scope.row,scope.index)"
-            v-hasPermi="['openapi:copywriting:query']"
-          ></el-button>
+            <el-button circle
+                       type=""
+                       icon="el-icon-view"
+                       @click="handleView(scope.row,scope.index)"
+                       v-hasPermi="['openapi:copywriting:query']"
+            ></el-button>
           </el-tooltip>
           <el-tooltip class="item" effect="dark" content="点击删除" placement="top-start">
-          <el-button circle
-            type="danger"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['openapi:copywriting:remove']"
-          ></el-button>
+            <el-button circle
+                       type="danger"
+                       icon="el-icon-delete"
+                       @click="handleDelete(scope.row)"
+                       v-hasPermi="['openapi:copywriting:remove']"
+            ></el-button>
           </el-tooltip>
         </template>
       </el-table-column>
@@ -141,11 +147,13 @@
 </template>
 
 <script>
-import { listCopyWriting, getCopyWriting,delRepeatCopyWriting, delCopyWriting } from "@/api/business/openapi/copywriting";
+import {listCopyWriting, delRepeatCopyWriting, delCopyWriting} from "@/api/business/openapi/copywriting";
+import {pickerOptions} from "@/layout/mixin/PickerOptions"
 
 export default {
   name: "CopyWriting",
   dicts: ['copywriting_type'],
+  mixins: [pickerOptions],
   data() {
     return {
       // 遮罩层
@@ -179,15 +187,8 @@ export default {
       },
       // 表单参数
       form: {},
-      // 表单校验
-      rules: {
-        content: [
-          { required: true, message: "文案内容不能为空", trigger: "blur" }
-        ],
-        source: [
-          { required: true, message: "文案来源不能为空", trigger: "blur" }
-        ]
-      }
+
+
     };
   },
   created() {
@@ -196,8 +197,8 @@ export default {
   methods: {
     //删除重复文案
     delRepeatCopyWriting() {
-      delRepeatCopyWriting().then(res =>{
-        this.$modal.msgSuccess("删除"+res.data+"条");
+      delRepeatCopyWriting().then(res => {
+        this.$modal.msgSuccess("删除" + res.data + "条");
         this.getList();
       })
     },
@@ -222,22 +223,7 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        content: null,
-        source: null,
-        createTime: null,
-        type: null
-      };
-      this.resetForm("form");
-    },
+
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -246,46 +232,28 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.daterangeCreateTime = [];
-      this.queryParams.createTime=null
-      this.queryParams.endCreateTime=null
+      this.queryParams.createTime = null
+      this.queryParams.endCreateTime = null
       this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateCopyWriting(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addCopyWriting(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
+
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除文案api，通过api获取文案信息编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除文案api，通过api获取文案信息编号为"' + ids + '"的数据项？').then(function () {
         return delCopyWriting(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导出按钮操作 */
     handleExport() {
diff --git a/xjs-business/xjs-business-log/src/main/java/com/xjs/apilog/domain/ApiLog.java b/xjs-business/xjs-business-log/src/main/java/com/xjs/apilog/domain/ApiLog.java
index 0b616595..e974ff50 100644
--- a/xjs-business/xjs-business-log/src/main/java/com/xjs/apilog/domain/ApiLog.java
+++ b/xjs-business/xjs-business-log/src/main/java/com/xjs/apilog/domain/ApiLog.java
@@ -46,12 +46,12 @@ public class ApiLog implements Serializable
 
     /** 请求request */
     @Excel(name = "请求request")
-    @Size(max = 1000, message = "请控制请求request长度在1000字符", groups = { SelectGroup.class})
+    @Size(max = 100, message = "请控制请求request长度在100字符", groups = { SelectGroup.class})
     private String request;
 
     /** 响应体 */
     @Excel(name = "响应体")
-    @Size(max = 15000, message = "请控制响应体长度在15000字符", groups = { SelectGroup.class})
+    @Size(max = 100, message = "请控制响应体长度在100字符", groups = { SelectGroup.class})
     private String response;
 
     /** 是否请求成功 */
diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/controller/CopyWritingController.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/controller/CopyWritingController.java
index 435348cc..a9a9bd6e 100644
--- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/controller/CopyWritingController.java
+++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/controller/CopyWritingController.java
@@ -14,6 +14,7 @@ import com.xjs.copywriting.domain.CopyWriting;
 import com.xjs.copywriting.domain.RequestBody;
 import com.xjs.copywriting.factory.CopyWritingFactory;
 import com.xjs.copywriting.service.CopyWritingService;
+import com.xjs.validation.group.SelectGroup;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
@@ -151,7 +152,7 @@ public class CopyWritingController extends BaseController {
     @ApiOperation("文案列表")
     @RequiresPermissions("openapi:copywriting:list")
     @GetMapping("/list")
-    public TableDataInfo list(CopyWriting copyWriting) {
+    public TableDataInfo list(@Validated({SelectGroup.class}) CopyWriting copyWriting) {
         startPage();
         List<CopyWriting> list = copyWritingService.selectCopyWritingList(copyWriting);
         return getDataTable(list);
diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/domain/CopyWriting.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/domain/CopyWriting.java
index a98bbb5b..f9163ec1 100644
--- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/domain/CopyWriting.java
+++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/domain/CopyWriting.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 org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -27,10 +29,12 @@ public class CopyWriting implements Serializable {
 
     /** 文案内容 */
     @Excel(name = "文案内容")
+    @Size(max = 100, message = "请控制文案内容长度在100字符", groups = {SelectGroup.class})
     private String content;
 
     /** 文案来源 */
     @Excel(name = "文案来源")
+    @Size(max = 50, message = "请控制文案来源长度在50字符", groups = {SelectGroup.class})
     private String source;
 
     @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss")