Sfoglia il codice sorgente

添加优化师头条相关统计接口

syh 5 anni fa
parent
commit
5b7bae2a96

+ 5 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/PerformanceController2.java

@@ -1,6 +1,5 @@
 package org.jeecg.modules.system.controller;
 
-import cn.com.ctop.crawler.modules.account.entity.KuaishouAppAccount;
 import cn.com.ctop.userefficientvideomap.entity.DesignMaterialInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -9,7 +8,10 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.modules.system.service.IPerformanceService2;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
 import java.util.List;
@@ -35,7 +37,7 @@ public class PerformanceController2 {
     @ApiOperation(value = "平台的总有效数量、素材总数、素材有效率、总跑量、当前可获得绩效", notes = "平台的总有效数量、素材总数、素材有效率、总跑量、当前可获得绩效")
     @PostMapping(value = "/getPerformanceInfo")
     public Result<Map<String,Object>> getPerformanceInfo() {
-        Result<Map<String,Object>> result = new Result<Map<String,Object>>();
+        Result<Map<String, Object>> result = new Result<>();
         Map<String,Object> resultMap = new HashMap<>();
         try {
             resultMap = performanceService.getPerformanceInfo();

+ 1 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/PerformanceServiceImpl2.java

@@ -242,7 +242,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
         String endNowDate = DateUtils.formatDate(getDate);
         String year = DateUtils.getYear(getDate) + "";
         String quarter = DateUtils.getQuarter(getDate) + "";
-        return performanceMapper.getOptimizerTotalCost(startDate, endNowDate, year, quarter);
+        return performanceMapper.getKuaishouOptimizerTotalCost(startDate, endNowDate, year, quarter);
     }
 
     //1
@@ -252,8 +252,6 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
     public Map<String, Object> getPerformanceInfo() {
         Map<String, Object> performanceInfoMap = new HashMap<>();
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        //LoginUser sysUser = new LoginUser();
-        //sysUser.setId("9712328fddd1443faf566ddb87693658");
 
         //获取前一天的时间
         Date date = new Date();

+ 4 - 7
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/UserEfficientVideoMap.java

@@ -1,20 +1,17 @@
 package cn.com.ctop.userefficientvideomap.entity;
 
-import java.io.Serializable;
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
+import java.util.Date;
+
 /**
  * 有效视频与角色对应表
  * @author jeecg-boot
@@ -29,9 +26,9 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 public class UserEfficientVideoMap {
 
 	/**id*/
-	@TableId(type = IdType.UUID)
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "id")
-	private Integer id;
+    private Long id;
 	/**有效视频md5*/
 	@Excel(name = "有效视频md5", width = 15)
     @ApiModelProperty(value = "有效视频md5")