pushcode

src/main/java/top/lvzhiqiang/controller/PictureInfoController.java

@@ -1,12 +1,10 @@
 package top.lvzhiqiang.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.github.pagehelper.PageInfo;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import top.lvzhiqiang.dto.R;
 import top.lvzhiqiang.dto.VideoInfoQuery;
-import top.lvzhiqiang.entity.FileImage;
 import top.lvzhiqiang.exception.ParameterException;
 import top.lvzhiqiang.service.PictureInfoService;
 import top.lvzhiqiang.util.StringUtils;
@@ -36,7 +34,7 @@ public class PictureInfoController {
      * 2024/8/26 11:02
      */
     @PostMapping("/getPictureInfoPage")
-    public PageInfo<FileImage> getPictureInfoPage(@RequestBody VideoInfoQuery videoInfoQuery) {
+    public Object getPictureInfoPage(@RequestBody VideoInfoQuery videoInfoQuery) {
         return pictureInfoService.getPictureInfoPage(JSON.parseObject(JSON.toJSONString(videoInfoQuery), HashMap.class));
     }
 

src/main/java/top/lvzhiqiang/controller/QueryHeaderController.java

@@ -102,6 +102,14 @@ public class QueryHeaderController {
             List<VideoGenres> videoGenresList = pictureInfoMapper.findUploadGenres();
             result.put("videoCastList", videoCastList);
             result.put("videoGenresList", videoGenresList);
+        } else if ("爬虫".equals(bigType)) {
+            List<VideoCast> videoCastList = new ArrayList<>();
+            List<VideoGenres> videoGenresList = new ArrayList<>();
+            VideoGenres videoGenres = new VideoGenres();
+            videoGenres.setName("福利吧");
+            videoGenresList.add(videoGenres);
+            result.put("videoCastList", videoCastList);
+            result.put("videoGenresList", videoGenresList);
         }
 
         return result;

src/main/java/top/lvzhiqiang/mapper/PictureInfoMapper.java

@@ -74,4 +74,16 @@ public interface PictureInfoMapper {
             "VALUES (#{id}, #{mainUrl}, #{mainTitle}, #{status}, #{failureCause}, now(), now()) " +
             "ON DUPLICATE KEY UPDATE status=values(status),failure_cause=values(failure_cause),modify_time=now()")
     void insertOrUpdateFileCrawlerImageLog(FileCrawlerImageLog crawlerImageLog);
+
+    @Select({"<script>" +
+            "select fi.*,fcic.category_name from file_crawler_image fi left join file_crawler_image_category fcic on fi.category_id = fcic.id " +
+            "left join file_crawler_image_log fcil on fi.log_id = fcil.id WHERE 1 = 1" +
+            "<if test=\"keyword != null and keyword != ''\">" +
+            "   and fi.remark like concat('%',#{keyword},'%')" +
+            "</if>" +
+            "<if test=\"genres != null and genres != ''\">" +
+            "   and fcic.category_name = #{genres}" +
+            "</if>" +
+            "</script>"})
+    List<FileCrawlerImage> getCrawlerImageInfoList(Map<String, Object> params);
 }

src/main/java/top/lvzhiqiang/service/PictureInfoService.java

@@ -20,7 +20,7 @@ public interface PictureInfoService {
      *
      * @return
      */
-    PageInfo<FileImage> getPictureInfoPage(Map<String, Object> params);
+    Object getPictureInfoPage(Map<String, Object> params);
 
     R insertOrUpdateImg(MultipartFile file, String remark, Long categoryId, String id);
 

src/main/java/top/lvzhiqiang/service/impl/PictureInfoServiceImpl.java

@@ -61,9 +61,8 @@ public class PictureInfoServiceImpl extends BaseServiceImpl<Object> implements P
     private final String parentPath = LocalDate.now().format(DateUtils.dateFormatter5);
 
     @Override
-    public PageInfo<FileImage> getPictureInfoPage(Map<String, Object> params) {
+    public Object getPictureInfoPage(Map<String, Object> params) {
         Object bigType = params.get("bigType");
-        List<FileImage> pictureInfoList = new ArrayList<>();
 
         // 转换成like
         paramsToLike(params, "keyword");
@@ -73,7 +72,7 @@ public class PictureInfoServiceImpl extends BaseServiceImpl<Object> implements P
         paramsToSort(params);
 
         if ("上传".equals(bigType)) {
-            pictureInfoList = pictureInfoMapper.getUploadImageInfoList(params);
+            List<FileImage> pictureInfoList = pictureInfoMapper.getUploadImageInfoList(params);
 
             String bpicsUrl = InitRunner.dicCodeMap.get("bpics_url").getCodeValue();
             String ftpBasePath = InitRunner.dicCodeMap.get("ftp_basepath").getCodeValue();
@@ -83,10 +82,25 @@ public class PictureInfoServiceImpl extends BaseServiceImpl<Object> implements P
                 e.setPath(bpicsUrl + ftpBasePath + path);
                 e.setThumbnailPath(bpicsUrl + ftpThumbnailBasePath + path);
             });
-        }
 
-        PageInfo<FileImage> pictureInfoPageInfo = new PageInfo<>(pictureInfoList);
-        return pictureInfoPageInfo;
+            return new PageInfo<>(pictureInfoList);
+        } else if ("爬虫".equals(bigType)) {
+            List<FileCrawlerImage> crawlerImageList = pictureInfoMapper.getCrawlerImageInfoList(params);
+
+            String bpicsUrl = InitRunner.dicCodeMap.get("bpics_url").getCodeValue();
+            String ftpImageCrawlerBasePath = InitRunner.dicCodeMap.get("ftp_image_crawler_basepath").getCodeValue();
+            String ftpThumbnailCrawlerBasePath = InitRunner.dicCodeMap.get("ftp_thumbnail_crawler_basepath").getCodeValue();
+            crawlerImageList.stream().forEach(e -> {
+                String path = e.getPath();
+                e.setPath(bpicsUrl + ftpImageCrawlerBasePath + path);
+                e.setThumbnailPath(bpicsUrl + ftpThumbnailCrawlerBasePath + path);
+                e.setRemark(StringUtils.isEmpty(e.getRemark()) ? e.getOldName() : e.getRemark());
+            });
+
+            return new PageInfo<>(crawlerImageList);
+        } else {
+            throw new BusinessException(ResultCodeEnum.UNKNOWN_ERROR.getCode(), "不支持的类型！");
+        }
     }
 
     @Override

src/main/resources/static/js/my-picture.js

@@ -84,16 +84,19 @@ function search(pageNo, startFlag, searchSelectFlag) {
     if (searchSelectFlag) {
         genres = "";
         cast = "";
-        if (bigType == '足舐') {
-            genres = "待审查";
-            orderField = "vi.update_date";
-        } else if (bigType == '码池') {
-            orderField = "vi.modify_time";
+        if (bigType == '爬虫') {
+            genres = "福利吧";
+            orderField = "fi.publish_time";
         } else {
             orderField = "vi.issue_date";
         }
 
         order = "desc";
+    } else {
+        if (bigType == '爬虫') {
+            genres = "福利吧";
+            orderField = "fi.publish_time";
+        }
     }
 
     $.ajax({
@@ -126,7 +129,7 @@ function search(pageNo, startFlag, searchSelectFlag) {
                     var picInfo = picInfoList[i];
 
                     var date = picInfo.createTime;
-                    if (orderField == 'fi.modify_time') {
+                    if (orderField == 'fci.modify_time') {
                         date = picInfo.modifyTime;
                     }
 
@@ -136,6 +139,10 @@ function search(pageNo, startFlag, searchSelectFlag) {
                         scoreStr += picInfo.categoryName + '|';
                         scoreStr += picInfo.size + '|';
                         scoreStr += picInfo.modifyTime;
+                    } if (bigType == '爬虫') {
+                        scoreStr += picInfo.categoryName + '|';
+                        scoreStr += picInfo.size + '|';
+                        scoreStr += picInfo.modifyTime;
                     } else {
                         scoreStr = picInfo.size;
                     }