hcst_sunzhen преди 5 години
родител
ревизия
8a4d28ea93

+ 23 - 20
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/PerformanceController2.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.system.controller;
 package org.jeecg.modules.system.controller;
 
 
+import cn.com.ctop.common.module.entity.MaterialInfo;
 import cn.com.ctop.performanceappraisal.entity.Performance;
 import cn.com.ctop.performanceappraisal.entity.Performance;
 import cn.com.ctop.userefficientvideomap.entity.DesignMaterialInfo;
 import cn.com.ctop.userefficientvideomap.entity.DesignMaterialInfo;
 import cn.com.ctop.userefficientvideomap.entity.PerformanceTimeDTO;
 import cn.com.ctop.userefficientvideomap.entity.PerformanceTimeDTO;
@@ -319,7 +320,7 @@ public class PerformanceController2 {
 
 
     @AutoLog(value = "获取快手绩效时时数据接口")
     @AutoLog(value = "获取快手绩效时时数据接口")
     @ApiOperation(value = "获取快手绩效时时数据接口", notes = "获取快手绩效时时数据接口")
     @ApiOperation(value = "获取快手绩效时时数据接口", notes = "获取快手绩效时时数据接口")
-    @GetMapping(value = "/kuaishouPerformanceInfoNow")
+    @PostMapping(value = "/kuaishouPerformanceInfoNow")
     public Result<List<UserDto2>> kuaishouPerformanceInfoNow(HttpServletRequest req) {
     public Result<List<UserDto2>> kuaishouPerformanceInfoNow(HttpServletRequest req) {
         Result<List<UserDto2>> result = new Result<List<UserDto2>>();
         Result<List<UserDto2>> result = new Result<List<UserDto2>>();
         List<UserDto2> userDto2List = performanceService.kuaishouPerformanceInfoNow();
         List<UserDto2> userDto2List = performanceService.kuaishouPerformanceInfoNow();
@@ -330,8 +331,8 @@ public class PerformanceController2 {
 
 
     @AutoLog(value = "获取头条绩效时时数据接口")
     @AutoLog(value = "获取头条绩效时时数据接口")
     @ApiOperation(value = "获取头条绩效时时数据接口", notes = "获取头条绩效时时数据接口")
     @ApiOperation(value = "获取头条绩效时时数据接口", notes = "获取头条绩效时时数据接口")
-    @GetMapping(value = "/toutiaoPererformanceInfoNow")
-    public Result<List<UserDto2>> toutiaoPererformanceInfoNow(HttpServletRequest req) {
+    @PostMapping(value = "/toutiaoPerformanceInfoNow")
+    public Result<List<UserDto2>> toutiaoPerformanceInfoNow(HttpServletRequest req) {
         Result<List<UserDto2>> result = new Result<List<UserDto2>>();
         Result<List<UserDto2>> result = new Result<List<UserDto2>>();
         List<UserDto2> userDto2List = performanceService.toutiaoPerformanceInfoNow();
         List<UserDto2> userDto2List = performanceService.toutiaoPerformanceInfoNow();
         result.setSuccess(true);
         result.setSuccess(true);
@@ -413,22 +414,24 @@ public class PerformanceController2 {
         return result;
         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;
-    //}
+    @AutoLog(value = "获取相关有效视频列表")
+    @ApiOperation(value = "获取相关有效视频列表", notes = "获取相关有效视频列表")
+    @PostMapping(value = "/getEffiVideoList")
+    public Result<List<MaterialInfo>> getEffiVideoList(@RequestBody PerformanceTimeDTO dto,
+                                                       HttpServletRequest req) {
+        Result<List<MaterialInfo>> result = new Result<>();
+        String userId = dto.getUserId();
+        Integer year = dto.getYear();
+        Integer quarter = dto.getQuarter();
+        Integer appType = dto.getAppType();
+        if(userId==null || appType == null){
+            result.setSuccess(false);
+            result.setMessage("userId和appType不能为空");
+        }
+        List<MaterialInfo> materialInfoList = performanceService.effiVideoList(appType, year, quarter, userId);
+        result.setSuccess(true);
+        result.setResult(materialInfoList);
+        return result;
+    }
 
 
 }
 }

+ 4 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IPerformanceService2.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.system.service;
 package org.jeecg.modules.system.service;
 
 
+import cn.com.ctop.common.module.entity.MaterialInfo;
 import cn.com.ctop.performanceappraisal.entity.Performance;
 import cn.com.ctop.performanceappraisal.entity.Performance;
 import cn.com.ctop.userefficientvideomap.entity.DesignMaterialInfo;
 import cn.com.ctop.userefficientvideomap.entity.DesignMaterialInfo;
 import cn.com.ctop.userefficientvideomap.entity.UserDto2;
 import cn.com.ctop.userefficientvideomap.entity.UserDto2;
@@ -85,4 +86,7 @@ public interface IPerformanceService2 extends IService<Performance> {
     //获取头条季度绩效报表
     //获取头条季度绩效报表
     List<UserDto2> toutiaoQuarterReport(Integer year, Integer quarter);
     List<UserDto2> toutiaoQuarterReport(Integer year, Integer quarter);
 
 
+    //获取有效视频列表
+    List<MaterialInfo> effiVideoList(Integer appType, Integer year, Integer quarter, String userId);
+
 }
 }

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.system.service.impl;
 package org.jeecg.modules.system.service.impl;
 
 
+import cn.com.ctop.common.module.entity.MaterialInfo;
 import cn.com.ctop.performanceappraisal.entity.Performance;
 import cn.com.ctop.performanceappraisal.entity.Performance;
 import cn.com.ctop.performanceappraisal.mapper.PerformanceMapper;
 import cn.com.ctop.performanceappraisal.mapper.PerformanceMapper;
 import cn.com.ctop.planeprojectcost.entity.PlaneProjectCost;
 import cn.com.ctop.planeprojectcost.entity.PlaneProjectCost;
@@ -1628,17 +1629,18 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
         return resultMap;
         return resultMap;
     }
     }
 
 
-
     //获取快手绩效时时数据接口
     //获取快手绩效时时数据接口
     @Override
     @Override
     public List<UserDto2> kuaishouPerformanceInfoNow() {
     public List<UserDto2> kuaishouPerformanceInfoNow() {
         //0 获取当前季度的时间
         //0 获取当前季度的时间
         Map<String, Integer> dateMap = DateUtils.getYearQuarter(new Date());
         Map<String, Integer> dateMap = DateUtils.getYearQuarter(new Date());
-        Integer year = dateMap.get("year");
-        Integer quarter = dateMap.get("quarter");
+        //Integer year = dateMap.get("year");
+        //Integer quarter = dateMap.get("quarter");
+        int year = 2019;
+        int quarter = 4;
         Map<String, String> timeMap = DateUtils.quarterStartEndDate(year, quarter);
         Map<String, String> timeMap = DateUtils.quarterStartEndDate(year, quarter);
-        String startTime = timeMap.get("startTime");
-        String endTime = timeMap.get("endTime");
+        String startTime = timeMap.get("startDate");
+        String endTime = timeMap.get("endDate");
 
 
         //1 获取快手下所有人
         //1 获取快手下所有人
         List<UserDto2> userDto2List = userEfficientVideoMapMapper.getKuaishouDepartUserInfo();
         List<UserDto2> userDto2List = userEfficientVideoMapMapper.getKuaishouDepartUserInfo();
@@ -1650,13 +1652,16 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
             //2.2 获取有效视频总数
             //2.2 获取有效视频总数
             Integer videoCount = userEfficientVideoMapMapper.getQuarterMaterialCountByUserId(userDto.getRoleCode(), startTime, endTime, userDto.getUserId());
             Integer videoCount = userEfficientVideoMapMapper.getQuarterMaterialCountByUserId(userDto.getRoleCode(), startTime, endTime, userDto.getUserId());
             //2.3 总消耗
             //2.3 总消耗
-            BigDecimal cost = BigDecimal.ZERO;
+            BigDecimal cost = null;
             if ("clip".equals(roleCode)) {
             if ("clip".equals(roleCode)) {
-                cost = userEfficientVideoMapMapper.getTotalCostByPlanId(userDto.getUserId(), startTime, endTime);
+                cost = userEfficientVideoMapMapper.getTotalCostByClipId(userDto.getUserId(), startTime, endTime);
             } else if ("plan".equals(roleCode)) {
             } else if ("plan".equals(roleCode)) {
                 cost = userEfficientVideoMapMapper.getTotalCostByPlanId(userDto.getUserId(), startTime, endTime);
                 cost = userEfficientVideoMapMapper.getTotalCostByPlanId(userDto.getUserId(), startTime, endTime);
             } else if ("shot".equals(roleCode)) {
             } else if ("shot".equals(roleCode)) {
-                cost = userEfficientVideoMapMapper.getTotalCostByPlanId(userDto.getUserId(), startTime, endTime);
+                cost = userEfficientVideoMapMapper.getTotalCostByShotId(userDto.getUserId(), startTime, endTime);
+            }
+            if(cost == null){
+                cost = BigDecimal.ZERO;
             }
             }
             userDto.setCost(cost);
             userDto.setCost(cost);
             userDto.setVideoCount(videoCount);
             userDto.setVideoCount(videoCount);
@@ -1672,8 +1677,8 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
         Integer year = dateMap.get("year");
         Integer year = dateMap.get("year");
         Integer quarter = dateMap.get("quarter");
         Integer quarter = dateMap.get("quarter");
         Map<String, String> timeMap = DateUtils.quarterStartEndDate(year, quarter);
         Map<String, String> timeMap = DateUtils.quarterStartEndDate(year, quarter);
-        String startTime = timeMap.get("startTime");
-        String endTime = timeMap.get("endTime");
+        String startTime = timeMap.get("startDate");
+        String endTime = timeMap.get("endDate");
 
 
         //1 获取头条所有人
         //1 获取头条所有人
         List<UserDto2> userDto2List = userEfficientVideoMapMapper.getToutiaoDepartUserInfo();
         List<UserDto2> userDto2List = userEfficientVideoMapMapper.getToutiaoDepartUserInfo();
@@ -1685,13 +1690,16 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
             //2.2 获取视频总数
             //2.2 获取视频总数
             Integer videoCount = userEfficientVideoMapMapper.getQuarterMaterialCountByUserId(userDto.getRoleCode(), startTime, endTime, userDto.getUserId());
             Integer videoCount = userEfficientVideoMapMapper.getQuarterMaterialCountByUserId(userDto.getRoleCode(), startTime, endTime, userDto.getUserId());
             //2.3 总消耗
             //2.3 总消耗
-            BigDecimal cost = BigDecimal.ZERO;
+            BigDecimal cost = null;
             if ("clip".equals(roleCode)) {
             if ("clip".equals(roleCode)) {
-                cost = userEfficientVideoMapMapper.toutiaoGetTotalCostByPlanId(userDto.getUserId(), startTime, endTime);
+                cost = userEfficientVideoMapMapper.toutiaoGetTotalCostByClipId(userDto.getUserId(), startTime, endTime);
             } else if ("plan".equals(roleCode)) {
             } else if ("plan".equals(roleCode)) {
                 cost = userEfficientVideoMapMapper.toutiaoGetTotalCostByPlanId(userDto.getUserId(), startTime, endTime);
                 cost = userEfficientVideoMapMapper.toutiaoGetTotalCostByPlanId(userDto.getUserId(), startTime, endTime);
             } else if ("shot".equals(roleCode)) {
             } else if ("shot".equals(roleCode)) {
-                cost = userEfficientVideoMapMapper.toutiaoGetTotalCostByPlanId(userDto.getUserId(), startTime, endTime);
+                cost = userEfficientVideoMapMapper.toutiaoGetTotalCostByShotId(userDto.getUserId(), startTime, endTime);
+            }
+            if(cost == null){
+                cost = BigDecimal.ZERO;
             }
             }
             userDto.setCost(cost);
             userDto.setCost(cost);
             userDto.setVideoCount(videoCount);
             userDto.setVideoCount(videoCount);
@@ -1700,7 +1708,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
         return userDto2List;
         return userDto2List;
     }
     }
 
 
-    //快手绩效时时数据接口
+    //快手绩效周报数据接口
     @Override
     @Override
     public List<UserDto2> kuaishouWeekReport(String startDate, String endDate) {
     public List<UserDto2> kuaishouWeekReport(String startDate, String endDate) {
         //1 获取快手下所有人
         //1 获取快手下所有人
@@ -1715,11 +1723,11 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
             //2.3 总消耗
             //2.3 总消耗
             BigDecimal cost = null;
             BigDecimal cost = null;
             if ("clip".equals(roleCode)) {
             if ("clip".equals(roleCode)) {
-                cost = userEfficientVideoMapMapper.getTotalCostByPlanId(userDto.getUserId(), startDate, endDate);
+                cost = userEfficientVideoMapMapper.getTotalCostByClipId(userDto.getUserId(), startDate, endDate);
             } else if ("plan".equals(roleCode)) {
             } else if ("plan".equals(roleCode)) {
                 cost = userEfficientVideoMapMapper.getTotalCostByPlanId(userDto.getUserId(), startDate, endDate);
                 cost = userEfficientVideoMapMapper.getTotalCostByPlanId(userDto.getUserId(), startDate, endDate);
             } else if ("shot".equals(roleCode)) {
             } else if ("shot".equals(roleCode)) {
-                cost = userEfficientVideoMapMapper.getTotalCostByPlanId(userDto.getUserId(), startDate, endDate);
+                cost = userEfficientVideoMapMapper.getTotalCostByShotId(userDto.getUserId(), startDate, endDate);
             }
             }
             if(cost == null){
             if(cost == null){
                 cost = BigDecimal.ZERO;
                 cost = BigDecimal.ZERO;
@@ -1746,11 +1754,11 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
             //2.3 总消耗
             //2.3 总消耗
             BigDecimal cost = null;
             BigDecimal cost = null;
             if ("clip".equals(roleCode)) {
             if ("clip".equals(roleCode)) {
-                cost = userEfficientVideoMapMapper.toutiaoGetTotalCostByPlanId(userDto.getUserId(), startDate, endDate);
+                cost = userEfficientVideoMapMapper.toutiaoGetTotalCostByClipId(userDto.getUserId(), startDate, endDate);
             } else if ("plan".equals(roleCode)) {
             } else if ("plan".equals(roleCode)) {
                 cost = userEfficientVideoMapMapper.toutiaoGetTotalCostByPlanId(userDto.getUserId(), startDate, endDate);
                 cost = userEfficientVideoMapMapper.toutiaoGetTotalCostByPlanId(userDto.getUserId(), startDate, endDate);
             } else if ("shot".equals(roleCode)) {
             } else if ("shot".equals(roleCode)) {
-                cost = userEfficientVideoMapMapper.toutiaoGetTotalCostByPlanId(userDto.getUserId(), startDate, endDate);
+                cost = userEfficientVideoMapMapper.toutiaoGetTotalCostByShotId(userDto.getUserId(), startDate, endDate);
             }
             }
 
 
             if(cost == null){
             if(cost == null){
@@ -1768,14 +1776,14 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
     public List<UserDto2> kuaishouQuarterReport(Integer year, Integer quarter) {
     public List<UserDto2> kuaishouQuarterReport(Integer year, Integer quarter) {
         //0 获取当季度的开始和结束时间
         //0 获取当季度的开始和结束时间
         Map<String, String> timeMap = DateUtils.quarterStartEndDate(year, quarter);
         Map<String, String> timeMap = DateUtils.quarterStartEndDate(year, quarter);
-        String startTime = timeMap.get("startTime");
-        String endTime = timeMap.get("endTime");
+        String startTime = timeMap.get("startDate");
+        String endTime = timeMap.get("endDate");
 
 
         //1 获取快手下所有人
         //1 获取快手下所有人
         List<UserDto2> userDto2List = userEfficientVideoMapMapper.getKuaishouDepartUserInfo();
         List<UserDto2> userDto2List = userEfficientVideoMapMapper.getKuaishouDepartUserInfo();
         //2 循环所有人,并查询出每个人的有效视频数、总视频数、总消耗
         //2 循环所有人,并查询出每个人的有效视频数、总视频数、总消耗
         for (UserDto2 userDto : userDto2List) {
         for (UserDto2 userDto : userDto2List) {
-            String roleCode = userDto.getRoleCode();
+            //String roleCode = userDto.getRoleCode();
             //2.1 获取有效视频数量
             //2.1 获取有效视频数量
             Integer effiVideoCount = userEfficientVideoMapMapper.getEffiVideoCountByUserId(2, year, quarter, userDto.getUserId(), userDto.getRoleId());
             Integer effiVideoCount = userEfficientVideoMapMapper.getEffiVideoCountByUserId(2, year, quarter, userDto.getUserId(), userDto.getRoleId());
             //2.2 获取有效视频总数
             //2.2 获取有效视频总数
@@ -1801,14 +1809,14 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
     public List<UserDto2> toutiaoQuarterReport(Integer year, Integer quarter) {
     public List<UserDto2> toutiaoQuarterReport(Integer year, Integer quarter) {
         //0 获取当季度的开始和结束时间
         //0 获取当季度的开始和结束时间
         Map<String, String> timeMap = DateUtils.quarterStartEndDate(year, quarter);
         Map<String, String> timeMap = DateUtils.quarterStartEndDate(year, quarter);
-        String startTime = timeMap.get("startTime");
-        String endTime = timeMap.get("endTime");
+        String startTime = timeMap.get("startDate");
+        String endTime = timeMap.get("endDate");
 
 
         //1 获取快手下所有人
         //1 获取快手下所有人
         List<UserDto2> userDto2List = userEfficientVideoMapMapper.getKuaishouDepartUserInfo();
         List<UserDto2> userDto2List = userEfficientVideoMapMapper.getKuaishouDepartUserInfo();
         //2 循环所有人,并查询出每个人的有效视频数、总视频数、总消耗
         //2 循环所有人,并查询出每个人的有效视频数、总视频数、总消耗
         for (UserDto2 userDto : userDto2List) {
         for (UserDto2 userDto : userDto2List) {
-            String roleCode = userDto.getRoleCode();
+            //String roleCode = userDto.getRoleCode();
             //2.1 获取有效视频数量
             //2.1 获取有效视频数量
             Integer effiVideoCount = userEfficientVideoMapMapper.getEffiVideoCountByUserId(1, year, quarter, userDto.getUserId(), userDto.getRoleId());
             Integer effiVideoCount = userEfficientVideoMapMapper.getEffiVideoCountByUserId(1, year, quarter, userDto.getUserId(), userDto.getRoleId());
             //2.2 获取有效视频总数
             //2.2 获取有效视频总数
@@ -1829,5 +1837,16 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
         return userDto2List;
         return userDto2List;
     }
     }
 
 
+    //根据userid,appType,年度,季度查询有效视频列表
+    public List<MaterialInfo> effiVideoList(Integer appType, Integer year, Integer quarter, String userId){
+        if(year == null || quarter == null){
+            Map<String, Integer> dateMap = DateUtils.getYearQuarter(new Date());
+            year = dateMap.get("year");
+            quarter = dateMap.get("quarter");
+        }
+        List<MaterialInfo> materialInfoList = userEfficientVideoMapMapper.getEffiVideoList(appType, year, quarter, userId);
+        return materialInfoList;
+    }
+
 }
 }
 
 

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

@@ -11,4 +11,6 @@ public class PerformanceTimeDTO implements Serializable {
     private String endDate;
     private String endDate;
     private Integer year;
     private Integer year;
     private Integer quarter;
     private Integer quarter;
+    private String userId;
+    private Integer appType;
 }
 }

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

@@ -1,5 +1,6 @@
 package cn.com.ctop.userefficientvideomap.mapper;
 package cn.com.ctop.userefficientvideomap.mapper;
 
 
+import cn.com.ctop.common.module.entity.MaterialInfo;
 import cn.com.ctop.userefficientvideomap.entity.*;
 import cn.com.ctop.userefficientvideomap.entity.*;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
@@ -113,5 +114,6 @@ public interface UserEfficientVideoMapMapper extends BaseMapper<UserEfficientVid
     //根据天数的区间获取userId获取有效视频数量
     //根据天数的区间获取userId获取有效视频数量
     Integer getEffiVideoCountByCalcDate(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("roleId") String roleId, @Param("userId") String userId, @Param("appType") Integer appType);
     Integer getEffiVideoCountByCalcDate(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("roleId") String roleId, @Param("userId") String userId, @Param("appType") Integer appType);
 
 
+    List<MaterialInfo> getEffiVideoList(@Param("appType")Integer appType, @Param("year")Integer year, @Param("quarter")Integer quarter, @Param("userId")String userId);
 }
 }
 
 

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

@@ -757,5 +757,22 @@
         and calc_date &gt;= #{startDate}
         and calc_date &gt;= #{startDate}
     </select>
     </select>
 
 
+    <!-- 视频有效素材 -->
+    <select id="getEffiVideoList" resultType="cn.com.ctop.common.module.entity.MaterialInfo">
+            select
+            i.id as id,
+            i.code as code,
+            i.url as url,
+            i.material_name as materialName,
+            i.watermark_material_name as watermarkMaterialName
+        from
+        ctop_user_efficient_video_map m
+        left join ctop_material_info i on m.efficient_video_signature = i.code
+        where
+        m.user_id = #{userId} and
+        m.app_type =#{appType} and
+        m.year = #{year} and
+        m.quarter = #{quarter}
+    </select>
 
 
 </mapper>
 </mapper>