From 2e7c457b9fec4845ff1dbbd730dffe3f452f92d6 Mon Sep 17 00:00:00 2001 From: xjs <1294405880@qq.com> Date: Thu, 24 Feb 2022 15:02:17 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=8136=E5=A3=81=E7=BA=B8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webmagic/_36wallpaper/wallpaper36.js | 9 ++ ruoyi-ui/src/components/Pagination/index.vue | 9 +- .../webmagic/_36wallpaper/settings/index.vue | 10 ++ .../webmagic/_36wallpaper/show/index.vue | 93 +++++++++++-------- .../java/com/xjs/common/aop/ApiLogAspect.java | 5 +- .../controller/_36wallpaperController.java | 13 ++- .../xjs/_36wallpaper/pojo/_36wallpaper.java | 5 +- .../service/_36wallpaperService.java | 8 ++ .../service/impl/_36wallpaperServiceImpl.java | 17 ++++ 9 files changed, 122 insertions(+), 47 deletions(-) diff --git a/ruoyi-ui/src/api/business/webmagic/_36wallpaper/wallpaper36.js b/ruoyi-ui/src/api/business/webmagic/_36wallpaper/wallpaper36.js index f72da04a..bfb0df5c 100644 --- a/ruoyi-ui/src/api/business/webmagic/_36wallpaper/wallpaper36.js +++ b/ruoyi-ui/src/api/business/webmagic/_36wallpaper/wallpaper36.js @@ -26,3 +26,12 @@ export function resetSettings() { method: 'put', }) } + +// 获取壁纸列表 +export function getWallpaperList(data) { + return request({ + url: '/webmagic/_36wallpaper/list', + method: 'get', + params: data + }) +} diff --git a/ruoyi-ui/src/components/Pagination/index.vue b/ruoyi-ui/src/components/Pagination/index.vue index 7f835cf1..d812cd3b 100644 --- a/ruoyi-ui/src/components/Pagination/index.vue +++ b/ruoyi-ui/src/components/Pagination/index.vue @@ -16,7 +16,7 @@ @@ -73,6 +85,7 @@ export default { min-height: 36px; max-height: 350px; height: 320px; + margin-bottom: 10px; } .bigDiv{ diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/aop/ApiLogAspect.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/aop/ApiLogAspect.java index effb237f..f8f08c76 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/aop/ApiLogAspect.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/aop/ApiLogAspect.java @@ -72,7 +72,6 @@ public class ApiLogAspect { Object obj = joinPoint.proceed(); LocalDateTime localDateTime2 = DateUtil.date().toLocalDateTime(); long between = ChronoUnit.MILLIS.between(localDateTime1, localDateTime2); - log.info("调用接口耗费时间:{}ms", between); //执行预警切入逻辑（降级不预警） if (obj instanceof JSONObject) { JSONObject jsonObject = (JSONObject) obj; @@ -82,6 +81,7 @@ public class ApiLogAspect { } else { //如果降级，接口状态修改为异常 this.demoteHandle(joinPoint); + log.info("降级！调用接口耗费时间:{}ms", between); } } @@ -177,6 +177,9 @@ public class ApiLogAspect { String name = annotationInfo.get("name"); String url = annotationInfo.get("url"); + log.info("调用{}接口耗费时间:{}ms",name, between); + + //根据拿到的url和name查询数据库是否存在，存在则count+1，不存在则add ApiRecord apiRecord = new ApiRecord(); apiRecord.setApiName(name); diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/_36wallpaper/controller/_36wallpaperController.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/_36wallpaper/controller/_36wallpaperController.java index 1a3f9fb2..f405b31d 100644 --- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/_36wallpaper/controller/_36wallpaperController.java +++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/_36wallpaper/controller/_36wallpaperController.java @@ -1,9 +1,11 @@ package com.xjs._36wallpaper.controller; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.xjs._36wallpaper.pojo._36wallpaper; import com.xjs._36wallpaper.service._36wallpaperService; import com.xjs._36wallpaper.task._36wallpaperTask; import com.xjs.web.MyBaseController; @@ -23,7 +25,7 @@ import java.util.Objects; @RestController @RequestMapping("_36wallpaper") @Api(tags = "爬虫模块-36壁纸网") -public class _36wallpaperController extends MyBaseController { +public class _36wallpaperController extends MyBaseController<_36wallpaper> { @Autowired private _36wallpaperTask wallpaperTask; @@ -60,6 +62,15 @@ public class _36wallpaperController extends MyBaseController { return toAjax(b); } + @GetMapping("list") + @ApiOperation("获取壁纸列表") + @RequiresPermissions("webmagic:_36wallpaper:list") + public AjaxResult list(_36wallpaper wallpaper) { + IPage<_36wallpaper> list=wallpaperService.selectWallpaperList(startPageMP(),wallpaper); + return AjaxResult.success(list); + } + + //----------------------远程rpc调用--------------------------- @GetMapping("taskForPRC") diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/_36wallpaper/pojo/_36wallpaper.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/_36wallpaper/pojo/_36wallpaper.java index abd95259..ad3d221e 100644 --- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/_36wallpaper/pojo/_36wallpaper.java +++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/_36wallpaper/pojo/_36wallpaper.java @@ -5,7 +5,9 @@ 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.entity.BaseEntity; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; import java.util.Date; @@ -16,8 +18,9 @@ import java.util.Date; * @since 2022-02-20 */ @Data +@EqualsAndHashCode(callSuper = true) @TableName("webmagic_36wallpaper") -public class _36wallpaper implements Serializable { +public class _36wallpaper extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/_36wallpaper/service/_36wallpaperService.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/_36wallpaper/service/_36wallpaperService.java index 3713cbc3..88b20932 100644 --- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/_36wallpaper/service/_36wallpaperService.java +++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/_36wallpaper/service/_36wallpaperService.java @@ -1,6 +1,8 @@ package com.xjs._36wallpaper.service; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.xjs._36wallpaper.pojo._36wallpaper; @@ -37,4 +39,10 @@ public interface _36wallpaperService extends IService<_36wallpaper> { */ boolean resetSettings(); + /** + * 分页查询壁纸列表 + * @param wallpaper 实体类 + * @return page + */ + IPage<_36wallpaper> selectWallpaperList(Page<_36wallpaper> page, _36wallpaper wallpaper); } diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/_36wallpaper/service/impl/_36wallpaperServiceImpl.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/_36wallpaper/service/impl/_36wallpaperServiceImpl.java index 71428dd4..747bb71e 100644 --- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/_36wallpaper/service/impl/_36wallpaperServiceImpl.java +++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/_36wallpaper/service/impl/_36wallpaperServiceImpl.java @@ -1,6 +1,9 @@ package com.xjs._36wallpaper.service.impl; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.constant.HttpStatus; import com.ruoyi.common.core.domain.R; @@ -10,6 +13,7 @@ import com.xjs._36wallpaper.mapper._36wallpaperMapper; import com.xjs._36wallpaper.pojo._36wallpaper; import com.xjs._36wallpaper.service._36wallpaperService; import com.xjs.exception.BusinessException; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -128,6 +132,19 @@ public class _36wallpaperServiceImpl extends ServiceImpl<_36wallpaperMapper, _36 return false; } + @Override + public IPage<_36wallpaper> selectWallpaperList(Page<_36wallpaper> page, _36wallpaper wallpaper) { + String condition = wallpaper.getCondition(); + QueryWrapper<_36wallpaper> wr = new QueryWrapper<>(); + wr.and(StringUtils.isNotEmpty(condition), obj -> { + obj.like("picture_name", condition) + .or().like("type", condition) + .or().like("label", condition); + }); + + return this.page(page,wr); + } + /** * 检测是否正在运行