修改代码

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/AdminDataTempcacheController.java

 package com.upyuns.platform.rs.website.controller;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.StrUtil;
@@ -11,6 +12,7 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.util.process.SystemConfig;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.github.wxiaoqi.security.common.vo.PageParam;
 import com.upyuns.platform.rs.gtdata.GdLoginVO;
 import com.upyuns.platform.rs.gtdata.GtDataRestClient;
 import com.upyuns.platform.rs.gtdata.GtFileInfo;
@@ -21,6 +23,7 @@ import com.upyuns.platform.rs.website.entity.DataTempcache;
 import com.upyuns.platform.rs.website.entity.FileData;
 import com.upyuns.platform.rs.website.entity.GainData;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.extern.log4j.Log4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +33,7 @@ import org.springframework.web.multipart.MultipartFile;
 import tk.mybatis.mapper.entity.Example;
 
 import java.io.OutputStream;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -53,6 +57,37 @@ public class AdminDataTempcacheController extends BaseController<DataTempcacheBi
     private String xx_url ;
 
     //BaseController.baseLogicPages
+    @Override
+    public ObjectRestResponse<PageDataVO<DataTempcache>> baseLogicPages(Map<String, Object> params) {
+        PageDTO pageDTO = BeanUtil.mapToBean(params, PageDTO.class, true);
+        PageDataVO<DataTempcache> pageDataVO = PageDataVO.pageInfo(pageDTO.initQuery(), () -> baseBiz.selectByWeekend(w -> {
+            w.andEqualTo(DataTempcache::getIsDel, SYS_TRUE);
+            w.andEqualTo(DataTempcache::getStatus, SYS_TRUE);
+            if (StrUtil.isNotBlank(pageDTO.getName())) {
+                w.andLike(DataTempcache::getName, "%"+ pageDTO.getName()+ "%");
+            }
+            if (null != pageDTO.getSource()) {
+                w.andEqualTo(DataTempcache::getSource, pageDTO.getSource());
+            }
+            if (null != pageDTO.getStarttime()) {
+                w.andGreaterThanOrEqualTo(DataTempcache::getCrtTime, pageDTO.getStarttime());
+            }
+            if (null != pageDTO.getEndtime()) {
+                w.andLessThanOrEqualTo(DataTempcache::getCrtTime, pageDTO.getEndtime());
+            }
+            return w;
+        }));
+        return ObjectRestResponse.succ(pageDataVO);
+    }
+
+    @Data
+    static public class PageDTO extends PageParam {
+        private String name;
+        private Integer source;
+        private Date starttime;
+        private Date endtime;
+    }
+
     //BaseController.del
 
     @RequestMapping(value = "/app/unauth/dealImageimgUrl", method = RequestMethod.GET)