Browse Source

添加字段视频首帧图片字段

syh 5 years ago
parent
commit
d63589ddb0

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/config/ureport/ServletConfig.java

@@ -9,7 +9,7 @@ import org.springframework.context.annotation.ImportResource;
 import javax.servlet.Servlet;
 
 @Configuration
-//@ImportResource("classpath:ureport-console-context.xml")
+@ImportResource("classpath:ureport-console-context.xml")
 public class ServletConfig {
 
     @Bean

+ 88 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/HotInformationCtroller.java

@@ -0,0 +1,88 @@
+package org.jeecg.modules.ctop.controller;
+
+import cn.com.ctop.crawler.modules.oceanengine.entity.DouyinHot;
+import cn.com.ctop.crawler.modules.oceanengine.entity.EffectCase;
+import cn.com.ctop.crawler.modules.oceanengine.entity.HotMaterial;
+import cn.com.ctop.crawler.modules.oceanengine.service.IDouyinHotService;
+import cn.com.ctop.crawler.modules.oceanengine.service.IEffectCaseService;
+import cn.com.ctop.crawler.modules.oceanengine.service.IHotMaterialService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.jeecg.common.api.vo.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * @author jeecg-boot
+ */
+@RestController
+@RequestMapping("/ctop/hot")
+public class HotInformationCtroller {
+
+    @Autowired
+    private IDouyinHotService douyinHotService;
+    @Autowired
+    private IEffectCaseService effectCaseService;
+    @Autowired
+    private IHotMaterialService hotMaterialService;
+
+    @ResponseBody
+    @RequestMapping(value = "/douyin/feeds", method = RequestMethod.GET)
+    public Result<IPage<DouyinHot>> getVideoList(HttpServletRequest req) {
+        Result<IPage<DouyinHot>> result = new Result<>();
+        DouyinHot hot = new DouyinHot();
+        Map<String, String[]> paramMap = req.getParameterMap();
+        String userName = paramMap.get("userName") != null ? paramMap.get("userName")[0] : null;
+        String start = paramMap.get("start") != null ? paramMap.get("start")[0] : null;
+        String end = paramMap.get("end") != null ? paramMap.get("end")[0] : null;
+        String orderByColumn = paramMap.get("orderByColumn") != null ? paramMap.get("orderByColumn")[0] : null;
+        String orderByType = paramMap.get("orderByType") != null ? paramMap.get("orderByType")[0] : null;
+        Integer pageSize = paramMap.get("pageSize") != null ? Integer.parseInt(paramMap.get("pageSize")[0]) : null;
+        Integer pageNo = paramMap.get("pageNo") != null ? Integer.parseInt(paramMap.get("pageNo")[0]) : null;
+        IPage<DouyinHot> list = douyinHotService.queryHotFeeds(userName, start, end, orderByColumn, orderByType, pageNo, pageSize);
+        result.setResult(list);
+        result.setSuccess(true);
+        return result;
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "/effectcase/feeds", method = RequestMethod.GET)
+    public Result<IPage<EffectCase>> getEffectcaseList(HttpServletRequest req) {
+        Result<IPage<EffectCase>> result = new Result<>();
+        Map<String, String[]> paramMap = req.getParameterMap();
+        String userName = paramMap.get("userName") != null ? paramMap.get("userName")[0] : null;
+        String start = paramMap.get("start") != null ? paramMap.get("start")[0] : null;
+        String end = paramMap.get("end") != null ? paramMap.get("end")[0] : null;
+        String orderByColumn = paramMap.get("orderByColumn") != null ? paramMap.get("orderByColumn")[0] : null;
+        String orderByType = paramMap.get("orderByType") != null ? paramMap.get("orderByType")[0] : null;
+        Integer pageSize = paramMap.get("pageSize") != null ? Integer.parseInt(paramMap.get("pageSize")[0]) : null;
+        Integer pageNo = paramMap.get("pageNo") != null ? Integer.parseInt(paramMap.get("pageNo")[0]) : null;
+        IPage<EffectCase> list = effectCaseService.queryHotFeeds(userName, start, end, orderByColumn, orderByType, pageNo, pageSize);
+        result.setResult(list);
+        result.setSuccess(true);
+        return result;
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "/material/feeds", method = RequestMethod.GET)
+    public Result<IPage<HotMaterial>> getMaterialList(HttpServletRequest req) {
+        Result<IPage<HotMaterial>> result = new Result<>();
+        Map<String, String[]> paramMap = req.getParameterMap();
+        String userName = paramMap.get("userName") != null ? paramMap.get("userName")[0] : null;
+        String start = paramMap.get("start") != null ? paramMap.get("start")[0] : null;
+        String end = paramMap.get("end") != null ? paramMap.get("end")[0] : null;
+        String orderByColumn = paramMap.get("orderByColumn") != null ? paramMap.get("orderByColumn")[0] : null;
+        String orderByType = paramMap.get("orderByType") != null ? paramMap.get("orderByType")[0] : null;
+        Integer pageSize = paramMap.get("pageSize") != null ? Integer.parseInt(paramMap.get("pageSize")[0]) : null;
+        Integer pageNo = paramMap.get("pageNo") != null ? Integer.parseInt(paramMap.get("pageNo")[0]) : null;
+        IPage<HotMaterial> list = hotMaterialService.queryHotFeeds(userName, start, end, orderByColumn, orderByType, pageNo, pageSize);
+        result.setResult(list);
+        result.setSuccess(true);
+        return result;
+    }
+}

+ 5 - 0
module-crawler/src/main/java/cn/com/ctop/crawler/modules/oceanengine/entity/DouyinHot.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 @TableName("ctop_oceanengine_douyin_hot")
 public class DouyinHot {
@@ -18,6 +20,7 @@ public class DouyinHot {
     private Long userId;
     @JsonProperty("core_user_name")
     private String userName;
+    private String coverImage;
     private String title;
     @JsonProperty("head_image_uri")
     private String headImageUri;
@@ -27,4 +30,6 @@ public class DouyinHot {
     private Integer share;
     private Integer comment;
     private String url;
+    private Date createTime;
+    private Date updateTime;
 }

+ 7 - 4
module-crawler/src/main/java/cn/com/ctop/crawler/modules/oceanengine/entity/EffectCase.java

@@ -4,16 +4,16 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
-import java.util.List;
+import java.util.Date;
 
 @Data
-@JsonIgnoreProperties({ "methods", "effect","creativeLabel","tag" })
 @TableName("ctop_oceanengine_effect_case")
+/**
+ * 效果案例
+ */
 public class EffectCase {
     @TableId(value = "id", type = IdType.INPUT)
     private Long id;
@@ -35,6 +35,7 @@ public class EffectCase {
     private String effect;
     @JsonProperty("conversion_type")
     private String conversionType;
+    private String coverImage;
     private String creativeLabel;
     private String tag;
     @JsonProperty("creative_title")
@@ -45,4 +46,6 @@ public class EffectCase {
     private String creativeScore;
     @JsonProperty("industry_tag")
     private String industryTag;
+    private Date createTime;
+    private Date updateTime;
 }

+ 8 - 2
module-crawler/src/main/java/cn/com/ctop/crawler/modules/oceanengine/entity/HotMaterial.java

@@ -3,13 +3,16 @@ package cn.com.ctop.crawler.modules.oceanengine.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
-@JsonIgnoreProperties({ "appCode", "appName" })
 @TableName("ctop_oceanengine_hot_material")
+/**
+ * 广告雷达
+ */
 public class HotMaterial {
     @TableId(value = "id",type = IdType.INPUT)
     @JsonProperty("material_id")
@@ -18,5 +21,8 @@ public class HotMaterial {
     private String videoUrl;
     private String title;
     private Integer appCode;
+    private String coverImage;
     private String appName;
+    private Date createTime;
+    private Date updateTime;
 }

+ 3 - 0
module-crawler/src/main/java/cn/com/ctop/crawler/modules/oceanengine/service/IDouyinHotService.java

@@ -1,10 +1,13 @@
 package cn.com.ctop.crawler.modules.oceanengine.service;
 
 import cn.com.ctop.crawler.modules.oceanengine.entity.DouyinHot;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
 public interface IDouyinHotService extends IService<DouyinHot> {
     public void replaceBatch(List<DouyinHot> list);
+
+    IPage<DouyinHot> queryHotFeeds(String userName, String start, String end, String orderByColumn, String orderByType, Integer pageNo, Integer pageSize);
 }

+ 2 - 0
module-crawler/src/main/java/cn/com/ctop/crawler/modules/oceanengine/service/IEffectCaseService.java

@@ -1,7 +1,9 @@
 package cn.com.ctop.crawler.modules.oceanengine.service;
 
 import cn.com.ctop.crawler.modules.oceanengine.entity.EffectCase;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 public interface IEffectCaseService extends IService<EffectCase> {
+    IPage<EffectCase> queryHotFeeds(String userName, String start, String end, String orderByColumn, String orderByType, Integer pageNo, Integer pageSize);
 }

+ 2 - 0
module-crawler/src/main/java/cn/com/ctop/crawler/modules/oceanengine/service/IHotMaterialService.java

@@ -1,7 +1,9 @@
 package cn.com.ctop.crawler.modules.oceanengine.service;
 
 import cn.com.ctop.crawler.modules.oceanengine.entity.HotMaterial;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 public interface IHotMaterialService extends IService<HotMaterial> {
+    IPage<HotMaterial> queryHotFeeds(String userName, String start, String end, String orderByColumn, String orderByType, Integer pageNo, Integer pageSize);
 }

+ 23 - 0
module-crawler/src/main/java/cn/com/ctop/crawler/modules/oceanengine/service/impl/DouyinHotServiceImpl.java

@@ -3,6 +3,9 @@ package cn.com.ctop.crawler.modules.oceanengine.service.impl;
 import cn.com.ctop.crawler.modules.oceanengine.entity.DouyinHot;
 import cn.com.ctop.crawler.modules.oceanengine.mapper.DouyinHotMapper;
 import cn.com.ctop.crawler.modules.oceanengine.service.IDouyinHotService;
+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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -13,7 +16,27 @@ import java.util.List;
 public class DouyinHotServiceImpl extends ServiceImpl<DouyinHotMapper, DouyinHot> implements IDouyinHotService {
     @Autowired
     private DouyinHotMapper douyinHotMapper;
+
+    @Override
     public void replaceBatch(List<DouyinHot> list){
         douyinHotMapper.replaceBatch(list);
     }
+
+    @Override
+    public IPage<DouyinHot> queryHotFeeds(String userName, String start, String end, String orderByColumn, String orderByType, Integer pageNo, Integer pageSize) {
+        QueryWrapper<DouyinHot> queryWrapper = new QueryWrapper<>();
+        if (null != userName && !"".equals(userName)) {
+            queryWrapper.like("user_name", "%" + userName + "%");
+        }
+        if (null != start && !"".equals(start) && null != end && !"".equals(end)) {
+            queryWrapper.between("create_time", start, end);
+        }
+        if (null != orderByType && orderByType.equals("desc")) {
+            queryWrapper.orderByDesc(orderByColumn);
+        } else {
+            queryWrapper.orderByAsc(orderByColumn);
+        }
+        Page<DouyinHot> page = new Page<>(pageNo, pageSize);
+        return this.page(page, queryWrapper);
+    }
 }

+ 20 - 0
module-crawler/src/main/java/cn/com/ctop/crawler/modules/oceanengine/service/impl/EffectCaseServiceImpl.java

@@ -3,9 +3,29 @@ package cn.com.ctop.crawler.modules.oceanengine.service.impl;
 import cn.com.ctop.crawler.modules.oceanengine.entity.EffectCase;
 import cn.com.ctop.crawler.modules.oceanengine.mapper.EffectCaseMapper;
 import cn.com.ctop.crawler.modules.oceanengine.service.IEffectCaseService;
+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 org.springframework.stereotype.Service;
 
 @Service
 public class EffectCaseServiceImpl extends ServiceImpl<EffectCaseMapper, EffectCase> implements IEffectCaseService {
+    @Override
+    public IPage<EffectCase> queryHotFeeds(String userName, String start, String end, String orderByColumn, String orderByType, Integer pageNo, Integer pageSize) {
+        QueryWrapper<EffectCase> queryWrapper = new QueryWrapper<>();
+        if (null != userName && !"".equals(userName)) {
+            queryWrapper.like("author", "%" + userName + "%");
+        }
+        if (null != start && !"".equals(start) && null != end && !"".equals(end)) {
+            queryWrapper.between("create_time", start, end);
+        }
+        if (null != orderByType && orderByType.equals("desc")) {
+            queryWrapper.orderByDesc(orderByColumn);
+        } else {
+            queryWrapper.orderByAsc(orderByColumn);
+        }
+        Page<EffectCase> page = new Page<>(pageNo, pageSize);
+        return this.page(page, queryWrapper);
+    }
 }

+ 20 - 0
module-crawler/src/main/java/cn/com/ctop/crawler/modules/oceanengine/service/impl/HotMaterialServiceImpl.java

@@ -3,9 +3,29 @@ package cn.com.ctop.crawler.modules.oceanengine.service.impl;
 import cn.com.ctop.crawler.modules.oceanengine.entity.HotMaterial;
 import cn.com.ctop.crawler.modules.oceanengine.mapper.HotMaterialMapper;
 import cn.com.ctop.crawler.modules.oceanengine.service.IHotMaterialService;
+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 org.springframework.stereotype.Service;
 
 @Service
 public class HotMaterialServiceImpl extends ServiceImpl<HotMaterialMapper, HotMaterial> implements IHotMaterialService {
+    @Override
+    public IPage<HotMaterial> queryHotFeeds(String userName, String start, String end, String orderByColumn, String orderByType, Integer pageNo, Integer pageSize) {
+        QueryWrapper<HotMaterial> queryWrapper = new QueryWrapper<>();
+        if (null != userName && !"".equals(userName)) {
+            queryWrapper.like("author", "%" + userName + "%");
+        }
+        if (null != start && !"".equals(start) && null != end && !"".equals(end)) {
+            queryWrapper.between("create_time", start, end);
+        }
+        if (null != orderByType && orderByType.equals("desc")) {
+            queryWrapper.orderByDesc(orderByColumn);
+        } else {
+            queryWrapper.orderByAsc(orderByColumn);
+        }
+        Page<HotMaterial> page = new Page<>(pageNo, pageSize);
+        return this.page(page, queryWrapper);
+    }
 }