瀏覽代碼

Merge branch 'test' of http://git.tjyourong.com.cn/ctop/adsp-boot into test

yumeng 4 年之前
父節點
當前提交
514cf02965
共有 24 個文件被更改,包括 21 次插入1049 次删除
  1. 0 1
      jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java
  2. 0 203
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/DramaInfoController.java
  3. 0 162
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/DramaItemInfoController.java
  4. 0 164
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/DramaRoleInfoController.java
  5. 0 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectMemberController.java
  6. 0 75
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/DramaInfo.java
  7. 0 100
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/DramaItemInfo.java
  8. 0 77
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/DramaRoleInfo.java
  9. 0 14
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/DramaInfoMapper.java
  10. 0 15
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/DramaItemInfoMapper.java
  11. 0 15
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/DramaRoleInfoMapper.java
  12. 0 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/DramaInfoMapper.xml
  13. 0 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/DramaItemInfoMapper.xml
  14. 0 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/DramaRoleInfoMapper.xml
  15. 0 17
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IDramaInfoService.java
  16. 0 23
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IDramaItemInfoService.java
  17. 0 18
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IDramaRoleInfoService.java
  18. 0 35
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/DramaInfoServiceImpl.java
  19. 0 77
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/DramaItemInfoServiceImpl.java
  20. 0 28
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/DramaRoleInfoServiceImpl.java
  21. 6 3
      jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
  22. 2 1
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/BindAccountAuthServiceImpl.java
  23. 5 4
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouController.java
  24. 8 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/ByteDanceAdvertiserDataServiceImpl.java

+ 0 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java

@@ -144,7 +144,6 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/ks/web/test", "anon");
         filterChainDefinitionMap.put("/ureport/**", "anon");
         filterChainDefinitionMap.put("/job/test/*", "anon");
-        filterChainDefinitionMap.put("/kuaishou/**", "anon");
 
         // 添加自己的过滤器并且取名为jwt
         Map<String, Filter> filterMap = new HashMap<>(1);

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

@@ -1,203 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.common.module.utils.ResultMapUtils;
-import cn.com.ctop.common.module.utils.StatusCode;
-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.system.query.QueryGenerator;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.ctop.entity.DramaInfo;
-import org.jeecg.modules.ctop.entity.DramaItemInfo;
-import org.jeecg.modules.ctop.entity.DramaRoleInfo;
-import org.jeecg.modules.ctop.service.IDramaInfoService;
-import org.jeecg.modules.ctop.service.IDramaItemInfoService;
-import org.jeecg.modules.ctop.service.IDramaRoleInfoService;
-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.*;
-
-/**
- * 剧本信息
- * @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 IDramaItemInfoService dramaItemInfoService;
-	@Autowired
-	private IDramaRoleInfoService dramaRoleInfoService;
-	@Autowired
-	private ISysCategoryService categoryService;
-
-	@GetMapping("/detail")
-	public Map<String, Object> getDetail(Long dramaId) {
-		Map<String, Object> result = new HashMap<>();
-		List<DramaItemInfo> itemInfos = dramaItemInfoService.getByDramaId(dramaId);
-        List<DramaItemInfo> getItemInfos = new ArrayList<>();
-        for (DramaItemInfo itemInfo : itemInfos) {
-            if (itemInfo.getType() == 2) {
-                DramaRoleInfo roleInfo = dramaRoleInfoService.getById(itemInfo.getRoleId());
-                itemInfo.setRoleName(roleInfo.getName());
-            }
-            getItemInfos.add(itemInfo);
-        }
-		List<DramaRoleInfo> roleInfos = dramaRoleInfoService.getByDramaId(dramaId);
-        result.put("itemInfos", getItemInfos);
-        result.put("roleInfos", roleInfos);
-		ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
-		return result;
-	}
-	/**
-	  * 分页列表查询
-	 * @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<>();
-		QueryWrapper<DramaInfo> queryWrapper = QueryGenerator.initQueryWrapper(dramaInfo, req.getParameterMap());
-        Page<DramaInfo> page = new Page<>(pageNo, pageSize);
-		IPage<DramaInfo> pageList = dramaInfoService.page(page, queryWrapper);
-        if (pageList != null && pageList.getRecords() != null && !pageList.getRecords().isEmpty()) {
-			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="剧本信息-编辑")
-	@PostMapping(value = "/edit")
-	public Result<DramaInfo> edit(@RequestBody DramaInfo dramaInfo) {
-        Result<DramaInfo> result = new Result<>();
-		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 Map<String, Object> delete(@RequestParam(name = "id", required = true) String id) {
-        return dramaInfoService.delete(id);
-	}
-
-	/**
-	  *  批量删除
-	 * @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<>();
-		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 = dramaInfoService.getById(id);
-		if(dramaInfo==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(dramaInfo);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-}

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

@@ -1,162 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-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.system.query.QueryGenerator;
-import org.jeecg.modules.ctop.entity.DramaItemInfo;
-import org.jeecg.modules.ctop.service.IDramaItemInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Map;
-
-/**
- * 剧本内容信息
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-03-06
- */
-@Slf4j
-@Api(tags = "剧本内容信息")
-@RestController
-@RequestMapping("/ctop/dramaItemInfo")
-public class DramaItemInfoController {
-    @Autowired
-    private IDramaItemInfoService dramaItemInfoService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param dramaItemInfo
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "剧本内容信息-分页列表查询")
-    @ApiOperation(value = "剧本内容信息-分页列表查询", notes = "剧本内容信息-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<DramaItemInfo>> queryPageList(DramaItemInfo dramaItemInfo,
-                                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                      HttpServletRequest req) {
-        Result<IPage<DramaItemInfo>> result = new Result<>();
-        QueryWrapper<DramaItemInfo> queryWrapper = QueryGenerator.initQueryWrapper(dramaItemInfo, req.getParameterMap());
-        Page<DramaItemInfo> page = new Page<>(pageNo, pageSize);
-        queryWrapper.orderByAsc("rank").orderByDesc("update_time");
-        IPage<DramaItemInfo> pageList = dramaItemInfoService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param dramaItemInfo
-     * @return
-     */
-    @AutoLog(value = "剧本内容信息-添加")
-    @ApiOperation(value = "剧本内容信息-添加", notes = "剧本内容信息-添加")
-    @PostMapping(value = "/add")
-    public Result<DramaItemInfo> add(@RequestBody DramaItemInfo dramaItemInfo) {
-        Result<DramaItemInfo> result = new Result<>();
-        try {
-            int rank = dramaItemInfoService.getMaxRankByDramaId(dramaItemInfo.getDramaId());
-            dramaItemInfo.setRank(rank);
-            dramaItemInfoService.save(dramaItemInfo);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param dramaItemInfo
-     * @return
-     */
-    @AutoLog(value = "剧本内容信息-编辑")
-    @ApiOperation(value = "剧本内容信息-编辑", notes = "剧本内容信息-编辑")
-    @PostMapping(value = "/edit")
-    public Result<DramaItemInfo> edit(@RequestBody DramaItemInfo dramaItemInfo) {
-        Result<DramaItemInfo> result = new Result<>();
-        DramaItemInfo dramaItemInfoEntity = dramaItemInfoService.getById(dramaItemInfo.getId());
-        if (dramaItemInfoEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            dramaItemInfo.setUpdateTime(new Date());
-            boolean ok = dramaItemInfoService.updateById(dramaItemInfo);
-            if (ok) {
-                result.success("修改成功!");
-            }
-        }
-        return result;
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @return
-     */
-    @AutoLog(value = "剧本内容信息-通过id删除")
-    @ApiOperation(value = "剧本内容信息-通过id删除", notes = "剧本内容信息-通过id删除")
-    @PostMapping(value = "/delete")
-    public Map<String, Object> delete(@RequestBody DramaItemInfo dramaItemInfo) {
-        return dramaItemInfoService.delete(dramaItemInfo.getId());
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @AutoLog(value = "剧本内容信息-批量删除")
-    @ApiOperation(value = "剧本内容信息-批量删除", notes = "剧本内容信息-批量删除")
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<DramaItemInfo> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<DramaItemInfo> result = new Result<>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.dramaItemInfoService.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<DramaItemInfo> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<DramaItemInfo> result = new Result<>();
-        DramaItemInfo dramaItemInfo = dramaItemInfoService.getById(id);
-        if (dramaItemInfo == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(dramaItemInfo);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-}

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

@@ -1,164 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-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.system.query.QueryGenerator;
-import org.jeecg.modules.ctop.entity.DramaRoleInfo;
-import org.jeecg.modules.ctop.service.IDramaRoleInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-
-/**
- * 剧本角色信息
- *
- * @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<>();
-        QueryWrapper<DramaRoleInfo> queryWrapper = QueryGenerator.initQueryWrapper(dramaRoleInfo, req.getParameterMap());
-        Page<DramaRoleInfo> page = new Page<>(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<>();
-        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 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<Object> 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<>();
-        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 = dramaRoleInfoService.getById(id);
-        if (dramaRoleInfo == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(dramaRoleInfo);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-}

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

@@ -1,6 +1,5 @@
 package org.jeecg.modules.ctop.controller;
 
-import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.Project;
 import cn.com.ctop.common.module.service.IProjectService;
 import cn.com.ctop.common.module.service.ISysRoleService;
@@ -11,7 +10,6 @@ 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;

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

@@ -1,75 +0,0 @@
-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 Integer enabled;
-    /**
-     * 场景
-     */
-    private String scnece;
-    /**
-     * 视频类型
-     */
-    private String videoType;
-    /**
-     * 时长
-     */
-    private Long timeLong;
-    /**
-     * 演员id
-     */
-    private String actorId;
-    /**
-     * 卖点
-     */
-    private String usp;
-    /**
-     * 演员/服化道备注
-     */
-    private String actorRemark;
-    /**
-     * 拍摄要求
-     */
-    private String shootReq;
-    /**
-     * 封面文案
-     */
-    private String coverText;
-    /**
-     * 剪辑备注
-     */
-    private String clipRemark;
-
-	private Date createTime;
-	private Date updateTime;
-}

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

@@ -1,100 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-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-06
- */
-@Data
-@TableName("ctop_drama_item_info")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_drama_item_info对象", description = "剧本内容信息")
-public class DramaItemInfo {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 元素类型1:描述 2:对话
-     */
-    @Excel(name = "元素类型1:情节描述 2:对话", width = 15)
-    @ApiModelProperty(value = "元素类型1:描述 2:对话")
-    private Integer type;
-    private Integer plainSeq;
-    /**
-     * 剧本id
-     */
-    @Excel(name = "剧本id", width = 15)
-    @ApiModelProperty(value = "剧本id")
-    private Long dramaId;
-    /**
-     * roleId
-     */
-    @Excel(name = "roleId", width = 15)
-    @ApiModelProperty(value = "roleId")
-    private Long roleId;
-    /**
-     * 台词
-     */
-    @Excel(name = "line", width = 15)
-    @ApiModelProperty(value = "content")
-    private String line;
-    /**
-     * 排序号
-     */
-    @Excel(name = "排序号", width = 15)
-    @ApiModelProperty(value = "排序号")
-    private Integer rank;
-    /**
-     * enabled
-     */
-    @Excel(name = "enabled", width = 15)
-    @ApiModelProperty(value = "enabled")
-    private Integer enabled;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-
-    /**
-     * 场景
-     */
-    private String scene;
-    /**
-     * 剪辑描述
-     */
-    private String clipRemark;
-    /**
-     * 画面内容
-     */
-    private String picContent;
-
-    @TableField(exist = false)
-    private String roleName;
-
-}

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

@@ -1,77 +0,0 @@
-package org.jeecg.modules.ctop.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-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;
-
-    @TableField(exist = false)
-    private String buttonType;
-
-    public DramaRoleInfo(String name, String buttonType) {
-        this.name = name;
-        this.buttonType = buttonType;
-    }
-
-    public DramaRoleInfo() {
-    }
-}

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

@@ -1,14 +0,0 @@
-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> {
-
-}

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

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

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

@@ -1,15 +0,0 @@
-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> {
-
-}

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

@@ -1,5 +0,0 @@
-<?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>

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

@@ -1,5 +0,0 @@
-<?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.DramaItemInfoMapper">
-
-</mapper>

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

@@ -1,5 +0,0 @@
-<?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>

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

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

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

@@ -1,23 +0,0 @@
-package org.jeecg.modules.ctop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.ctop.entity.DramaItemInfo;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 剧本内容信息
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-03-06
- */
-public interface IDramaItemInfoService extends IService<DramaItemInfo> {
-
-    List<DramaItemInfo> getByDramaId(Long dramaId);
-
-    int getMaxRankByDramaId(Long dramaId);
-
-    Map<String, Object> delete(Long id);
-}

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

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

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

@@ -1,35 +0,0 @@
-package org.jeecg.modules.ctop.service.impl;
-
-import cn.com.ctop.common.module.utils.ResultMapUtils;
-import cn.com.ctop.common.module.utils.StatusCode;
-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;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 剧本信息
- * @author jeecg-boot
- * @date   2020-03-04
- * @version V1.0
- */
-@Service
-public class DramaInfoServiceImpl extends ServiceImpl<DramaInfoMapper, DramaInfo> implements IDramaInfoService {
-    @Override
-    public Map<String, Object> delete(String id) {
-        Map<String, Object> result = new HashMap<>();
-        DramaInfo info = this.getById(id);
-        if (null == info) {
-            ResultMapUtils.setResultMap(result, StatusCode.COMMON_DATA_NOT_EXIST);
-            return result;
-        }
-        info.setEnabled(0);
-        this.updateById(info);
-        ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
-        return result;
-    }
-}

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

@@ -1,77 +0,0 @@
-package org.jeecg.modules.ctop.service.impl;
-
-import cn.com.ctop.common.module.utils.ResultMapUtils;
-import cn.com.ctop.common.module.utils.StatusCode;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.ctop.entity.DramaItemInfo;
-import org.jeecg.modules.ctop.entity.DramaRoleInfo;
-import org.jeecg.modules.ctop.mapper.DramaItemInfoMapper;
-import org.jeecg.modules.ctop.service.IDramaItemInfoService;
-import org.jeecg.modules.ctop.service.IDramaRoleInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 剧本内容信息
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-03-06
- */
-@Service
-public class DramaItemInfoServiceImpl extends ServiceImpl<DramaItemInfoMapper, DramaItemInfo> implements IDramaItemInfoService {
-
-    @Autowired
-    private IDramaRoleInfoService roleInfoService;
-
-    @Override
-    public List<DramaItemInfo> getByDramaId(Long dramaId) {
-        QueryWrapper<DramaItemInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("drama_id", dramaId).eq("enabled", 1).orderByAsc("rank").orderByDesc("update_time");
-        List<DramaItemInfo> infos = this.list(queryWrapper);
-        List<DramaItemInfo> returnInfos = new ArrayList<>();
-        if (null != infos && infos.size() > 0) {
-            for (DramaItemInfo itemInfo : infos) {
-                if (null != itemInfo.getRoleId()) {
-                    DramaRoleInfo roleInfo = roleInfoService.getById(itemInfo.getRoleId());
-                    itemInfo.setRoleName(roleInfo.getName());
-                }
-                returnInfos.add(itemInfo);
-            }
-        }
-        return returnInfos;
-    }
-
-    @Override
-    public int getMaxRankByDramaId(Long dramaId) {
-        QueryWrapper<DramaItemInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("drama_id", dramaId);
-        queryWrapper.orderByDesc("rank").last(" limit 1");
-        DramaItemInfo itemInfo = this.getOne(queryWrapper);
-        if (null == itemInfo) {
-            return 1;
-        } else {
-            return itemInfo.getRank() + 1;
-        }
-    }
-
-    @Override
-    public Map<String, Object> delete(Long id) {
-        Map<String, Object> result = new HashMap<>();
-        DramaItemInfo info = this.getById(id);
-        if (null == info) {
-            ResultMapUtils.setResultMap(result, StatusCode.COMMON_DATA_NOT_EXIST);
-            return result;
-        }
-        info.setEnabled(0);
-        this.updateById(info);
-        ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
-        return result;
-    }
-}

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

@@ -1,28 +0,0 @@
-package org.jeecg.modules.ctop.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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;
-
-import java.util.List;
-
-/**
- * 剧本角色信息
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-03-05
- */
-@Service
-public class DramaRoleInfoServiceImpl extends ServiceImpl<DramaRoleInfoMapper, DramaRoleInfo> implements IDramaRoleInfoService {
-
-    @Override
-    public List<DramaRoleInfo> getByDramaId(Long dramaId) {
-        QueryWrapper<DramaRoleInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("drama_id", dramaId);
-        return this.list(queryWrapper);
-    }
-}

+ 6 - 3
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -185,9 +185,12 @@ public class SampleTest {
     }
 
     @Test
-    public void loadImageInfo(){
-        CtopOauthToken token = oauthTokenService.getTokenByAccountId(1649600126891015L);
-        advertiserDataService.getImageByPage(token,null,1);
+    public void loadImageInfo()throws Exception{
+        List<CtopOauthToken>tokens = oauthTokenService.selectToutiaoToken();
+        for (CtopOauthToken token:tokens) {
+            advertiserDataService.getImageByPage(token,null,1);
+            Thread.sleep(1000L);
+        }
     }
 }
 

+ 2 - 1
module-common/src/main/java/cn/com/ctop/common/module/service/impl/BindAccountAuthServiceImpl.java

@@ -32,6 +32,7 @@ public class BindAccountAuthServiceImpl extends ServiceImpl<BindAccountAuthMappe
     @Autowired
     private BindAccountAuthMapper bindAccountAuthMapper;
 
+
     /**
      * 授权 绑定账号信息
      *
@@ -73,7 +74,7 @@ public class BindAccountAuthServiceImpl extends ServiceImpl<BindAccountAuthMappe
             // &scope=%5B%22report_service%22%2C%22ad_query%22%2C%22account_service%22%2C%22ad_manage%22%5D
             sb.append(PropertiesUtils.getValue("kuaishou_config", "kuaishou_auth_url"))
                     .append(KuaishouInterfaceConstant.AUTH_PATH)
-                    .append("?app_id=" + PropertiesUtils.getValue("kuaishou_config", "kuaishou_third_appid"))
+                    .append ("?app_id=" + PropertiesUtils.getValue("kuaishou_config", "kuaishou_third_appid"))
                     .append("&state=" + URLEncoder.encode(URLEncoder.encode(state)))
                     .append("&scope=%5B%22report_service%22%2C%22ad_query%22%2C%22account_service%22%2C%22ad_manage%22%5D")
                     .append("&redirect_uri=" + URLEncoder.encode(PropertiesUtils.getValue("kuaishou_config", "kuaishou_callback_url"), "UTF-8"));

+ 5 - 4
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouController.java

@@ -8,6 +8,7 @@ import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccountDTO;
 import cn.com.ctop.kuaishou.modules.report.entity.ProjectAccountDTO;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyAccountService;
 import com.baomidou.mybatisplus.extension.api.R;
+import com.github.pagehelper.Page;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
@@ -132,7 +133,7 @@ public class KuaiShouController {
         Result<PageInfo<KuaishouReportDailyAccountDTO>> result = new Result<>();
         result.setSuccess(true);
 
-        if(dto == null || dto.getStartDate() ==null || dto.getEndDate() == null){
+        if(dto == null || dto.getStartDate() ==null || dto.getEndDate() == null || dto.getProjectId()==null){
             result.setSuccess(false);
             result.setMessage("参数有误");
             return result;
@@ -161,7 +162,7 @@ public class KuaiShouController {
         Result<PageInfo<KuaishouReportDailyAccountDTO>> result = new Result<>();
         result.setSuccess(true);
 
-        if(dto == null || dto.getStartDate() ==null || dto.getEndDate() == null){
+        if(dto == null || dto.getStartDate() ==null || dto.getEndDate() == null || dto.getAccountId()==null){
             result.setSuccess(false);
             result.setMessage("参数有误");
             return result;
@@ -191,7 +192,7 @@ public class KuaiShouController {
         Result<PageInfo<KuaishouReportDailyAccountDTO>> result = new Result<>();
         result.setSuccess(true);
 
-        if(dto == null || dto.getStartDate() ==null || dto.getEndDate() == null){
+        if(dto == null || dto.getStartDate() ==null || dto.getEndDate() == null || dto.getCampaignId()==null){
             result.setSuccess(false);
             result.setMessage("参数有误");
             return result;
@@ -219,7 +220,7 @@ public class KuaiShouController {
         Result<PageInfo<KuaishouReportDailyAccountDTO>> result = new Result<>();
         result.setSuccess(true);
 
-        if(dto == null || dto.getStartDate() ==null || dto.getEndDate() == null){
+        if(dto == null || dto.getStartDate() ==null || dto.getEndDate() == null || dto.getUnitId()==null){
             result.setSuccess(false);
             result.setMessage("参数有误");
             return result;

+ 8 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/ByteDanceAdvertiserDataServiceImpl.java

@@ -602,6 +602,10 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
         }
 
         JSONObject resultObject = HttpUtils.bytedanceGetRequest(token.getAccessToken(), url, param);
+        if(null==resultObject){
+            log.error("获取图片素材库接口异常==》accountId:{}", token.getAccountId());
+            return;
+        }
         Integer code = resultObject.getInteger("code");
         if (null == code || !code.equals(0)) {
             log.error("获取图片素材库接口异常==》accountId:{},message:{}", token.getAccountId(), resultObject.getString("message"));
@@ -642,6 +646,10 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
         }
 
         JSONObject resultObject = HttpUtils.bytedanceGetRequest(token.getAccessToken(), url, param);
+        if(null==resultObject){
+            log.error("获取视频素材库接口异常==》accountId:{}", token.getAccountId());
+            return;
+        }
         Integer code = resultObject.getInteger("code");
         if (null == code || !code.equals(0)) {
             log.error("获取视频素材库接口异常==》accountId:{},message:{}", token.getAccountId(), resultObject.getString("message"));