瀏覽代碼

Merge remote-tracking branch 'origin/test' into test

yumeng 5 年之前
父節點
當前提交
72987ea13e
共有 19 個文件被更改,包括 657 次插入16 次删除
  1. 184 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/DramaInfoController.java
  2. 248 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/DramaRoleInfoController.java
  3. 3 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java
  4. 0 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestController.java
  5. 37 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/DramaInfo.java
  6. 65 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/DramaRoleInfo.java
  7. 2 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedancePlanHourlyReportLoadJob.java
  8. 14 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/DramaInfoMapper.java
  9. 15 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/DramaRoleInfoMapper.java
  10. 5 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/DramaInfoMapper.xml
  11. 5 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/DramaRoleInfoMapper.xml
  12. 14 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IDramaInfoService.java
  13. 15 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IDramaRoleInfoService.java
  14. 18 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/DramaInfoServiceImpl.java
  15. 19 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/DramaRoleInfoServiceImpl.java
  16. 2 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/job/KuaishouReportAgentJob.java
  17. 3 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouReportDailyAgentServiceImpl.java
  18. 6 2
      module-report/src/main/java/cn/com/ctop/bytedance/service/impl/ReportServiceImpl.java
  19. 2 2
      performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/mapper/xml/UserEfficientVideoMapMapper.xml

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

@@ -0,0 +1,184 @@
+package org.jeecg.modules.ctop.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.ctop.entity.DramaInfo;
+import org.jeecg.modules.ctop.service.IDramaInfoService;
+import org.jeecg.modules.system.entity.SysCategory;
+import org.jeecg.modules.system.service.ISysCategoryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 剧本信息
+ * @author jeecg-boot
+ * @date   2020-03-04
+ * @version V1.0
+ */
+@Slf4j
+@Api(tags="剧本信息")
+@RestController
+@RequestMapping("/ctop/dramaInfo")
+public class DramaInfoController {
+	@Autowired
+	private IDramaInfoService dramaInfoService;
+	@Autowired
+	private ISysCategoryService categoryService;
+
+	/**
+	  * 分页列表查询
+	 * @param dramaInfo
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "剧本信息-分页列表查询")
+	@ApiOperation(value="剧本信息-分页列表查询", notes="剧本信息-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<DramaInfo>> queryPageList(DramaInfo dramaInfo,
+												  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+												  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+												  HttpServletRequest req) {
+		Result<IPage<DramaInfo>> result = new Result<IPage<DramaInfo>>();
+		QueryWrapper<DramaInfo> queryWrapper = QueryGenerator.initQueryWrapper(dramaInfo, req.getParameterMap());
+		Page<DramaInfo> page = new Page<DramaInfo>(pageNo, pageSize);
+		IPage<DramaInfo> pageList = dramaInfoService.page(page, queryWrapper);
+		if (pageList != null && pageList.getRecords() != null && pageList.getRecords().size() > 0) {
+			List<DramaInfo> list = new ArrayList<>();
+			for (int i = 0; i < pageList.getRecords().size(); i++) {
+				DramaInfo getDramaInfo = pageList.getRecords().get(i);
+				SysCategory sysCategory = categoryService.getById(getDramaInfo.getCategory());
+				if (sysCategory != null) {
+					getDramaInfo.setCategory(sysCategory.getName());
+				}
+				list.add(getDramaInfo);
+			}
+			pageList.setRecords(list);
+		}
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+
+	/**
+	  *   添加
+	 * @param dramaInfo
+	 * @return
+	 */
+	@AutoLog(value = "剧本信息-添加")
+	@ApiOperation(value="剧本信息-添加", notes="剧本信息-添加")
+	@PostMapping(value = "/add")
+	public Result<DramaInfo> add(@RequestBody DramaInfo dramaInfo) {
+		Result<DramaInfo> result = new Result<>();
+		try {
+			// 获取登录用户信息
+			LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			dramaInfo.setUserId(sysUser.getId());
+			dramaInfo.setUserName(sysUser.getUsername());
+			dramaInfo.setUpdateTime(new Date());
+			dramaInfoService.save(dramaInfo);
+
+			result.success("添加成功!");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+
+	/**
+	  *  编辑
+	 * @param dramaInfo
+	 * @return
+	 */
+	@AutoLog(value = "剧本信息-编辑")
+	@ApiOperation(value="剧本信息-编辑", notes="剧本信息-编辑")
+	@PutMapping(value = "/edit")
+	public Result<DramaInfo> edit(@RequestBody DramaInfo dramaInfo) {
+		Result<DramaInfo> result = new Result<DramaInfo>();
+		DramaInfo dramaInfoEntity = dramaInfoService.getById(dramaInfo.getId());
+		if(dramaInfoEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = dramaInfoService.updateById(dramaInfo);
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "剧本信息-通过id删除")
+	@ApiOperation(value="剧本信息-通过id删除", notes="剧本信息-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		try {
+			dramaInfoService.removeById(id);
+		} catch (Exception e) {
+			log.error("删除失败",e.getMessage());
+			return Result.error("删除失败!");
+		}
+		return Result.ok("删除成功!");
+	}
+
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "剧本信息-批量删除")
+	@ApiOperation(value="剧本信息-批量删除", notes="剧本信息-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<DramaInfo> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<DramaInfo> result = new Result<DramaInfo>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+			this.dramaInfoService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "剧本信息-通过id查询")
+	@ApiOperation(value="剧本信息-通过id查询", notes="剧本信息-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<DramaInfo> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<DramaInfo> result = new Result<DramaInfo>();
+		DramaInfo dramaInfo = dramaInfoService.getById(id);
+		if(dramaInfo==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(dramaInfo);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+}

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

@@ -0,0 +1,248 @@
+package org.jeecg.modules.ctop.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.ctop.entity.DramaRoleInfo;
+import org.jeecg.modules.ctop.service.IDramaRoleInfoService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 剧本角色信息
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2020-03-05
+ */
+@Slf4j
+@Api(tags = "剧本角色信息")
+@RestController
+@RequestMapping("/ctop/dramaRoleInfo")
+public class DramaRoleInfoController {
+    @Autowired
+    private IDramaRoleInfoService dramaRoleInfoService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param dramaRoleInfo
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "剧本角色信息-分页列表查询")
+    @ApiOperation(value = "剧本角色信息-分页列表查询", notes = "剧本角色信息-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<DramaRoleInfo>> queryPageList(DramaRoleInfo dramaRoleInfo,
+                                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                      HttpServletRequest req) {
+        Result<IPage<DramaRoleInfo>> result = new Result<IPage<DramaRoleInfo>>();
+        QueryWrapper<DramaRoleInfo> queryWrapper = QueryGenerator.initQueryWrapper(dramaRoleInfo, req.getParameterMap());
+        Page<DramaRoleInfo> page = new Page<DramaRoleInfo>(pageNo, pageSize);
+        IPage<DramaRoleInfo> pageList = dramaRoleInfoService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param dramaRoleInfo
+     * @return
+     */
+    @AutoLog(value = "剧本角色信息-添加")
+    @ApiOperation(value = "剧本角色信息-添加", notes = "剧本角色信息-添加")
+    @PostMapping(value = "/add")
+    public Result<DramaRoleInfo> add(@RequestBody DramaRoleInfo dramaRoleInfo) {
+        Result<DramaRoleInfo> result = new Result<DramaRoleInfo>();
+        try {
+            dramaRoleInfoService.save(dramaRoleInfo);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param dramaRoleInfo
+     * @return
+     */
+    @AutoLog(value = "剧本角色信息-编辑")
+    @ApiOperation(value = "剧本角色信息-编辑", notes = "剧本角色信息-编辑")
+    @PutMapping(value = "/edit")
+    public Result<DramaRoleInfo> edit(@RequestBody DramaRoleInfo dramaRoleInfo) {
+        Result<DramaRoleInfo> result = new Result<DramaRoleInfo>();
+        DramaRoleInfo dramaRoleInfoEntity = dramaRoleInfoService.getById(dramaRoleInfo.getId());
+        if (dramaRoleInfoEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = dramaRoleInfoService.updateById(dramaRoleInfo);
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "剧本角色信息-通过id删除")
+    @ApiOperation(value = "剧本角色信息-通过id删除", notes = "剧本角色信息-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            dramaRoleInfoService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "剧本角色信息-批量删除")
+    @ApiOperation(value = "剧本角色信息-批量删除", notes = "剧本角色信息-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<DramaRoleInfo> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<DramaRoleInfo> result = new Result<DramaRoleInfo>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.dramaRoleInfoService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "剧本角色信息-通过id查询")
+    @ApiOperation(value = "剧本角色信息-通过id查询", notes = "剧本角色信息-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<DramaRoleInfo> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<DramaRoleInfo> result = new Result<DramaRoleInfo>();
+        DramaRoleInfo dramaRoleInfo = dramaRoleInfoService.getById(id);
+        if (dramaRoleInfo == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(dramaRoleInfo);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<DramaRoleInfo> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                DramaRoleInfo dramaRoleInfo = JSON.parseObject(deString, DramaRoleInfo.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(dramaRoleInfo, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<DramaRoleInfo> pageList = dramaRoleInfoService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "剧本角色信息列表");
+        mv.addObject(NormalExcelConstants.CLASS, DramaRoleInfo.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("剧本角色信息列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<DramaRoleInfo> listDramaRoleInfos = ExcelImportUtil.importExcel(file.getInputStream(), DramaRoleInfo.class, params);
+                dramaRoleInfoService.saveBatch(listDramaRoleInfos);
+                return Result.ok("文件导入成功!数据行数:" + listDramaRoleInfos.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
+
+}

+ 3 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java

@@ -124,7 +124,9 @@ public class ProjectController {
                     for (ProjectMember member : projectMemberList) {
                     for (ProjectMember member : projectMemberList) {
                         Long projectId = member.getProjectId();
                         Long projectId = member.getProjectId();
                         Project project = projectService.getById(projectId);
                         Project project = projectService.getById(projectId);
-                        projects.add(project);
+                        if (null != project) {
+                            projects.add(project);
+                        }
                     }
                     }
                 }
                 }
             } else {
             } else {

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

@@ -683,7 +683,5 @@ public class TestController {
                 }
                 }
             }
             }
         });
         });
-
-
     }
     }
 }
 }

+ 37 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/DramaInfo.java

@@ -0,0 +1,37 @@
+package org.jeecg.modules.ctop.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 剧本信息
+ * @author jeecg-boot
+ * @date   2020-03-04
+ * @version V1.0
+ */
+@Data
+@TableName("ctop_drama_info")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ctop_drama_info对象", description="剧本信息")
+public class DramaInfo {
+	@TableId(type = IdType.AUTO)
+	private Long id;
+	private String userId;
+	private String category;
+	private String dramaName;
+	private String tag;
+	private String userName;
+	private Integer nonpublic;
+	private String introduction;
+	private Integer status;
+	private Date createTime;
+	private Date updateTime;
+}

+ 65 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/DramaRoleInfo.java

@@ -0,0 +1,65 @@
+package org.jeecg.modules.ctop.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * 剧本角色信息
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2020-03-05
+ */
+@Data
+@TableName("ctop_drama_role_info")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_drama_role_info对象", description = "剧本角色信息")
+public class DramaRoleInfo {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "id")
+    private Long id;
+
+    private Long dramaId;
+    /**
+     * name
+     */
+    @Excel(name = "name", width = 15)
+    @ApiModelProperty(value = "name")
+    private String name;
+    /**
+     * introduction
+     */
+    @Excel(name = "introduction", width = 15)
+    @ApiModelProperty(value = "introduction")
+    private String introduction;
+    /**
+     * sex
+     */
+    @Excel(name = "sex", width = 15)
+    @ApiModelProperty(value = "sex")
+    private Integer sex;
+    /**
+     * createTime
+     */
+    @ApiModelProperty(value = "createTime")
+    private Date createTime;
+    /**
+     * updateTime
+     */
+    @ApiModelProperty(value = "updateTime")
+    private Date updateTime;
+}

+ 2 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedancePlanHourlyReportLoadJob.java

@@ -1,10 +1,8 @@
 package org.jeecg.modules.ctop.job;
 package org.jeecg.modules.ctop.job;
 
 
-import cn.com.ctop.bytedance.service.IBytedancePlanHourlyReportService;
 import cn.com.ctop.bytedance.service.IReportService;
 import cn.com.ctop.bytedance.service.IReportService;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
-import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.DateUtils;
@@ -28,10 +26,6 @@ public class BytedancePlanHourlyReportLoadJob implements Job {
     @Autowired
     @Autowired
     private ICtopOauthTokenService tokenService;
     private ICtopOauthTokenService tokenService;
     @Autowired
     @Autowired
-    private IBytedancePlanHourlyReportService planHourlyReportService;
-    @Autowired
-    private IUserAllocationService userAllocationService;
-    @Autowired
     private IReportService reportService;
     private IReportService reportService;
     static ExecutorService executorService = null;
     static ExecutorService executorService = null;
     //线程计数器
     //线程计数器
@@ -70,6 +64,8 @@ public class BytedancePlanHourlyReportLoadJob implements Job {
         } catch (InterruptedException e) {
         } catch (InterruptedException e) {
             e.printStackTrace();
             e.printStackTrace();
         }
         }
+        //清洗玫瑰相亲渠道号数据
+
         log.info("头条计划时报数据获取完成");
         log.info("头条计划时报数据获取完成");
         executorService.shutdown();
         executorService.shutdown();
     }
     }

+ 14 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/DramaInfoMapper.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.ctop.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.ctop.entity.DramaInfo;
+
+/**
+ * 剧本信息
+ * @author: jeecg-boot
+ * @date:   2020-03-04
+ * @cersion: V1.0
+ */
+public interface DramaInfoMapper extends BaseMapper<DramaInfo> {
+
+}

+ 15 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/DramaRoleInfoMapper.java

@@ -0,0 +1,15 @@
+package org.jeecg.modules.ctop.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.ctop.entity.DramaRoleInfo;
+
+/**
+ * 剧本角色信息
+ *
+ * @author: jeecg-boot
+ * @date: 2020-03-05
+ * @cersion: V1.0
+ */
+public interface DramaRoleInfoMapper extends BaseMapper<DramaRoleInfo> {
+
+}

+ 5 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/DramaInfoMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.ctop.mapper.DramaInfoMapper">
+
+</mapper>

+ 5 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/DramaRoleInfoMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.ctop.mapper.DramaRoleInfoMapper">
+
+</mapper>

+ 14 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IDramaInfoService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.ctop.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.ctop.entity.DramaInfo;
+
+/**
+ * 剧本信息
+ * @author jeecg-boot
+ * @date   2020-03-04
+ * @version V1.0
+ */
+public interface IDramaInfoService extends IService<DramaInfo> {
+
+}

+ 15 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IDramaRoleInfoService.java

@@ -0,0 +1,15 @@
+package org.jeecg.modules.ctop.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.ctop.entity.DramaRoleInfo;
+
+/**
+ * 剧本角色信息
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2020-03-05
+ */
+public interface IDramaRoleInfoService extends IService<DramaRoleInfo> {
+
+}

+ 18 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/DramaInfoServiceImpl.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.ctop.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.ctop.entity.DramaInfo;
+import org.jeecg.modules.ctop.mapper.DramaInfoMapper;
+import org.jeecg.modules.ctop.service.IDramaInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 剧本信息
+ * @author jeecg-boot
+ * @date   2020-03-04
+ * @version V1.0
+ */
+@Service
+public class DramaInfoServiceImpl extends ServiceImpl<DramaInfoMapper, DramaInfo> implements IDramaInfoService {
+
+}

+ 19 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/DramaRoleInfoServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.ctop.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.ctop.entity.DramaRoleInfo;
+import org.jeecg.modules.ctop.mapper.DramaRoleInfoMapper;
+import org.jeecg.modules.ctop.service.IDramaRoleInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 剧本角色信息
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2020-03-05
+ */
+@Service
+public class DramaRoleInfoServiceImpl extends ServiceImpl<DramaRoleInfoMapper, DramaRoleInfo> implements IDramaRoleInfoService {
+
+}

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/job/KuaishouReportAgentJob.java

@@ -31,9 +31,9 @@ public class KuaishouReportAgentJob implements Job {
     @Override
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
         String currentDate = DateUtils.formatDate(DateUtils.addDay(new Date(),-1));
         String currentDate = DateUtils.formatDate(DateUtils.addDay(new Date(),-1));
-        kuaishouReportDailyAgentService.getReport(currentDate,currentDate);
+        kuaishouReportDailyAgentService.getReport(currentDate,DateUtils.getNowDate("yyyy-MM-dd"));
 
 
-        //kuaishouReportDailyAgentService.getReport("2019-01-01","2019-12-12");
+//        kuaishouReportDailyAgentService.getReport("2019-12-12","2020-03-05");
 
 
     }
     }
 }
 }

+ 3 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouReportDailyAgentServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
 import org.apache.http.client.CookieStore;
 import org.apache.http.client.CookieStore;
 import org.apache.http.impl.client.BasicCookieStore;
 import org.apache.http.impl.client.BasicCookieStore;
 import org.apache.http.impl.cookie.BasicClientCookie;
 import org.apache.http.impl.cookie.BasicClientCookie;
@@ -185,8 +186,9 @@ public class KuaishouReportDailyAgentServiceImpl extends ServiceImpl<KuaishouRep
             headerMap.put("Content-Type","application/json;charset=utf-8");
             headerMap.put("Content-Type","application/json;charset=utf-8");
             headerMap.put("User-Agent",HttpUtils2.USER_AGENT);
             headerMap.put("User-Agent",HttpUtils2.USER_AGENT);
             while(DateUtils.compareDate(currentDate,endDate)<=0){
             while(DateUtils.compareDate(currentDate,endDate)<=0){
+                //{"agentId":403756224,"startDate":"2020-03-05","endDate":"2020-03-05","sortKey":"","isAscending":false,"pageInfo":{"pageSize":19,"currentPage":1,"totalCount":100}}
                 String listUrl = "https://agent.e.kuaishou.com/rest/dsp/agent/account/data/list";
                 String listUrl = "https://agent.e.kuaishou.com/rest/dsp/agent/account/data/list";
-                String postData = "{\"agentId\":403756224,\"date\":\""+currentDate+"\",\"sortKey\":\"totalCharge\",\"isAscending\":false,\"pageInfo\":{\"totalCount\":1616,\"currentPage\":1,\"pageSize\":999999}}";
+                String postData = "{\"agentId\":403756224,\"startDate\":\""+currentDate+"\",\"endDate\":\""+currentDate+"\",\"isAscending\":false,\"pageInfo\":{\"pageSize\":19,\"currentPage\":1,\"totalCount\":999999}}";
                 String result = HttpUtils2.httpPostRequestTest(listUrl,postData,headerMap);
                 String result = HttpUtils2.httpPostRequestTest(listUrl,postData,headerMap);
                 ObjectMapper mapper = new ObjectMapper();
                 ObjectMapper mapper = new ObjectMapper();
                 JsonNode resultNode = mapper.readTree(result);
                 JsonNode resultNode = mapper.readTree(result);

+ 6 - 2
module-report/src/main/java/cn/com/ctop/bytedance/service/impl/ReportServiceImpl.java

@@ -223,8 +223,12 @@ public class ReportServiceImpl implements IReportService {
         var config = new SerializeConfig();
         var config = new SerializeConfig();
         config.propertyNamingStrategy = PropertyNamingStrategy.SnakeCase;
         config.propertyNamingStrategy = PropertyNamingStrategy.SnakeCase;
         var jsonObject = JSONObject.parseObject(JSON.toJSONString(conditions, config));
         var jsonObject = JSONObject.parseObject(JSON.toJSONString(conditions, config));
-        var getObject = getAdStat(token, jsonObject);
-        var code = getObject.getInteger("code");
+        JSONObject getObject = getAdStat(token, jsonObject);
+        if (null == getObject) {
+            log.error("广告计划报表数据获取异常=》account:{};message:{}", token.getAccountId(), "返回数据异常");
+            return;
+        }
+        Integer code = getObject.getInteger("code");
         var message = getObject.getString("message");
         var message = getObject.getString("message");
         if (null == code || code != 0) {
         if (null == code || code != 0) {
             log.error("广告计划报表数据获取异常=》account:{};message:{}", token.getAccountId(), message);
             log.error("广告计划报表数据获取异常=》account:{};message:{}", token.getAccountId(), message);

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

@@ -482,7 +482,7 @@
         left join ctop_bytedance_creative b on a.creative_id = b.id
         left join ctop_bytedance_creative b on a.creative_id = b.id
         left join ctop_bytedance_video_info c on b.video_id = c.id
         left join ctop_bytedance_video_info c on b.video_id = c.id
         left join ctop_material_info d on c.signature = d.code
         left join ctop_material_info d on c.signature = d.code
-        left join ctop_material_ascription e on on d.id = e.material_id
+        left join ctop_material_ascription e on d.id = e.material_id
         left join sys_user f1 on e.clip_id = f1.id
         left join sys_user f1 on e.clip_id = f1.id
         left join sys_user f2 on e.shot_id = f2.id
         left join sys_user f2 on e.shot_id = f2.id
         left join sys_user f3 on e.plan_id = f3.id
         left join sys_user f3 on e.plan_id = f3.id
@@ -494,7 +494,7 @@
         date_format(d.create_time, '%Y-%m-%d') &gt;= #{startDate} and
         date_format(d.create_time, '%Y-%m-%d') &gt;= #{startDate} and
         date_format(d.update_time, '%Y-%m-%d') &lt;= #{endDate}
         date_format(d.update_time, '%Y-%m-%d') &lt;= #{endDate}
         group by c.signature
         group by c.signature
-        having sum(a.charge) >= 5000
+        having sum(a.cost) >= 5000
     </select>
     </select>
 
 
     <!-- 头条根据plan_id获取视频总消耗 -->
     <!-- 头条根据plan_id获取视频总消耗 -->