浏览代码

修改头条行政区划代码逻辑

syh 5 年之前
父节点
当前提交
72a701b11e
共有 14 个文件被更改,包括 701 次插入1 次删除
  1. 259 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/controller/BytedanceAreaInfoController.java
  2. 171 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/controller/BytedanceInterestCategoryController.java
  3. 72 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/entity/BytedanceAreaInfo.java
  4. 73 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/entity/BytedanceInterestCategory.java
  5. 15 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/mapper/BytedanceAreaInfoMapper.java
  6. 7 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/mapper/BytedanceInterestCategoryMapper.java
  7. 5 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/mapper/xml/BytedanceAreaInfoMapper.xml
  8. 5 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/mapper/xml/BytedanceInterestCategoryMapper.xml
  9. 16 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/IBytedanceAreaInfoService.java
  10. 1 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/IBytedanceGroupApiService.java
  11. 7 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/IBytedanceInterestCategoryService.java
  12. 33 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/impl/BytedanceAreaInfoServiceImpl.java
  13. 26 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/impl/BytedanceGroupApiServiceImpl.java
  14. 11 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/impl/BytedanceInterestCategoryServiceImpl.java

+ 259 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/controller/BytedanceAreaInfoController.java

@@ -0,0 +1,259 @@
+package cn.com.ctop.toutiao.modules.batch.controller;
+
+import cn.com.ctop.toutiao.modules.batch.entity.BytedanceAreaInfo;
+import cn.com.ctop.toutiao.modules.batch.service.IBytedanceAreaInfoService;
+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.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.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 省市县信息
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-09-17
+ */
+@Slf4j
+@Api(tags = "省市县信息")
+@RestController
+@RequestMapping("/ctop/bytedanceAreaInfo")
+public class BytedanceAreaInfoController {
+    @Autowired
+    private IBytedanceAreaInfoService bytedanceAreaInfoService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param bytedanceAreaInfo
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "省市县信息-分页列表查询")
+    @ApiOperation(value = "省市县信息-分页列表查询", notes = "省市县信息-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<BytedanceAreaInfo>> queryPageList(BytedanceAreaInfo bytedanceAreaInfo,
+                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                          @RequestParam(name = "pageSize", defaultValue = "1000") Integer pageSize,
+                                                          HttpServletRequest req) {
+        Result<IPage<BytedanceAreaInfo>> result = new Result<>();
+        QueryWrapper<BytedanceAreaInfo> queryWrapper = QueryGenerator.initQueryWrapper(bytedanceAreaInfo, req.getParameterMap());
+        Page<BytedanceAreaInfo> page = new Page<>(pageNo, pageSize);
+        IPage<BytedanceAreaInfo> pageList = bytedanceAreaInfoService.page(page, queryWrapper);
+        List<BytedanceAreaInfo> areaInfos = pageList.getRecords();
+        if(null!=areaInfos&&!areaInfos.isEmpty()){
+            List<BytedanceAreaInfo>setAreas = new ArrayList<>();
+            areaInfos.forEach(areaInfo->{
+                boolean hasChild = bytedanceAreaInfoService.hasChild(areaInfo);
+                areaInfo.setHasChild(hasChild);
+                setAreas.add(areaInfo);
+            });
+            pageList.setRecords(setAreas);
+        }
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param bytedanceAreaInfo
+     * @return
+     */
+    @AutoLog(value = "省市县信息-添加")
+    @ApiOperation(value = "省市县信息-添加", notes = "省市县信息-添加")
+    @PostMapping(value = "/add")
+    public Result<BytedanceAreaInfo> add(@RequestBody BytedanceAreaInfo bytedanceAreaInfo) {
+        Result<BytedanceAreaInfo> result = new Result<BytedanceAreaInfo>();
+        try {
+            bytedanceAreaInfoService.save(bytedanceAreaInfo);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param bytedanceAreaInfo
+     * @return
+     */
+    @AutoLog(value = "省市县信息-编辑")
+    @ApiOperation(value = "省市县信息-编辑", notes = "省市县信息-编辑")
+    @PutMapping(value = "/edit")
+    public Result<BytedanceAreaInfo> edit(@RequestBody BytedanceAreaInfo bytedanceAreaInfo) {
+        Result<BytedanceAreaInfo> result = new Result<BytedanceAreaInfo>();
+        BytedanceAreaInfo bytedanceAreaInfoEntity = bytedanceAreaInfoService.getById(bytedanceAreaInfo.getId());
+        if (bytedanceAreaInfoEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = bytedanceAreaInfoService.updateById(bytedanceAreaInfo);
+            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 {
+            bytedanceAreaInfoService.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<BytedanceAreaInfo> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<BytedanceAreaInfo> result = new Result<BytedanceAreaInfo>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.bytedanceAreaInfoService.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<BytedanceAreaInfo> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<BytedanceAreaInfo> result = new Result<BytedanceAreaInfo>();
+        BytedanceAreaInfo bytedanceAreaInfo = bytedanceAreaInfoService.getById(id);
+        if (bytedanceAreaInfo == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(bytedanceAreaInfo);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<BytedanceAreaInfo> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                BytedanceAreaInfo bytedanceAreaInfo = JSON.parseObject(deString, BytedanceAreaInfo.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(bytedanceAreaInfo, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<BytedanceAreaInfo> pageList = bytedanceAreaInfoService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "省市县信息列表");
+        mv.addObject(NormalExcelConstants.CLASS, BytedanceAreaInfo.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<BytedanceAreaInfo> listBytedanceAreaInfos = ExcelImportUtil.importExcel(file.getInputStream(), BytedanceAreaInfo.class, params);
+                bytedanceAreaInfoService.saveBatch(listBytedanceAreaInfos);
+                return Result.ok("文件导入成功!数据行数:" + listBytedanceAreaInfos.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("文件导入失败!");
+    }
+
+}

+ 171 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/controller/BytedanceInterestCategoryController.java

@@ -0,0 +1,171 @@
+package cn.com.ctop.toutiao.modules.batch.controller;
+
+import cn.com.ctop.toutiao.modules.batch.entity.BytedanceInterestCategory;
+import cn.com.ctop.toutiao.modules.batch.service.IBytedanceInterestCategoryService;
+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.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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+
+@RestController
+@Slf4j
+public class BytedanceInterestCategoryController {
+    @Autowired
+    private IBytedanceInterestCategoryService bytedanceInterestCategoryService;
+
+    @GetMapping(value = "/listbycode")
+    public Result<IPage<BytedanceInterestCategory>> queryPageListByCode(@RequestParam(name = "parentCode", defaultValue = "0") String code,
+                                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                        HttpServletRequest req) {
+        Result<IPage<BytedanceInterestCategory>> result = new Result<>();
+        BytedanceInterestCategory category = new BytedanceInterestCategory();
+        QueryWrapper<BytedanceInterestCategory> queryWrapper = QueryGenerator.initQueryWrapper(category, req.getParameterMap());
+        queryWrapper.eq("parent_code", code);
+        Page<BytedanceInterestCategory> page = new Page<>(pageNo, pageSize);
+        IPage<BytedanceInterestCategory> pageList = bytedanceInterestCategoryService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 分页列表查询
+     *
+     * @param bytedanceInterestCategory
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "兴趣分类信息-分页列表查询")
+    @ApiOperation(value = "兴趣分类信息-分页列表查询", notes = "兴趣分类信息-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<BytedanceInterestCategory>> queryPageList(BytedanceInterestCategory bytedanceInterestCategory,
+                                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                  HttpServletRequest req) {
+        Result<IPage<BytedanceInterestCategory>> result = new Result<>();
+        QueryWrapper<BytedanceInterestCategory> queryWrapper = QueryGenerator.initQueryWrapper(bytedanceInterestCategory, req.getParameterMap());
+        Page<BytedanceInterestCategory> page = new Page<>(pageNo, pageSize);
+        IPage<BytedanceInterestCategory> pageList = bytedanceInterestCategoryService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param bytedanceInterestCategory
+     * @return
+     */
+    @AutoLog(value = "兴趣分类信息-添加")
+    @ApiOperation(value = "兴趣分类信息-添加", notes = "兴趣分类信息-添加")
+    @PostMapping(value = "/add")
+    public Result<BytedanceInterestCategory> add(@RequestBody BytedanceInterestCategory bytedanceInterestCategory) {
+        Result<BytedanceInterestCategory> result = new Result<>();
+        try {
+            bytedanceInterestCategoryService.save(bytedanceInterestCategory);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param bytedanceInterestCategory
+     * @return
+     */
+    @AutoLog(value = "兴趣分类信息-编辑")
+    @ApiOperation(value = "兴趣分类信息-编辑", notes = "兴趣分类信息-编辑")
+    @PutMapping(value = "/edit")
+    public Result<BytedanceInterestCategory> edit(@RequestBody BytedanceInterestCategory bytedanceInterestCategory) {
+        Result<BytedanceInterestCategory> result = new Result<>();
+        BytedanceInterestCategory bytedanceInterestCategoryEntity = bytedanceInterestCategoryService.getById(bytedanceInterestCategory.getId());
+        if (bytedanceInterestCategoryEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = bytedanceInterestCategoryService.updateById(bytedanceInterestCategory);
+            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 {
+            bytedanceInterestCategoryService.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<BytedanceInterestCategory> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<BytedanceInterestCategory> result = new Result<>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.bytedanceInterestCategoryService.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<BytedanceInterestCategory> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<BytedanceInterestCategory> result = new Result<>();
+        BytedanceInterestCategory bytedanceInterestCategory = bytedanceInterestCategoryService.getById(id);
+        if (bytedanceInterestCategory == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(bytedanceInterestCategory);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+}
+

+ 72 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/entity/BytedanceAreaInfo.java

@@ -0,0 +1,72 @@
+package cn.com.ctop.toutiao.modules.batch.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 2019-09-17
+ */
+@Data
+@TableName("ctop_bytedance_area_info")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_bytedance_area_info对象", description = "省市县信息")
+public class BytedanceAreaInfo {
+    /**
+     * id
+     */
+    @TableId(type = IdType.UUID)
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    /**
+     * name
+     */
+    @Excel(name = "name", width = 15)
+    @ApiModelProperty(value = "name")
+    private String name;
+    /**
+     * code
+     */
+    @Excel(name = "code", width = 15)
+    @ApiModelProperty(value = "code")
+    private String code;
+    /**
+     * parentCode
+     */
+    @Excel(name = "parentCode", width = 15)
+    @ApiModelProperty(value = "parentCode")
+    private String parentCode;
+    /**
+     * level
+     */
+    @Excel(name = "level", width = 15)
+    @ApiModelProperty(value = "level")
+    private Integer level;
+    /**
+     * createTime
+     */
+    @ApiModelProperty(value = "createTime")
+    private Date createTime;
+    /**
+     * updateTime
+     */
+    @ApiModelProperty(value = "updateTime")
+    private Date updateTime;
+
+    @TableField(exist = false)
+    private Boolean hasChild;
+}

+ 73 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/entity/BytedanceInterestCategory.java

@@ -0,0 +1,73 @@
+package cn.com.ctop.toutiao.modules.batch.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 2019-09-18
+ */
+@Data
+@TableName("ctop_bytedance_interest_category")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_bytedance_interest_category对象", description = "兴趣分类信息")
+public class BytedanceInterestCategory {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "id")
+    private Long id;
+    /**
+     * 名称
+     */
+    @Excel(name = "名称", width = 15)
+    @ApiModelProperty(value = "名称")
+    private String name;
+    /**
+     * code
+     */
+    @Excel(name = "code", width = 15)
+    @ApiModelProperty(value = "code")
+    private String code;
+    /**
+     * parentCode
+     */
+    @Excel(name = "parentCode", width = 15)
+    @ApiModelProperty(value = "parentCode")
+    private String parentCode;
+    /**
+     * level
+     */
+    @Excel(name = "level", width = 15)
+    @ApiModelProperty(value = "level")
+    private Integer level;
+    /**
+     * createTime
+     */
+    @ApiModelProperty(value = "createTime")
+    private Date createTime;
+    /**
+     * updateTime
+     */
+    @ApiModelProperty(value = "updateTime")
+    private Date updateTime;
+
+    @TableField(exist = false)
+    private Boolean hasChild;
+}

+ 15 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/mapper/BytedanceAreaInfoMapper.java

@@ -0,0 +1,15 @@
+package cn.com.ctop.toutiao.modules.batch.mapper;
+
+import cn.com.ctop.toutiao.modules.batch.entity.BytedanceAreaInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 省市县信息
+ *
+ * @author: jeecg-boot
+ * @date: 2019-09-17
+ * @cersion: V1.0
+ */
+public interface BytedanceAreaInfoMapper extends BaseMapper<BytedanceAreaInfo> {
+
+}

+ 7 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/mapper/BytedanceInterestCategoryMapper.java

@@ -0,0 +1,7 @@
+package cn.com.ctop.toutiao.modules.batch.mapper;
+
+import cn.com.ctop.toutiao.modules.batch.entity.BytedanceInterestCategory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface BytedanceInterestCategoryMapper extends BaseMapper<BytedanceInterestCategory> {
+}

+ 5 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/mapper/xml/BytedanceAreaInfoMapper.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="cn.com.ctop.toutiao.modules.batch.mapper.BytedanceAreaInfoMapper">
+
+</mapper>

+ 5 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/mapper/xml/BytedanceInterestCategoryMapper.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="cn.com.ctop.toutiao.modules.batch.mapper.BytedanceInterestCategoryMapper">
+
+</mapper>

+ 16 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/IBytedanceAreaInfoService.java

@@ -0,0 +1,16 @@
+package cn.com.ctop.toutiao.modules.batch.service;
+
+import cn.com.ctop.toutiao.modules.batch.entity.BytedanceAreaInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 省市县信息
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-09-17
+ */
+public interface IBytedanceAreaInfoService extends IService<BytedanceAreaInfo> {
+
+    boolean hasChild(BytedanceAreaInfo areaInfo);
+}

+ 1 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/IBytedanceGroupApiService.java

@@ -10,4 +10,5 @@ import java.util.Map;
 public interface IBytedanceGroupApiService {
     List<ByteDanceCampaign> getGroupListByParams(CtopOauthToken token, JSONArray ids, String campaignName, String landingType, String status, String campaignCreateTime, Integer page, Integer pageSize);
     Map<String,Object>createGroup(CtopOauthToken token,String campaignName,String operation,String budgetMode,String budget,String landingType,String uniqueFk);
+    Map<String,Object>updateGroup(CtopOauthToken token, String campaignId, String campaignName, String modifyTime,String budget);
 }

+ 7 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/IBytedanceInterestCategoryService.java

@@ -0,0 +1,7 @@
+package cn.com.ctop.toutiao.modules.batch.service;
+
+import cn.com.ctop.toutiao.modules.batch.entity.BytedanceInterestCategory;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface IBytedanceInterestCategoryService extends IService<BytedanceInterestCategory> {
+}

+ 33 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/impl/BytedanceAreaInfoServiceImpl.java

@@ -0,0 +1,33 @@
+package cn.com.ctop.toutiao.modules.batch.service.impl;
+
+import cn.com.ctop.toutiao.modules.batch.entity.BytedanceAreaInfo;
+import cn.com.ctop.toutiao.modules.batch.mapper.BytedanceAreaInfoMapper;
+import cn.com.ctop.toutiao.modules.batch.service.IBytedanceAreaInfoService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 省市县信息
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-09-17
+ */
+@Service
+public class BytedanceAreaInfoServiceImpl extends ServiceImpl<BytedanceAreaInfoMapper, BytedanceAreaInfo> implements IBytedanceAreaInfoService {
+
+    @Override
+    public boolean hasChild(BytedanceAreaInfo areaInfo) {
+        QueryWrapper<BytedanceAreaInfo>queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("parent_code",areaInfo.getCode());
+        List<BytedanceAreaInfo>areaInfos = this.list(queryWrapper);
+        if(null == areaInfos||areaInfos.isEmpty()){
+            return false;
+        }else{
+            return true;
+        }
+    }
+}

+ 26 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/impl/BytedanceGroupApiServiceImpl.java

@@ -20,7 +20,6 @@ import java.util.Map;
 @Service
 @Slf4j
 public class BytedanceGroupApiServiceImpl implements IBytedanceGroupApiService {
-
     @Override
     /**
      * 获取广告组数据
@@ -76,6 +75,17 @@ public class BytedanceGroupApiServiceImpl implements IBytedanceGroupApiService {
         return campaigns;
     }
 
+    /**
+     * 每个广告主账号下最多可允许创建500个广告组,如超出需要先删除一部分广告组后才可继续创建。
+     * @param token
+     * @param campaignName
+     * @param operation
+     * @param budgetMode
+     * @param budget
+     * @param landingType
+     * @param uniqueFk
+     * @return
+     */
     @Override
     public Map<String, Object> createGroup(CtopOauthToken token, String campaignName, String operation, String budgetMode, String budget, String landingType, String uniqueFk) {
         Map<String,Object>result = new HashMap<>();
@@ -114,4 +124,19 @@ public class BytedanceGroupApiServiceImpl implements IBytedanceGroupApiService {
         result.put("campaign_id",campaignId);
         return result;
     }
+
+    @Override
+    public Map<String, Object> updateGroup(CtopOauthToken token, String campaignId, String campaignName, String modifyTime,String budget) {
+        // 请求地址
+        String url = "https://ad.oceanengine.com/open_api/2/campaign/update/";
+        // 请求参数
+        JSONObject data = new JSONObject();
+        data.put("advertiser_id",token.getAccountId());
+        data.put("campaign_name",campaignName);
+        data.put("budget",budget);
+        data.put("campaign_id", campaignId);
+        data.put("modify_time", modifyTime);
+        JSONObject result = HttpUtils.bytedancePostRequest(token.getAccessToken(),url,data);
+        return new HashMap<>();
+    }
 }

+ 11 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/impl/BytedanceInterestCategoryServiceImpl.java

@@ -0,0 +1,11 @@
+package cn.com.ctop.toutiao.modules.batch.service.impl;
+
+import cn.com.ctop.toutiao.modules.batch.entity.BytedanceInterestCategory;
+import cn.com.ctop.toutiao.modules.batch.mapper.BytedanceInterestCategoryMapper;
+import cn.com.ctop.toutiao.modules.batch.service.IBytedanceInterestCategoryService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+public class BytedanceInterestCategoryServiceImpl extends ServiceImpl<BytedanceInterestCategoryMapper, BytedanceInterestCategory> implements IBytedanceInterestCategoryService {
+}