瀏覽代碼

Merge branch 'test'

# Conflicts:
#	module-common/pom.xml
#	module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java
yumeng 5 年之前
父節點
當前提交
ac379bcaca

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/DictAspect.java

@@ -41,7 +41,7 @@ public class DictAspect {
     /**
      * 定义切点Pointcut
      */
-    @Pointcut("execution(public * org.jeecg.modules..*.*Controller.*(..))")
+    @Pointcut("execution(public * org.jeecg.modules..*.*Controller.*(..))||execution(public * cn.com.ctop..*.*Controller.*(..))")
     public void excudeService() {
     }
 

module-common/lib/jave-1.0.2.jar → lib/jave-1.0.2.jar


+ 0 - 25
module-common/pom.xml

@@ -23,17 +23,6 @@
     </properties>
 
     <dependencies>
-        <!--<dependency>
-            <groupId>cn.com.ctop</groupId>
-            <artifactId>module-toutiao</artifactId>
-            <version>2.0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.com.ctop</groupId>
-            <artifactId>module-kuaishou</artifactId>
-            <version>2.0.2</version>
-        </dependency>-->
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -66,21 +55,7 @@
 
     </dependencies>
     <build>
-        <!--
-                <plugins>
-                    <plugin>
-                        <groupId>org.springframework.boot</groupId>
-                        <artifactId>spring-boot-maven-plugin</artifactId>
-                        <configuration>
-                            <includeSystemScope>true</includeSystemScope>
-                        </configuration>
-                    </plugin>
-                </plugins>-->
-
-
         <resources>
-
-
             <resource>
                 <directory>lib</directory>
                 <targetPath>BOOT-INF/lib/</targetPath>

+ 2 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

@@ -361,11 +361,9 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
         if (!Check.isNull(startDate)) {
             param.put("start_date", DateUtils.formatDate(startDate));
         }
-        if (Check.isNull(endDate)) {
+        if (!Check.isNull(endDate)) {
             param.put("end_date", DateUtils.formatDate(endDate));
         }
-
-
         param.put("advertiser_id", token.getAccountId());
         param.put("temporal_granularity", "DAILY");
         param.put("page_size", 500);
@@ -2043,6 +2041,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                             }
                         }
                     }
+                    log.info("获取视频信息完成,advertiserId:{}", advertiserId);
                 } else {
                     log.error("获取广告视频失败,advertiser_id:{},返回信息:{}", advertiserId, resultJson);
                 }

+ 1 - 1
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/PerformanceController.java

@@ -1,7 +1,7 @@
 package cn.com.ctop.performanceappraisal.controller;
 
-import cn.com.ctop.performanceappraisal.entity.Performance;
 import cn.com.ctop.performanceappraisal.service.IPerformanceService;
+import cn.com.ctop.performanceappraisal.entity.Performance;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

+ 12 - 14
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/Performance.java

@@ -3,14 +3,13 @@ package cn.com.ctop.performanceappraisal.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -31,20 +30,22 @@ public class Performance {
     /**
      * id
      */
-    @TableId(type = IdType.UUID)
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "id")
-    private Integer id;
+    private Long id;
     /**
      * sys_user的主键id
      */
     @Excel(name = "sys_user的主键id", width = 15)
     @ApiModelProperty(value = "sys_user的主键id")
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
     private String userId;
     /**
      * sys_role的主键id
      */
     @Excel(name = "sys_role的主键id", width = 15)
     @ApiModelProperty(value = "sys_role的主键id")
+    @Dict(dicCode = "id", dictTable = "sys_role", dicText = "role_name")
     private String roleId;
     /**
      * 年度
@@ -61,19 +62,15 @@ public class Performance {
     /**
      * 绩效统计开始时间
      */
-    @Excel(name = "绩效统计开始时间", width = 15, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "绩效统计开始时间", width = 15)
     @ApiModelProperty(value = "绩效统计开始时间")
-    private Date startTime;
+    private String startTime;
     /**
      * 绩效统计结束时间
      */
-    @Excel(name = "绩效统计结束时间", width = 15, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "绩效统计结束时间", width = 15)
     @ApiModelProperty(value = "绩效统计结束时间")
-    private Date endTime;
+    private String endTime;
     /**
      * 总消耗(单位元)
      */
@@ -107,8 +104,9 @@ public class Performance {
     /**
      * 1_快手2_抖音
      */
-    @Excel(name = "1_快手2_抖音", width = 15)
-    @ApiModelProperty(value = "1_快手2_抖音")
+    @Excel(name = "媒体类型", width = 15)
+    @ApiModelProperty(value = "媒体类型")
+    @Dict(dicCode = "media_type")
     private Integer appType;
     /**
      * 创建时间

+ 10 - 14
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/RolePerformancRraise.java

@@ -1,21 +1,17 @@
 package cn.com.ctop.performanceappraisal.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;
+
 /**
  * 角色提点比例
  *
@@ -33,9 +29,9 @@ public class RolePerformancRraise {
     /**
      * id
      */
-    @TableId(type = IdType.UUID)
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "id")
-    private Integer id;
+    private Long id;
     /**
      * 角色id
      */
@@ -61,6 +57,12 @@ public class RolePerformancRraise {
     @ApiModelProperty(value = "n 百分之n")
     private java.math.BigDecimal videoEfficiencyRate;
     /**
+     * 1:快手 2:头条
+     */
+    @Excel(name = "1:快手 2:头条", width = 15)
+    @ApiModelProperty(value = "1:快手 2:头条")
+    private Integer appType;
+    /**
      * 是否可用
      */
     @Excel(name = "是否可用", width = 15)
@@ -76,10 +78,4 @@ public class RolePerformancRraise {
      */
     @ApiModelProperty(value = "updateTime")
     private Date updateTime;
-    /**
-     * 1:快手 2:头条
-     */
-    @Excel(name = "1:快手 2:头条", width = 15)
-    @ApiModelProperty(value = "1:快手 2:头条")
-    private Integer appType;
 }

+ 5 - 2
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/RolePerformanceCommission.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 import java.util.Date;
@@ -29,14 +30,15 @@ public class RolePerformanceCommission {
     /**
      * 主键id
      */
-    @TableId(type = IdType.UUID)
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键id")
-    private Integer id;
+    private Long id;
     /**
      * sys_role的主键id
      */
     @Excel(name = "sys_role的主键id", width = 15)
     @ApiModelProperty(value = "sys_role的主键id")
+    @Dict(dicCode = "id", dictTable = "sys_role", dicText = "role_name")
     private String roleId;
     /**
      * 角色提成比例
@@ -55,6 +57,7 @@ public class RolePerformanceCommission {
      */
     @Excel(name = "1:快手  2:头条", width = 15)
     @ApiModelProperty(value = "1:快手  2:头条")
+    @Dict(dicCode = "media_type")
     private Integer appType;
     /**
      * 开始时间

+ 1 - 1
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/impl/PerformanceServiceImpl.java

@@ -1,8 +1,8 @@
 package cn.com.ctop.performanceappraisal.service.impl;
 
+import cn.com.ctop.performanceappraisal.service.IPerformanceService;
 import cn.com.ctop.performanceappraisal.entity.Performance;
 import cn.com.ctop.performanceappraisal.mapper.PerformanceMapper;
-import cn.com.ctop.performanceappraisal.service.IPerformanceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;