Переглянути джерело

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

syh 5 роки тому
батько
коміт
deaefa096f

+ 2 - 2
jeecg-boot-module-system/src/main/resources/jeecg/jeecg_database.properties

@@ -1,8 +1,8 @@
 #mysql
 diver_name=com.mysql.jdbc.Driver
 url=jdbc:mysql://39.106.184.70:3306/jeecg-boot?useUnicode=true&characterEncoding=UTF-8
-username=root
-password=hcst2019
+username=hcst
+password=test@20190531
 database_name=jeecg-boot
 #oracle
 #diver_name=oracle.jdbc.driver.OracleDriver

+ 248 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouDailyReportTaskController.java

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

+ 95 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouDailyReportTask.java

@@ -0,0 +1,95 @@
+package cn.com.ctop.kuaishou.modules.batch.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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 org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 分天记录表
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2020-03-12
+ */
+@Data
+@TableName("ctop_kuaishou_daily_report_task")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_kuaishou_daily_report_task对象", description = "分天记录表")
+public class KuaiShouDailyReportTask {
+
+    /**
+     * 主键ID
+     */
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "主键ID")
+    private Long id;
+    /**
+     * 广告账户ID(相当于头条返回的access_token数据中的advertiser_id)
+     */
+    @Excel(name = "广告账户ID(相当于头条返回的access_token数据中的advertiser_id)", width = 15)
+    @ApiModelProperty(value = "广告账户ID(相当于头条返回的access_token数据中的advertiser_id)")
+    private Integer accountId;
+    /**
+     * 任务id
+     */
+    @Excel(name = "任务id", width = 15)
+    @ApiModelProperty(value = "任务id")
+    private String taskId;
+    /**
+     * 任务名称
+     */
+    @Excel(name = "任务名称", width = 15)
+    @ApiModelProperty(value = "任务名称")
+    private String taskName;
+    /**
+     * 0:新建,1:处理中,2:处理成功,3:处理失败,4:数据已下载 5:文件生成 本地下载失败
+     */
+    @Excel(name = "0:新建,1:处理中,2:处理成功,3:处理失败,4:数据已下载 5:文件生成 本地下载失败", width = 15)
+    @ApiModelProperty(value = "0:新建,1:处理中,2:处理成功,3:处理失败,4:数据已下载 5:文件生成 本地下载失败")
+    private Integer taskStatus;
+    /**
+     * 1:账户维度查询,2:  广告计划维度查询,3:广告组维度查询,4:广告创意维度查询
+     */
+    @Excel(name = "1:账户维度查询,2:  广告计划维度查询,3:广告组维度查询,4:广告创意维度查询", width = 15)
+    @ApiModelProperty(value = "1:账户维度查询,2:  广告计划维度查询,3:广告组维度查询,4:广告创意维度查询")
+    private Integer viewType;
+    /**
+     * 任务查询数据起始时间
+     */
+    @Excel(name = "任务查询数据起始时间", width = 15)
+    @ApiModelProperty(value = "任务查询数据起始时间")
+    private String startDate;
+    /**
+     * 任务查询数据结束时间
+     */
+    @Excel(name = "任务查询数据结束时间", width = 15)
+    @ApiModelProperty(value = "任务查询数据结束时间")
+    private String endDate;
+    /**
+     * 创建时间
+     */
+    @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    @Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+}

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

@@ -0,0 +1,15 @@
+package cn.com.ctop.kuaishou.modules.batch.mapper;
+
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouDailyReportTask;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 分天记录表
+ *
+ * @author: jeecg-boot
+ * @date: 2020-03-12
+ * @cersion: V1.0
+ */
+public interface KuaiShouDailyReportTaskMapper extends BaseMapper<KuaiShouDailyReportTask> {
+
+}

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

+ 15 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouDailyReportTaskService.java

@@ -0,0 +1,15 @@
+package cn.com.ctop.kuaishou.modules.batch.service;
+
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouDailyReportTask;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 分天记录表
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2020-03-12
+ */
+public interface IKuaiShouDailyReportTaskService extends IService<KuaiShouDailyReportTask> {
+
+}

+ 19 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouDailyReportTaskServiceImpl.java

@@ -0,0 +1,19 @@
+package cn.com.ctop.kuaishou.modules.batch.service.impl;
+
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouDailyReportTask;
+import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouDailyReportTaskMapper;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouDailyReportTaskService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 分天记录表
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2020-03-12
+ */
+@Service
+public class KuaiShouDailyReportTaskServiceImpl extends ServiceImpl<KuaiShouDailyReportTaskMapper, KuaiShouDailyReportTask> implements IKuaiShouDailyReportTaskService {
+
+}

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

@@ -196,10 +196,12 @@ public class KuaiShouHistoryReportTaskServiceImpl extends ServiceImpl<KuaiShouHi
 
             }
             task.setTaskStatus(4);
-            this.updateById(task);
+
         } catch (Exception e) {
             e.printStackTrace();
+            task.setTaskStatus(5);
         }
+        this.updateById(task);
 
     }