From 7b058766b50b86ef35c2b6424e71b6ebe8bd1907 Mon Sep 17 00:00:00 2001 From: xjs <1294405880@qq.com> Date: Fri, 18 Feb 2022 22:30:38 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81API=E9=A2=84=E8=AD=A6=E5=86=85?= =?UTF-8?q?=E5=AE=B9=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=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96=202=E3=80=81=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E6=89=80=E6=9C=89=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=99=A8=E4=BF=AE=E6=94=B9=E6=88=90=E7=82=B9=E5=87=BB=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E6=9F=A5=E8=AF=A2=203=E3=80=81=E6=96=87=E6=A1=88?= =?UTF-8?q?=E7=BD=91=E3=80=81=E6=96=B0=E6=B5=AA=E6=96=B0=E9=97=BB=E7=88=AC?= =?UTF-8?q?=E8=99=AB=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9D=97=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=A0=A1=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/english/word/index.vue | 1 + .../src/views/business/log/apilog/index.vue | 4 ++ .../views/business/log/reptilelog/index.vue | 16 ++--- .../business/openapi/copywriting/index.vue | 8 ++- .../webmagic/copywritingnetwork/index.vue | 59 ++----------------- .../business/webmagic/sina/sinaNews/index.vue | 21 +------ .../CopyWritingNetworkController.java | 4 +- .../pojo/CopyWritingNetwork.java | 5 ++ .../sina/controller/SinaNewsController.java | 4 +- .../main/java/com/xjs/sina/pojo/SinaNews.java | 6 ++ 10 files changed, 45 insertions(+), 83 deletions(-) diff --git a/ruoyi-ui/src/views/business/english/word/index.vue b/ruoyi-ui/src/views/business/english/word/index.vue index d930d610..87e68dc8 100644 --- a/ruoyi-ui/src/views/business/english/word/index.vue +++ b/ruoyi-ui/src/views/business/english/word/index.vue @@ -32,6 +32,7 @@ range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" + @change="handleQuery" > diff --git a/ruoyi-ui/src/views/business/log/apilog/index.vue b/ruoyi-ui/src/views/business/log/apilog/index.vue index 37b9b6e0..e321dc1a 100644 --- a/ruoyi-ui/src/views/business/log/apilog/index.vue +++ b/ruoyi-ui/src/views/business/log/apilog/index.vue @@ -7,6 +7,7 @@ placeholder="请输入" clearable size="small" + @change="handleQuery" style="width: 150px"> diff --git a/ruoyi-ui/src/views/business/log/reptilelog/index.vue b/ruoyi-ui/src/views/business/log/reptilelog/index.vue index 46b86870..26641372 100644 --- a/ruoyi-ui/src/views/business/log/reptilelog/index.vue +++ b/ruoyi-ui/src/views/business/log/reptilelog/index.vue @@ -9,7 +9,7 @@ clearable maxlength="20" size="small" - @keyup.enter.native="handleQuery" + @keyup.enter.native="handleQuery('queryForm')" /> @@ -19,7 +19,7 @@ clearable maxlength="100" size="small" - @keyup.enter.native="handleQuery" + @keyup.enter.native="handleQuery('queryForm')" /> @@ -29,7 +29,7 @@ maxlength="9" size="small" style="width: 90px" - @keyup.enter.native="handleQuery" + @keyup.enter.native="handleQuery('queryForm')" /> @@ -40,7 +40,7 @@ size="small" maxlength="9" style="width: 90px" - @keyup.enter.native="handleQuery" + @keyup.enter.native="handleQuery('queryForm')" /> @@ -52,6 +52,7 @@ style="width: 240px" value-format="yyyy-MM-dd" type="daterange" + @change="handleQuery('queryForm')" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @@ -193,10 +194,10 @@ export default { // 表单校验 queryRules: { beginRequestTime: [ - {type: 'number', message: '必须数字！', trigger: 'blur'} + {type: 'number',min: 0, max: 200000, message: '必须数字！且数字在 0 到 200000 之间！', trigger: 'blur'} ], endRequestTime: [ - {type: 'number', message: '必须数字！', trigger: 'blur'} + {type: 'number',min: 0, max: 200000, message: '必须数字！且数字在 0 到 200000 之间！', trigger: 'blur'} ], }, @@ -224,6 +225,8 @@ export default { this.webmagicLogList = response.rows; this.total = response.total; this.loading = false; + }).catch(err =>{ + this.loading = false; }); //回显的时候正常回显 @@ -240,7 +243,6 @@ export default { this.queryParams.pageNum = 1; this.getList(); } else { - console.log('error submit!!'); return false; } }); diff --git a/ruoyi-ui/src/views/business/openapi/copywriting/index.vue b/ruoyi-ui/src/views/business/openapi/copywriting/index.vue index 2fbb442c..8db2e68d 100644 --- a/ruoyi-ui/src/views/business/openapi/copywriting/index.vue +++ b/ruoyi-ui/src/views/business/openapi/copywriting/index.vue @@ -22,7 +22,12 @@ /> - + diff --git a/ruoyi-ui/src/views/business/webmagic/copywritingnetwork/index.vue b/ruoyi-ui/src/views/business/webmagic/copywritingnetwork/index.vue index 3ee6a6bd..e3a473c0 100644 --- a/ruoyi-ui/src/views/business/webmagic/copywritingnetwork/index.vue +++ b/ruoyi-ui/src/views/business/webmagic/copywritingnetwork/index.vue @@ -17,6 +17,7 @@ placeholder="请输入文案主题" clearable size="small" + maxlength="50" @keyup.enter.native="handleQuery" /> @@ -26,6 +27,7 @@ placeholder="请输入文案内容" clearable size="small" + maxlength="100" @keyup.enter.native="handleQuery" /> @@ -115,9 +117,11 @@ import { delCopyWritingNetwork, getType } from "@/api/business/webmagic/copywritingnetwork/copyWritingNetwork" +import {pickerOptions} from "@/layout/mixin/PickerOptions"; export default { name: "CopyWritingNetwork", + mixins: [pickerOptions], data() { return { @@ -152,48 +156,10 @@ export default { }, // 表单参数 form: {}, - // 表单校验 - rules: {}, //类型集合 typeList:[], - //日期组件 - pickerOptions: { - shortcuts: [{ - text: '昨天', - onClick(picker) { - const end = new Date(); - const start = new Date(); - start.setTime(start.getTime() - 3600 * 1000 * 24); - picker.$emit('pick', [start, end]); - } - }, { - text: '最近一周', - onClick(picker) { - const end = new Date(); - const start = new Date(); - start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); - picker.$emit('pick', [start, end]); - } - }, { - text: '最近一个月', - onClick(picker) { - const end = new Date(); - const start = new Date(); - start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); - picker.$emit('pick', [start, end]); - } - }, { - text: '最近三个月', - onClick(picker) { - const end = new Date(); - const start = new Date(); - start.setTime(start.getTime() - 3600 * 1000 * 24 * 90); - picker.$emit('pick', [start, end]); - } - }] - }, }; }, created() { @@ -222,22 +188,7 @@ export default { this.loading = false; }); }, - // 取消按钮 - cancel() { - this.open = false; - this.reset(); - }, - // 表单重置 - reset() { - this.form = { - id: null, - type: null, - theme: null, - content: null, - createTime: null - }; - this.resetForm("form"); - }, + /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNum = 1; diff --git a/ruoyi-ui/src/views/business/webmagic/sina/sinaNews/index.vue b/ruoyi-ui/src/views/business/webmagic/sina/sinaNews/index.vue index 89b519a0..9680c412 100644 --- a/ruoyi-ui/src/views/business/webmagic/sina/sinaNews/index.vue +++ b/ruoyi-ui/src/views/business/webmagic/sina/sinaNews/index.vue @@ -17,6 +17,7 @@ import {listSinaNews, delSinaNews, getType} from "@/api/business/webmagic/sina/sinaNews" - import {pickerOptions} from "@/layout/mixin/PickerOptions" export default { @@ -136,8 +136,6 @@ export default { }, // 表单参数 form: {}, - // 表单校验 - rules: {}, //检查查询范围 daterangeCreateTime: [], @@ -180,22 +178,7 @@ export default { this.loading = false; }); }, - // 取消按钮 - cancel() { - this.open = false; - this.reset(); - }, - // 表单重置 - reset() { - this.form = { - id: null, - title: null, - category: null, - url: null, - createTime: null - }; - this.resetForm("form"); - }, + /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNum = 1; diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/controller/CopyWritingNetworkController.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/controller/CopyWritingNetworkController.java index d9d9356f..43efa63b 100644 --- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/controller/CopyWritingNetworkController.java +++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/controller/CopyWritingNetworkController.java @@ -10,10 +10,12 @@ import com.ruoyi.common.security.annotation.RequiresPermissions; import com.xjs.copywritingNetwork.pojo.CopyWritingNetwork; import com.xjs.copywritingNetwork.service.CopyWritingNetworkService; import com.xjs.copywritingNetwork.task.CopyWritingNetworkTask; +import com.xjs.validation.group.SelectGroup; import com.xjs.web.MyBaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -62,7 +64,7 @@ public class CopyWritingNetworkController extends MyBaseController { @RequiresPermissions("webmagic:copyWritingNetwork:list") @GetMapping("/list") @ApiOperation("查询文案网列表") - public TableDataInfo list(CopyWritingNetwork copyWritingNetwork) { + public TableDataInfo list(@Validated({SelectGroup.class}) CopyWritingNetwork copyWritingNetwork) { startPage(); List list = copyWritingNetworkService.selectCopyWritingNetworkList(copyWritingNetwork); return getDataTable(list); diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/pojo/CopyWritingNetwork.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/pojo/CopyWritingNetwork.java index c0bad679..04371d64 100644 --- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/pojo/CopyWritingNetwork.java +++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/pojo/CopyWritingNetwork.java @@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.core.annotation.Excel; +import com.xjs.validation.group.SelectGroup; import lombok.Data; +import javax.validation.constraints.Size; import java.io.Serializable; import java.util.Date; @@ -23,14 +25,17 @@ public class CopyWritingNetwork implements Serializable { /** 文案标签 */ @Excel(name = "文案标签") + @Size(max = 20, message = "请控制文案标签长度在20字符", groups = {SelectGroup.class}) private String type; /** 文案主题 */ @Excel(name = "文案主题") + @Size(max = 50, message = "请控制文案主题长度在50字符", groups = {SelectGroup.class}) private String theme; /** 文案内容 */ @Excel(name = "文案内容") + @Size(max = 100, message = "请控制文案内容长度在100字符", groups = {SelectGroup.class}) private String content; /** 创建时间 */ diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/controller/SinaNewsController.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/controller/SinaNewsController.java index 18248476..f74052a9 100644 --- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/controller/SinaNewsController.java +++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/controller/SinaNewsController.java @@ -9,10 +9,12 @@ import com.ruoyi.common.security.annotation.RequiresPermissions; import com.xjs.sina.pojo.SinaNews; import com.xjs.sina.service.SinaNewsService; import com.xjs.sina.task.SinaNewsTask; +import com.xjs.validation.group.SelectGroup; import com.xjs.web.MyBaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -58,7 +60,7 @@ public class SinaNewsController extends MyBaseController { @RequiresPermissions("webmagic:sinaNews:list") @GetMapping("/list") @ApiOperation("查询新浪新闻列表") - public TableDataInfo list(SinaNews sinaNews) { + public TableDataInfo list(@Validated({SelectGroup.class}) SinaNews sinaNews) { startPage(); List list = sinaNewsService.selectSinaNewsList(sinaNews); return getDataTable(list); diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/pojo/SinaNews.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/pojo/SinaNews.java index 9fdb8138..38e4dd60 100644 --- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/pojo/SinaNews.java +++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/pojo/SinaNews.java @@ -3,12 +3,16 @@ package com.xjs.sina.pojo; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.xjs.validation.group.SelectGroup; import lombok.Data; +import javax.validation.constraints.Size; import java.io.Serializable; import java.util.Date; /** + * 新浪新闻爬虫数据实体类 + * * @author xiejs * @since 2022-02-15 */ @@ -24,11 +28,13 @@ public class SinaNews implements Serializable { /** * 新闻标题 */ + @Size(max = 100, message = "请控制新闻标题长度在100字符", groups = {SelectGroup.class}) private String title; /** * 新闻分类 */ + @Size(max = 20, message = "请控制新闻分类长度在20字符", groups = {SelectGroup.class}) private String category; /**