1、英语一言模块查询条件校验优化

2、swagger2文档注释优化
pull/254/head
xjs 4 years ago
parent 17d4d31461
commit cdbdd25516

@ -6,6 +6,7 @@
v-model="queryParams.en" v-model="queryParams.en"
placeholder="请输入英文" placeholder="请输入英文"
clearable clearable
maxlength="255"
size="small" size="small"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@ -15,6 +16,7 @@
v-model="queryParams.zh" v-model="queryParams.zh"
placeholder="请输入中文" placeholder="请输入中文"
clearable clearable
maxlength="255"
size="small" size="small"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />

@ -52,6 +52,7 @@ public class WebmagicLogController extends MyBaseController {
*/ */
@RequiresPermissions("log:webmagicLog:list") @RequiresPermissions("log:webmagicLog:list")
@GetMapping("/list") @GetMapping("/list")
@ApiOperation("查询爬虫日志列表")
public TableDataInfo list(@Validated({SelectGroup.class}) WebmagicLog webmagicLog) { public TableDataInfo list(@Validated({SelectGroup.class}) WebmagicLog webmagicLog) {
startPage(); startPage();
List<WebmagicLog> list = webmagicLogService.selectWebmagicLogList(webmagicLog); List<WebmagicLog> list = webmagicLogService.selectWebmagicLogList(webmagicLog);
@ -64,6 +65,7 @@ public class WebmagicLogController extends MyBaseController {
@RequiresPermissions("log:webmagicLog:export") @RequiresPermissions("log:webmagicLog:export")
@Log(title = "爬虫日志", businessType = BusinessType.EXPORT) @Log(title = "爬虫日志", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
@ApiOperation("导出爬虫日志列表")
public void export(HttpServletResponse response, WebmagicLog webmagicLog) { public void export(HttpServletResponse response, WebmagicLog webmagicLog) {
List<WebmagicLog> list = webmagicLogService.selectWebmagicLogList(webmagicLog); List<WebmagicLog> list = webmagicLogService.selectWebmagicLogList(webmagicLog);
ExcelUtil<WebmagicLog> util = new ExcelUtil<>(WebmagicLog.class); ExcelUtil<WebmagicLog> util = new ExcelUtil<>(WebmagicLog.class);
@ -76,6 +78,7 @@ public class WebmagicLogController extends MyBaseController {
@RequiresPermissions("log:webmagicLog:remove") @RequiresPermissions("log:webmagicLog:remove")
@Log(title = "爬虫日志", businessType = BusinessType.DELETE) @Log(title = "爬虫日志", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
@ApiOperation("删除爬虫日志")
public AjaxResult remove(@PathVariable Long[] ids) { public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(webmagicLogService.deleteWebmagicLogByIds(ids)); return toAjax(webmagicLogService.deleteWebmagicLogByIds(ids));
} }

@ -12,9 +12,11 @@ import com.xjs.oneenglish.domain.ApiEnglish;
import com.xjs.oneenglish.domain.RequestBody; import com.xjs.oneenglish.domain.RequestBody;
import com.xjs.oneenglish.factory.OneEnglishFactory; import com.xjs.oneenglish.factory.OneEnglishFactory;
import com.xjs.oneenglish.service.IApiEnglishService; import com.xjs.oneenglish.service.IApiEnglishService;
import com.xjs.validation.group.SelectGroup;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -54,7 +56,7 @@ public class ApiEnglishController extends BaseController {
@RequiresPermissions("openapi:oneenglish:list") @RequiresPermissions("openapi:oneenglish:list")
@GetMapping("/list") @GetMapping("/list")
@ApiOperation("查询英语一言列表") @ApiOperation("查询英语一言列表")
public TableDataInfo list(ApiEnglish apiEnglish) { public TableDataInfo list(@Validated({SelectGroup.class}) ApiEnglish apiEnglish) {
startPage(); startPage();
List<ApiEnglish> list = apiEnglishService.selectApiEnglishList(apiEnglish); List<ApiEnglish> list = apiEnglishService.selectApiEnglishList(apiEnglish);
return getDataTable(list); return getDataTable(list);

@ -3,8 +3,10 @@ package com.xjs.oneenglish.domain;
import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel;
import com.xjs.validation.group.SelectGroup;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.Size;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
@ -27,12 +29,14 @@ public class ApiEnglish implements Serializable {
* *
*/ */
@Excel(name = "英文") @Excel(name = "英文")
@Size(max = 255, message = "请控制英文长度在255字符", groups = { SelectGroup.class})
private String en; private String en;
/** /**
* *
*/ */
@Excel(name = "中文") @Excel(name = "中文")
@Size(max = 255, message = "请控制中文长度在255字符", groups = { SelectGroup.class})
private String zh; private String zh;

@ -61,6 +61,7 @@ public class CopyWritingNetworkController extends MyBaseController {
*/ */
@RequiresPermissions("webmagic:copyWritingNetwork:list") @RequiresPermissions("webmagic:copyWritingNetwork:list")
@GetMapping("/list") @GetMapping("/list")
@ApiOperation("查询文案网列表")
public TableDataInfo list(CopyWritingNetwork copyWritingNetwork) { public TableDataInfo list(CopyWritingNetwork copyWritingNetwork) {
startPage(); startPage();
List<CopyWritingNetwork> list = copyWritingNetworkService.selectCopyWritingNetworkList(copyWritingNetwork); List<CopyWritingNetwork> list = copyWritingNetworkService.selectCopyWritingNetworkList(copyWritingNetwork);
@ -73,6 +74,7 @@ public class CopyWritingNetworkController extends MyBaseController {
@RequiresPermissions("webmagic:copyWritingNetwork:export") @RequiresPermissions("webmagic:copyWritingNetwork:export")
@Log(title = "文案网", businessType = BusinessType.EXPORT) @Log(title = "文案网", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
@ApiOperation("导出文案网列表")
public void export(HttpServletResponse response, CopyWritingNetwork copyWritingNetwork) { public void export(HttpServletResponse response, CopyWritingNetwork copyWritingNetwork) {
List<CopyWritingNetwork> list = copyWritingNetworkService.selectCopyWritingNetworkList(copyWritingNetwork); List<CopyWritingNetwork> list = copyWritingNetworkService.selectCopyWritingNetworkList(copyWritingNetwork);
ExcelUtil<CopyWritingNetwork> util = new ExcelUtil<>(CopyWritingNetwork.class); ExcelUtil<CopyWritingNetwork> util = new ExcelUtil<>(CopyWritingNetwork.class);
@ -85,6 +87,7 @@ public class CopyWritingNetworkController extends MyBaseController {
@RequiresPermissions("webmagic:copyWritingNetwork:remove") @RequiresPermissions("webmagic:copyWritingNetwork:remove")
@Log(title = "文案网", businessType = BusinessType.DELETE) @Log(title = "文案网", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
@ApiOperation("删除文案网")
public AjaxResult remove(@PathVariable Long[] ids) { public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(copyWritingNetworkService.deleteCopyWritingNetworkByIds(ids)); return toAjax(copyWritingNetworkService.deleteCopyWritingNetworkByIds(ids));
} }

@ -57,6 +57,7 @@ public class SinaNewsController extends MyBaseController {
*/ */
@RequiresPermissions("webmagic:sinaNews:list") @RequiresPermissions("webmagic:sinaNews:list")
@GetMapping("/list") @GetMapping("/list")
@ApiOperation("查询新浪新闻列表")
public TableDataInfo list(SinaNews sinaNews) { public TableDataInfo list(SinaNews sinaNews) {
startPage(); startPage();
List<SinaNews> list = sinaNewsService.selectSinaNewsList(sinaNews); List<SinaNews> list = sinaNewsService.selectSinaNewsList(sinaNews);
@ -69,6 +70,7 @@ public class SinaNewsController extends MyBaseController {
@RequiresPermissions("webmagic:sinaNews:remove") @RequiresPermissions("webmagic:sinaNews:remove")
@Log(title = "新浪新闻", businessType = BusinessType.DELETE) @Log(title = "新浪新闻", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
@ApiOperation("删除新浪新闻")
public AjaxResult remove(@PathVariable Long[] ids) { public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(sinaNewsService.deleteSinaNewsByIds(ids)); return toAjax(sinaNewsService.deleteSinaNewsByIds(ids));
} }

Loading…
Cancel
Save