Przeglądaj źródła

Merge branch 'test'

hcst_sunzhen 5 lat temu
rodzic
commit
3feaed016e

+ 22 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialInfoController.java

@@ -46,8 +46,6 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 /**
  * 素材信息
@@ -192,6 +190,28 @@ public class MaterialInfoController {
 
         Page<MaterialInfo> page = new Page<>(pageNo, pageSize);
         IPage<MaterialInfo> pageList = materialInfoService.page(page, queryWrapper);
+
+        List<MaterialInfo> materialInfoList = pageList.getRecords();
+
+        if (materialInfoList.size() != 0){
+            for (MaterialInfo material:materialInfoList){
+                //判断是否已经同步到快手平台
+                Integer kuaishouMaterialUpCount = materialInfoService.getKuaishouUpVideoCount(material.getCode());
+                if (kuaishouMaterialUpCount>0){
+                    material.setKuaishouVideoIsUp(1);
+                }else{
+                    material.setKuaishouVideoIsUp(0);
+                }
+                //判断是否已经同步到抖音平台
+                Integer toutiaoMaterialUpCount = materialInfoService.getToutiaoUpVideoCount(material.getCode());
+                if(toutiaoMaterialUpCount >0){
+                    material.setToutiaoVideoIsUp(1);
+                }else{
+                    material.setToutiaoVideoIsUp(0);
+                }
+            }
+        }
+
         result.setSuccess(true);
         result.setResult(pageList);
         return result;

+ 55 - 14
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/PerformanceController2.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.system.controller;
 
 import cn.com.ctop.performanceappraisal.entity.Performance;
 import cn.com.ctop.userefficientvideomap.entity.DesignMaterialInfo;
+import cn.com.ctop.userefficientvideomap.entity.PerformanceTimeDTO;
 import cn.com.ctop.userefficientvideomap.entity.UserDto2;
 import cn.com.ctop.userefficientvideomap.mapper.UserEfficientVideoMapMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -318,8 +319,8 @@ public class PerformanceController2 {
 
     @AutoLog(value = "获取快手绩效时时数据接口")
     @ApiOperation(value = "获取快手绩效时时数据接口", notes = "获取快手绩效时时数据接口")
-    @GetMapping(value = "/kuaishouPererformanceInfoNow")
-    public Result<List<UserDto2>> kuaishouPererformanceInfoNow(HttpServletRequest req) {
+    @GetMapping(value = "/kuaishouPerformanceInfoNow")
+    public Result<List<UserDto2>> kuaishouPerformanceInfoNow(HttpServletRequest req) {
         Result<List<UserDto2>> result = new Result<List<UserDto2>>();
         List<UserDto2> userDto2List = performanceService.kuaishouPerformanceInfoNow();
         result.setSuccess(true);
@@ -340,11 +341,17 @@ public class PerformanceController2 {
 
     @AutoLog(value = "获取快手绩效周报表")
     @ApiOperation(value = "获取快手绩效周报表", notes = "获取快手绩效周报表")
-    @GetMapping(value = "/kuaishouWeekReport")
-    public Result<List<UserDto2>> kuaishouWeekReport(@RequestParam(name = "startDate") String startDate,
-                                                     @RequestParam(name = "endDate") String endDate,
+    @PostMapping(value = "/kuaishouWeekReport")
+    public Result<List<UserDto2>> kuaishouWeekReport(@RequestBody PerformanceTimeDTO dto,
                                                      HttpServletRequest req) {
         Result<List<UserDto2>> result = new Result<List<UserDto2>>();
+        String startDate = dto.getStartDate();
+        String endDate = dto.getEndDate();
+        if(StringUtils.isBlank(startDate) || StringUtils.isBlank(endDate)){
+            result.setSuccess(false);
+            result.setMessage("时间不能为空");
+            return result;
+        }
         List<UserDto2> userDto2List = performanceService.kuaishouWeekReport(startDate, endDate);
         result.setSuccess(true);
         result.setResult(userDto2List);
@@ -353,11 +360,17 @@ public class PerformanceController2 {
 
     @AutoLog(value = "获取头条绩效周报表")
     @ApiOperation(value = "获取头条绩效周报表", notes = "获取头条绩效周报表")
-    @GetMapping(value = "/toutiaoWeekReport")
-    public Result<List<UserDto2>> toutiaoWeekReport(@RequestParam(name = "pageNo") String startDate,
-                                                    @RequestParam(name = "pageNo") String endDate,
+    @PostMapping(value = "/toutiaoWeekReport")
+    public Result<List<UserDto2>> toutiaoWeekReport(@RequestBody PerformanceTimeDTO dto,
                                                     HttpServletRequest req) {
         Result<List<UserDto2>> result = new Result<List<UserDto2>>();
+        String startDate = dto.getStartDate();
+        String endDate = dto.getEndDate();
+        if(StringUtils.isBlank(startDate) || StringUtils.isBlank(endDate)){
+            result.setSuccess(false);
+            result.setMessage("时间不能为空");
+            return result;
+        }
         List<UserDto2> userDto2List = performanceService.toutiaoWeekReport(startDate, endDate);
         result.setSuccess(true);
         result.setResult(userDto2List);
@@ -366,11 +379,16 @@ public class PerformanceController2 {
 
     @AutoLog(value = "获取快手季度绩效报表")
     @ApiOperation(value = "获取快手季度绩效报表", notes = "获取快手季度绩效报表")
-    @GetMapping(value = "/kuaishouQuarterReport")
-    public Result<List<UserDto2>> kuaishouQuarterReport(@RequestParam(name = "pageNo") Integer year,
-                                                        @RequestParam(name = "pageNo") Integer quarter,
+    @PostMapping(value = "/kuaishouQuarterReport")
+    public Result<List<UserDto2>> kuaishouQuarterReport(@RequestBody PerformanceTimeDTO dto,
                                                         HttpServletRequest req) {
         Result<List<UserDto2>> result = new Result<List<UserDto2>>();
+        Integer year = dto.getYear();
+        Integer quarter = dto.getQuarter();
+        if(year==null || quarter == null){
+            result.setSuccess(false);
+            result.setMessage("时间不能为空");
+        }
         List<UserDto2> userDto2List = performanceService.kuaishouQuarterReport(year, quarter);
         result.setSuccess(true);
         result.setResult(userDto2List);
@@ -379,15 +397,38 @@ public class PerformanceController2 {
 
     @AutoLog(value = "获取头条季度绩效报表")
     @ApiOperation(value = "获取头条季度绩效报表", notes = "获取头条季度绩效报表")
-    @GetMapping(value = "/toutiaoQuarterReport")
-    public Result<List<UserDto2>> toutiaoQuarterReport(@RequestParam(name = "pageNo") Integer year,
-                                                       @RequestParam(name = "pageNo") Integer quarter,
+    @PostMapping(value = "/toutiaoQuarterReport")
+    public Result<List<UserDto2>> toutiaoQuarterReport(@RequestBody PerformanceTimeDTO dto,
                                                        HttpServletRequest req) {
         Result<List<UserDto2>> result = new Result<List<UserDto2>>();
+        Integer year = dto.getYear();
+        Integer quarter = dto.getQuarter();
+        if(year==null || quarter == null){
+            result.setSuccess(false);
+            result.setMessage("时间不能为空");
+        }
         List<UserDto2> userDto2List = performanceService.toutiaoQuarterReport(year, quarter);
         result.setSuccess(true);
         result.setResult(userDto2List);
         return result;
     }
 
+    //@AutoLog(value = "获取相关有效视频列表")
+    //@ApiOperation(value = "获取相关有效视频列表", notes = "获取相关有效视频列表")
+    //@PostMapping(value = "/toutiaoQuarterReport")
+    //public Result<List<UserDto2>> getEffiVideoList(@RequestBody PerformanceTimeDTO dto,
+    //                                                   HttpServletRequest req) {
+    //    Result<List<UserDto2>> result = new Result<List<UserDto2>>();
+    //    Integer year = dto.getYear();
+    //    Integer quarter = dto.getQuarter();
+    //    if(year==null || quarter == null){
+    //        result.setSuccess(false);
+    //        result.setMessage("时间不能为空");
+    //    }
+    //    List<UserDto2> userDto2List = performanceService.toutiaoQuarterReport(year, quarter);
+    //    result.setSuccess(true);
+    //    result.setResult(userDto2List);
+    //    return result;
+    //}
+
 }

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

@@ -1700,7 +1700,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
         return userDto2List;
     }
 
-    //获取快手绩效时时数据接口
+    //快手绩效时时数据接口
     @Override
     public List<UserDto2> kuaishouWeekReport(String startDate, String endDate) {
         //1 获取快手下所有人
@@ -1713,7 +1713,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
             //2.2 获取有效视频总数
             Integer videoCount = userEfficientVideoMapMapper.getQuarterMaterialCountByUserId(userDto.getRoleCode(), startDate, endDate, userDto.getUserId());
             //2.3 总消耗
-            BigDecimal cost = BigDecimal.ZERO;
+            BigDecimal cost = null;
             if ("clip".equals(roleCode)) {
                 cost = userEfficientVideoMapMapper.getTotalCostByPlanId(userDto.getUserId(), startDate, endDate);
             } else if ("plan".equals(roleCode)) {
@@ -1721,6 +1721,9 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
             } else if ("shot".equals(roleCode)) {
                 cost = userEfficientVideoMapMapper.getTotalCostByPlanId(userDto.getUserId(), startDate, endDate);
             }
+            if(cost == null){
+                cost = BigDecimal.ZERO;
+            }
             userDto.setCost(cost);
             userDto.setVideoCount(videoCount);
             userDto.setEffiVideoCount(effiVideoCount);
@@ -1729,7 +1732,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
         return userDto2List;
     }
 
-    //获取头条绩效实时数据
+    //头条绩效实时数据
     public List<UserDto2> toutiaoWeekReport(String startDate, String endDate) {
         //1 获取头条所有人
         List<UserDto2> userDto2List = userEfficientVideoMapMapper.getToutiaoDepartUserInfo();
@@ -1741,7 +1744,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
             //2.2 获取视频总数
             Integer videoCount = userEfficientVideoMapMapper.getQuarterMaterialCountByUserId(userDto.getRoleCode(), startDate, endDate, userDto.getUserId());
             //2.3 总消耗
-            BigDecimal cost = BigDecimal.ZERO;
+            BigDecimal cost = null;
             if ("clip".equals(roleCode)) {
                 cost = userEfficientVideoMapMapper.toutiaoGetTotalCostByPlanId(userDto.getUserId(), startDate, endDate);
             } else if ("plan".equals(roleCode)) {
@@ -1749,6 +1752,10 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
             } else if ("shot".equals(roleCode)) {
                 cost = userEfficientVideoMapMapper.toutiaoGetTotalCostByPlanId(userDto.getUserId(), startDate, endDate);
             }
+
+            if(cost == null){
+                cost = BigDecimal.ZERO;
+            }
             userDto.setCost(cost);
             userDto.setVideoCount(videoCount);
             userDto.setEffiVideoCount(effiVideoCount);
@@ -1756,7 +1763,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
         return userDto2List;
     }
 
-    //获取快手季度绩效报表
+    //快手季度绩效报表
     @Override
     public List<UserDto2> kuaishouQuarterReport(Integer year, Integer quarter) {
         //0 获取当季度的开始和结束时间
@@ -1789,7 +1796,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
         return userDto2List;
     }
 
-    //获取快手季度绩效报表
+    //头条季度绩效报表
     @Override
     public List<UserDto2> toutiaoQuarterReport(Integer year, Integer quarter) {
         //0 获取当季度的开始和结束时间

+ 6 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/MaterialInfo.java

@@ -123,4 +123,10 @@ public class MaterialInfo {
 
     private Integer kuaishouEffiType; //判断是否为快手有效素材0否_1是
 
+    @TableField(exist = false)
+    private Integer kuaishouVideoIsUp;  //判断是否已经同步到快手平台0否_1是
+
+    @TableField(exist = false)
+    private Integer toutiaoVideoIsUp;  //判断是否已经同步到头条平台0否_1是
+
 }

+ 4 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/MaterialInfoMapper.java

@@ -20,4 +20,8 @@ public interface MaterialInfoMapper extends BaseMapper<MaterialInfo> {
     Integer selectCountByMap(Map<String, Object> requestMap);
 
     String getRoleCodeByUserId(@Param("userId") String userId);
+
+    Integer getKuaishouUpVideoCount(@Param("code")String code);
+
+    Integer getToutiaoUpVideoCount(@Param("code")String code);
 }

+ 17 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/MaterialInfoMapper.xml

@@ -40,5 +40,22 @@
     )
     </select>
 
+    <select id="getKuaishouUpVideoCount" resultType="java.lang.Integer">
+        select
+        count(1)
+        from
+        ctop_kuaishou_video_get v
+        where
+        v.signature = #{code}
+    </select>
+
+    <select id="getToutiaoUpVideoCount" resultType="java.lang.Integer">
+        select
+        count(1)
+        from
+        ctop_bytedance_video_info v
+        where
+        v.signature = #{code}
+    </select>
 
 </mapper>

+ 5 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/IMaterialInfoService.java

@@ -3,6 +3,7 @@ package cn.com.ctop.common.module.service;
 import cn.com.ctop.common.module.entity.MaterialInfo;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Map;
 
@@ -33,4 +34,8 @@ public interface IMaterialInfoService extends IService<MaterialInfo> {
     void getFile(MaterialInfo materialInfo);
 
     void setExcellent(String id, Integer excellent);
+
+    Integer getKuaishouUpVideoCount(@Param("code")String code);
+
+    Integer getToutiaoUpVideoCount(@Param("code")String code);
 }

+ 10 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -412,4 +412,14 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
         info.setExcellent(excellent);
         this.updateById(info);
     }
+
+    @Override
+    public Integer getKuaishouUpVideoCount(String code) {
+        return materialInfoMapper.getKuaishouUpVideoCount(code);
+    }
+
+    @Override
+    public Integer getToutiaoUpVideoCount(String code) {
+        return materialInfoMapper.getToutiaoUpVideoCount(code);
+    }
 }

+ 14 - 0
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/PerformanceTimeDTO.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.userefficientvideomap.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class PerformanceTimeDTO implements Serializable {
+    private String StartDate;
+    private String endDate;
+    private Integer year;
+    private Integer quarter;
+}

+ 1 - 0
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/mapper/xml/UserEfficientVideoMapMapper.xml

@@ -573,6 +573,7 @@
         quarter = #{quarter}
         and
         app_type = #{appType}
+        limit 1
     </select>
 
     <select id="getOrgCodeByProjectId" resultType="string">