1、修改前端日期控件相关参数

2、微信搜狗CRUD接口开发
3、微信搜狗页面开发
4、微信搜狗查询条件开发
5、修改实体类查询校验长度最高100字符
6、微信搜狗分页列表使用Searcher Bean实现
pull/254/head
xjs 4 years ago
parent 290a873c54
commit f757d2c967

@ -0,0 +1,18 @@
import request from '@/utils/request'
// 查询爬虫微信搜狗搜索列表
export function listWeixinsougou(query) {
return request({
url: '/webmagic/weixin_sougou/list',
method: 'get',
params: query
})
}
// 删除爬虫微信搜狗搜索
export function delWeixinsougou(id) {
return request({
url: '/webmagic/weixin_sougou/' + id,
method: 'delete'
})
}

@ -25,6 +25,7 @@ export const pickerOptions = {
onClick(picker) {
const end = new Date();
const start = new Date();
end.setTime(start.getTime()+3600 * 1000 * 24)
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit('pick', [start, end]);
}
@ -33,6 +34,7 @@ export const pickerOptions = {
onClick(picker) {
const end = new Date();
const start = new Date();
end.setTime(start.getTime()+3600 * 1000 * 24)
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit('pick', [start, end]);
}
@ -41,9 +43,28 @@ export const pickerOptions = {
onClick(picker) {
const end = new Date();
const start = new Date();
end.setTime(start.getTime()+3600 * 1000 * 24)
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit('pick', [start, end]);
}
},{
text: '最近半年',
onClick(picker) {
const end = new Date();
const start = new Date();
end.setTime(start.getTime()+3600 * 1000 * 24)
start.setTime(start.getTime() - 3600 * 1000 * 24 * 183);
picker.$emit('pick', [start, end]);
}
},{
text: '最近一年',
onClick(picker) {
const end = new Date();
const start = new Date();
end.setTime(start.getTime()+3600 * 1000 * 24)
start.setTime(start.getTime() - 3600 * 1000 * 24 * 365);
picker.$emit('pick', [start, end]);
}
}]
},
}

@ -0,0 +1,224 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="文章标题" prop="title">
<el-input
v-model="queryParams.title"
prefix-icon="el-icon-refresh"
placeholder="请输入文章标题"
clearable
maxlength="100"
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="文章内容" prop="content">
<el-input
v-model="queryParams.content"
prefix-icon="el-icon-refresh"
placeholder="请输入文章内容"
clearable
maxlength="100"
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="文章来源" prop="source">
<el-input
v-model="queryParams.source"
prefix-icon="el-icon-refresh"
placeholder="请输入文章来源"
clearable
maxlength="20"
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="daterangeCreateTime"
size="small"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
:picker-options="pickerOptions"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="handleQuery"
></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['webmagic:weixinsougou:remove']"
>删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['webmagic:weixinsougou:export']"
>导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="weixinsougouList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="文章标题" align="center" prop="title" :show-overflow-tooltip="true"/>
<el-table-column label="简略的内容" align="center" prop="content" :show-overflow-tooltip="true"/>
<el-table-column label="文章来源" align="center" prop="source" :show-overflow-tooltip="true"/>
<el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['webmagic:weixinsougou:remove']"
>删除
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
</template>
<script>
import {listWeixinsougou, delWeixinsougou} from "@/api/business/webmagic/weixinsougou/weixinsougou";
import {pickerOptions} from "@/layout/mixin/PickerOptions";
export default {
name: "Weixinsougou",
mixins: [pickerOptions],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
weixinsougouList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
isAsc: 'desc',
title: null,
content: null,
source: null,
createTime: null,
condition: null //
},
//
daterangeCreateTime: [],
//
form: {},
//
rules: {}
};
},
created() {
this.getList();
},
methods: {
/** 查询爬虫微信搜狗搜索列表 */
getList() {
this.loading = true;
if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
this.queryParams.createTime = this.daterangeCreateTime[0];
this.queryParams.endCreateTime = this.daterangeCreateTime[1];
}
listWeixinsougou(this.queryParams).then(response => {
this.weixinsougouList = response.data.dataList;
this.total = response.data.totalCount;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.daterangeCreateTime = [];
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.multiple = !selection.length
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除爬虫微信搜狗搜索编号为"' + ids + '"的数据项?').then(function () {
return delWeixinsougou(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
});
},
/** 导出按钮操作 */
handleExport() {
this.download('webmagic/weixin_sougou/export', {
...this.queryParams
}, `weixinsougou_${new Date().getTime()}.xlsx`)
}
}
};
</script>

@ -0,0 +1,31 @@
package com.xjs.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.xjs.validation.group.SelectGroup;
import lombok.Data;
import javax.validation.constraints.Size;
import java.util.Date;
/**
*
* @author xiejs
* @since 2022-02-22
*/
@Data
public class BaseEntity {
/**
*
*/
@TableField(exist = false)
@Size(max = 100, message = "请控制长度在100字符", groups = { SelectGroup.class})
private String condition;
/**
*
*/
@TableField(exist = false)
private Date endCreateTime;
}

@ -34,7 +34,7 @@ public class ApiAWord implements Serializable {
/** 句子内容 */
@Excel(name = "句子内容")
@Size(max = 255, message = "请控制句子内容长度在255字符", groups = { SelectGroup.class})
@Size(max = 100, message = "请控制句子内容长度在100字符", groups = { SelectGroup.class})
private String content;
/** 来源 */
@ -44,7 +44,7 @@ public class ApiAWord implements Serializable {
/** 释义 */
@Excel(name = "释义")
@Size(max = 255, message = "请控制释义长度在255字符", groups = { SelectGroup.class})
@Size(max = 100, message = "请控制释义长度在100字符", groups = { SelectGroup.class})
private String note;
/** 音频地址 */

@ -29,14 +29,14 @@ public class ApiEnglish implements Serializable {
*
*/
@Excel(name = "英文")
@Size(max = 255, message = "请控制英文长度在255字符", groups = { SelectGroup.class})
@Size(max = 100, message = "请控制英文长度在100字符", groups = { SelectGroup.class})
private String en;
/**
*
*/
@Excel(name = "中文")
@Size(max = 255, message = "请控制中文长度在255字符", groups = { SelectGroup.class})
@Size(max = 100, message = "请控制中文长度在100字符", groups = { SelectGroup.class})
private String zh;

@ -1,26 +1,56 @@
package com.xjs.weixin.controller;
import com.ejlchina.searcher.SearchResult;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageDomain;
import com.ruoyi.common.core.web.page.TableSupport;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.xjs.validation.group.SelectGroup;
import com.xjs.web.MyBaseController;
import com.xjs.weixin.pojo.WeiXinSouGou;
import com.xjs.weixin.service.WeiXinSouGouService;
import com.xjs.weixin.task.WeiXinSouGouTask;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* controller
*
* @author xiejs
* @since 2022-02-22
*/
@RestController
@RequestMapping("weixin_sougou")
@Api(tags = "爬虫模块-微信搜狗")
public class WeiXinSouGouController {
public class WeiXinSouGouController extends MyBaseController {
@Autowired
private WeiXinSouGouTask weiXinSouGouTask;
@Autowired
private WeiXinSouGouService weiXinSouGouService;
/**
*
*/
@RequiresPermissions("webmagic:weixinsougou:list")
@GetMapping("/list")
public AjaxResult list(@Validated({SelectGroup.class}) WeiXinSouGou weiXinSouGou) {
//startPage();
PageDomain pageDomain = TableSupport.buildPageRequest();
SearchResult<WeiXinSouGou> list = weiXinSouGouService.selectWeiXinSouGouList(weiXinSouGou, pageDomain);
return AjaxResult.success(list);
}
@ -32,4 +62,29 @@ public class WeiXinSouGouController {
return R.ok(count);
}
//-------------------------代码生成--------------------------------
/**
*
*/
@RequiresPermissions("webmagic:weixinsougou:export")
@Log(title = "微信搜狗", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, WeiXinSouGou weiXinSouGou) {
List<WeiXinSouGou> list = weiXinSouGouService.selectWeiXinSouGouList(weiXinSouGou);
ExcelUtil<WeiXinSouGou> util = new ExcelUtil<>(WeiXinSouGou.class);
util.exportExcel(response, list, "爬虫微信搜狗搜索数据");
}
/**
*
*/
@RequiresPermissions("webmagic:weixinsougou:remove")
@Log(title = "爬虫微信搜狗搜索", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(weiXinSouGouService.deleteWeiXinSouGouByIds(ids));
}
}

@ -3,6 +3,8 @@ package com.xjs.weixin.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xjs.weixin.pojo.WeiXinSouGou;
import java.util.List;
/**
* mapper
* @author xiejs
@ -15,4 +17,33 @@ public interface WeiXinSouGouMapper extends BaseMapper<WeiXinSouGou> {
* @return int
*/
int deleteRepeatData();
//----------------------------代码生成-----------------------------
/**
*
*
* @param weiXinSouGou
* @return
*/
public List<WeiXinSouGou> selectWeiXinSouGouList(WeiXinSouGou weiXinSouGou);
/**
*
*
* @param id
* @return
*/
public int deleteWeiXinSouGouById(Long id);
/**
*
*
* @param ids
* @return
*/
public int deleteWeiXinSouGouByIds(Long[] ids);
}

@ -3,10 +3,16 @@ package com.xjs.weixin.pojo;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ejlchina.searcher.bean.DbField;
import com.ejlchina.searcher.bean.SearchBean;
import com.ruoyi.common.core.annotation.Excel;
import com.xjs.entity.BaseEntity;
import com.xjs.validation.group.SelectGroup;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.Size;
import java.io.Serializable;
import java.util.Date;
@ -16,36 +22,51 @@ import java.util.Date;
* @since 2022-02-22
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("webmagic_weixin_sougou")
public class WeiXinSouGou implements Serializable {
@SearchBean(
tables = "webmagic_weixin_sougou"
)
public class WeiXinSouGou extends BaseEntity implements Serializable {
private static final long serialVersionUID = 1L;
/** 主键id */
@DbField("id")
private Long id;
/** 文章标题 */
@Excel(name = "文章标题")
@DbField("title")
@Size(max = 100, message = "请控制文章标题长度在100字符", groups = { SelectGroup.class})
private String title;
/** 简略的内容 */
@Excel(name = "简略的内容")
@DbField("content")
@Size(max = 100, message = "请控制简略的内容长度在100字符", groups = { SelectGroup.class})
private String content;
/** 文章来源 */
@Excel(name = "文章来源")
@DbField("source")
@Size(max = 20, message = "请控制文章来源长度在20字符", groups = { SelectGroup.class})
private String source;
/** 文章的链接 */
@Excel(name = "文章的链接")
@DbField("url")
private String url;
/** 图片的链接 */
@Excel(name = "图片的链接")
@DbField("img_url")
private String imgUrl;
@Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField(fill = FieldFill.INSERT)
@DbField("create_time")
private Date createTime;
}

@ -1,8 +1,12 @@
package com.xjs.weixin.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ejlchina.searcher.SearchResult;
import com.ruoyi.common.core.web.page.PageDomain;
import com.xjs.weixin.pojo.WeiXinSouGou;
import java.util.List;
/**
* service
* @author xiejs
@ -15,4 +19,38 @@ public interface WeiXinSouGouService extends IService<WeiXinSouGou> {
* @return int
*/
int deleteRepeatData();
/**
* BeanSearcher
* @param weiXinSouGou
* @param pageDomain
* @return SearchResult
*/
SearchResult<WeiXinSouGou> selectWeiXinSouGouList(WeiXinSouGou weiXinSouGou, PageDomain pageDomain);
//------------------------代码生成-----------------------------
/**
*
*
* @param weiXinSouGou
* @return
*/
List<WeiXinSouGou> selectWeiXinSouGouList(WeiXinSouGou weiXinSouGou);
/**
*
*
* @param ids
* @return
*/
int deleteWeiXinSouGouByIds(Long[] ids);
/**
*
*
* @param id
* @return
*/
int deleteWeiXinSouGouById(Long id);
}

@ -1,15 +1,23 @@
package com.xjs.weixin.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ejlchina.searcher.BeanSearcher;
import com.ejlchina.searcher.SearchResult;
import com.ejlchina.searcher.util.MapUtils;
import com.ruoyi.common.core.web.page.PageDomain;
import com.xjs.weixin.mapper.WeiXinSouGouMapper;
import com.xjs.weixin.pojo.WeiXinSouGou;
import com.xjs.weixin.service.WeiXinSouGouService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
/**
* service
*
* @author xiejs
* @since 2022-02-22
*/
@ -19,8 +27,69 @@ public class WeiXinSouGouServiceImpl extends ServiceImpl<WeiXinSouGouMapper, Wei
@Resource
private WeiXinSouGouMapper weiXinSouGouMapper;
@Autowired
private BeanSearcher beanSearcher;
@Override
public SearchResult<WeiXinSouGou> selectWeiXinSouGouList(WeiXinSouGou weiXinSouGou, PageDomain pageDomain) {
Map<String, Object> params = MapUtils.builder()
.page(pageDomain.getPageNum()-1, pageDomain.getPageSize())
.field(WeiXinSouGou::getTitle,weiXinSouGou.getTitle())
.op("ct")//构建模糊查询 ct: 包含
.field(WeiXinSouGou::getContent,weiXinSouGou.getContent())
.op("ct")
.field(WeiXinSouGou::getSource,weiXinSouGou.getSource())
.op("ct")
.field(WeiXinSouGou::getCreateTime,weiXinSouGou.getCreateTime(),weiXinSouGou.getEndCreateTime())
.op("bt")
.orderBy(WeiXinSouGou::getCreateTime,pageDomain.getIsAsc())
.build();
return beanSearcher.search(WeiXinSouGou.class, params);
}
@Override
public int deleteRepeatData() {
return weiXinSouGouMapper.deleteRepeatData();
}
//------------------------------代码生成--------------------------------
/**
*
*
* @param weiXinSouGou
* @return
*/
@Override
public List<WeiXinSouGou> selectWeiXinSouGouList(WeiXinSouGou weiXinSouGou) {
return weiXinSouGouMapper.selectWeiXinSouGouList(weiXinSouGou);
}
/**
*
*
* @param ids
* @return
*/
@Override
public int deleteWeiXinSouGouByIds(Long[] ids) {
return weiXinSouGouMapper.deleteWeiXinSouGouByIds(ids);
}
/**
*
*
* @param id
* @return
*/
@Override
public int deleteWeiXinSouGouById(Long id) {
return weiXinSouGouMapper.deleteWeiXinSouGouById(id);
}
}

@ -64,6 +64,11 @@
<!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn" />
<!-- 打开 Bean Searcher 的 SQL 日志 -->
<logger name="com.ejlchina.searcher.implement.DefaultSqlExecutor" level="DEBUG" additivity="false">
<appender-ref ref="console" />
</logger>
<root level="info">
<appender-ref ref="console" />
</root>

@ -5,6 +5,43 @@
<mapper namespace="com.xjs.weixin.mapper.WeiXinSouGouMapper">
<resultMap type="com.xjs.weixin.pojo.WeiXinSouGou" id="WeiXinSouGouResult">
<result property="id" column="id" />
<result property="title" column="title" />
<result property="content" column="content" />
<result property="source" column="source" />
<result property="url" column="url" />
<result property="imgUrl" column="img_url" />
<result property="createTime" column="create_time" />
</resultMap>
<sql id="selectWeiXinSouGouVo">
select id, title, content, source, url, img_url, create_time from webmagic_weixin_sougou
</sql>
<select id="selectWeiXinSouGouList" parameterType="com.xjs.weixin.pojo.WeiXinSouGou" resultMap="WeiXinSouGouResult">
<include refid="selectWeiXinSouGouVo"/>
<where>
<if test="title != null and title != ''"> and title like concat('%', #{title}, '%')</if>
<if test="content != null and content != ''"> and content like concat('%', #{content}, '%')</if>
<if test="source != null and source != ''"> and source like concat('%', #{source}, '%')</if>
<if test="createTime != null and endCreateTime != null"> and create_time between #{createTime} and #{endCreateTime}</if>
</where>
</select>
<delete id="deleteWeiXinSouGouById" parameterType="Long">
delete from webmagic_weixin_sougou where id = #{id}
</delete>
<delete id="deleteWeiXinSouGouByIds" parameterType="String">
delete from webmagic_weixin_sougou where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<delete id="deleteRepeatData">
delete from webmagic_weixin_sougou where id not in (
SELECT

Loading…
Cancel
Save