Просмотр исходного кода

Merge branch 'test' into test_v2

yumeng 5 лет назад
Родитель
Сommit
a8c53c8d10

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

@@ -0,0 +1,243 @@
+package org.jeecg.modules.ctop.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.util.oConvertUtils;
+import cn.com.ctop.kuaishou.modules.app.entity.KuaishouAppProduct;
+import cn.com.ctop.kuaishou.modules.app.service.IKuaishouAppProductService;
+import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+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 com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+ /**
+ * 快手推广产品
+ * @author jeecg-boot
+ * @date   2019-12-31
+ * @version V1.0
+ */
+@Slf4j
+@Api(tags="快手推广产品")
+@RestController
+@RequestMapping("/kuaishou.modules.app/kuaishouAppProduct")
+public class KuaishouAppProductController {
+	@Autowired
+	private IKuaishouAppProductService kuaishouAppProductService;
+	
+	/**
+	  * 分页列表查询
+	 * @param kuaishouAppProduct
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "快手推广产品-分页列表查询")
+	@ApiOperation(value="快手推广产品-分页列表查询", notes="快手推广产品-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<KuaishouAppProduct>> queryPageList(KuaishouAppProduct kuaishouAppProduct,
+									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									  HttpServletRequest req) {
+		Result<IPage<KuaishouAppProduct>> result = new Result<IPage<KuaishouAppProduct>>();
+		QueryWrapper<KuaishouAppProduct> queryWrapper = QueryGenerator.initQueryWrapper(kuaishouAppProduct, req.getParameterMap());
+		Page<KuaishouAppProduct> page = new Page<KuaishouAppProduct>(pageNo, pageSize);
+		IPage<KuaishouAppProduct> pageList = kuaishouAppProductService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+	
+	/**
+	  *   添加
+	 * @param kuaishouAppProduct
+	 * @return
+	 */
+	@AutoLog(value = "快手推广产品-添加")
+	@ApiOperation(value="快手推广产品-添加", notes="快手推广产品-添加")
+	@PostMapping(value = "/add")
+	public Result<KuaishouAppProduct> add(@RequestBody KuaishouAppProduct kuaishouAppProduct) {
+		Result<KuaishouAppProduct> result = new Result<KuaishouAppProduct>();
+		try {
+			kuaishouAppProductService.save(kuaishouAppProduct);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	
+	/**
+	  *  编辑
+	 * @param kuaishouAppProduct
+	 * @return
+	 */
+	@AutoLog(value = "快手推广产品-编辑")
+	@ApiOperation(value="快手推广产品-编辑", notes="快手推广产品-编辑")
+	@PutMapping(value = "/edit")
+	public Result<KuaishouAppProduct> edit(@RequestBody KuaishouAppProduct kuaishouAppProduct) {
+		Result<KuaishouAppProduct> result = new Result<KuaishouAppProduct>();
+		KuaishouAppProduct kuaishouAppProductEntity = kuaishouAppProductService.getById(kuaishouAppProduct.getId());
+		if(kuaishouAppProductEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = kuaishouAppProductService.updateById(kuaishouAppProduct);
+			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 {
+			kuaishouAppProductService.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<KuaishouAppProduct> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<KuaishouAppProduct> result = new Result<KuaishouAppProduct>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+			this.kuaishouAppProductService.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<KuaishouAppProduct> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<KuaishouAppProduct> result = new Result<KuaishouAppProduct>();
+		KuaishouAppProduct kuaishouAppProduct = kuaishouAppProductService.getById(id);
+		if(kuaishouAppProduct==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(kuaishouAppProduct);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<KuaishouAppProduct> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              KuaishouAppProduct kuaishouAppProduct = JSON.parseObject(deString, KuaishouAppProduct.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(kuaishouAppProduct, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<KuaishouAppProduct> pageList = kuaishouAppProductService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "快手推广产品列表");
+      mv.addObject(NormalExcelConstants.CLASS, KuaishouAppProduct.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<KuaishouAppProduct> listKuaishouAppProducts = ExcelImportUtil.importExcel(file.getInputStream(), KuaishouAppProduct.class, params);
+              kuaishouAppProductService.saveBatch(listKuaishouAppProducts);
+              return Result.ok("文件导入成功!数据行数:" + listKuaishouAppProducts.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("文件导入失败!");
+  }
+
+}

+ 16 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/AppProductJob.java

@@ -0,0 +1,16 @@
+package org.jeecg.modules.ctop.job;
+
+import cn.com.ctop.kuaishou.modules.app.service.IKuaishouAppProductService;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class AppProductJob implements Job {
+    @Autowired
+    private IKuaishouAppProductService kuaishouAppProductService;
+    @Override
+    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+        kuaishouAppProductService.selectInto();
+    }
+}

+ 45 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/app/entity/KuaishouAppProduct.java

@@ -0,0 +1,45 @@
+package cn.com.ctop.kuaishou.modules.app.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 快手推广产品
+ * @author jeecg-boot
+ * @date   2019-12-31
+ * @version V1.0
+ */
+@Data
+@TableName("ctop_kuaishou_app_product")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ctop_kuaishou_app_product对象", description="快手推广产品")
+public class KuaishouAppProduct {
+    
+	/**ID*/
+	@TableId(type = IdType.INPUT)
+    @ApiModelProperty(value = "ID")
+	private Integer id;
+	/**产品名称*/
+	@Excel(name = "产品名称", width = 15)
+    @ApiModelProperty(value = "产品名称")
+	private String name;
+	/**推广时间*/
+    @ApiModelProperty(value = "推广时间")
+	private Date createTime;
+	/**更新时间*/
+    @ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+}

+ 17 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/app/mapper/KuaishouAppProductMapper.java

@@ -0,0 +1,17 @@
+package cn.com.ctop.kuaishou.modules.app.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import cn.com.ctop.kuaishou.modules.app.entity.KuaishouAppProduct;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 快手推广产品
+ * @author: jeecg-boot
+ * @date:   2019-12-31
+ * @cersion: V1.0
+ */
+public interface KuaishouAppProductMapper extends BaseMapper<KuaishouAppProduct> {
+    public void selectInto();
+}

+ 8 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/app/mapper/xml/KuaishouAppProductMapper.xml

@@ -0,0 +1,8 @@
+<?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.app.mapper.KuaishouAppProductMapper">
+    <insert id="selectInto">
+        REPLACE INTO ctop_kuaishou_app_product (`name`,create_time)
+SELECT replace(replace(replace(replace(app_name,'.apk',''),'.APK',''),'IOS',''),'ios',''),create_time FROM ctop_kuaishou_app_ad WHERE app_name IS NOT NULL GROUP BY app_name
+    </insert>
+</mapper>

+ 14 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/app/service/IKuaishouAppProductService.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.kuaishou.modules.app.service;
+
+import cn.com.ctop.kuaishou.modules.app.entity.KuaishouAppProduct;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 快手推广产品
+ * @author jeecg-boot
+ * @date   2019-12-31
+ * @version V1.0
+ */
+public interface IKuaishouAppProductService extends IService<KuaishouAppProduct> {
+    public void selectInto();
+}

+ 24 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/app/service/impl/KuaishouAppProductServiceImpl.java

@@ -0,0 +1,24 @@
+package cn.com.ctop.kuaishou.modules.app.service.impl;
+
+import cn.com.ctop.kuaishou.modules.app.entity.KuaishouAppProduct;
+import cn.com.ctop.kuaishou.modules.app.mapper.KuaishouAppProductMapper;
+import cn.com.ctop.kuaishou.modules.app.service.IKuaishouAppProductService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 快手推广产品
+ * @author jeecg-boot
+ * @date   2019-12-31
+ * @version V1.0
+ */
+@Service
+public class KuaishouAppProductServiceImpl extends ServiceImpl<KuaishouAppProductMapper, KuaishouAppProduct> implements IKuaishouAppProductService {
+    @Autowired
+    private KuaishouAppProductMapper kuaishouAppProductMapper;
+    public void selectInto(){
+        kuaishouAppProductMapper.selectInto();
+    }
+}

+ 2 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/app/service/impl/KuaishouAppServiceImpl.java

@@ -75,6 +75,7 @@ public class KuaishouAppServiceImpl implements IKuaishouAppService {
                             ad.setWidth(ad.getAdCover().getWidth());
                             ad.setHeight(ad.getAdCover().getHeight());
                             ad.setType(appFeeds.getType());
+                            ad.setAppName(ad.getAppName().replace(".apk","").replace(".APK","").replace("ios","").replace("IOS",""));
                             appAdService.saveOrUpdate(ad);
                             try {
                                 KuaishouAdAccount kuaishouAdAccount = kuaishouAdAccountService.getById(ad.getUserId());
@@ -179,6 +180,7 @@ public class KuaishouAppServiceImpl implements IKuaishouAppService {
                         ad.setWidth(ad.getAdCover().getWidth());
                         ad.setHeight(ad.getAdCover().getHeight());
                         ad.setType(appFeeds.getType());
+                        ad.setAppName(ad.getAppName().replace(".apk","").replace(".APK","").replace("ios","").replace("IOS",""));
                         appAdService.saveOrUpdate(ad);
                         try {
                             KuaishouAdAccount kuaishouAdAccount = kuaishouAdAccountService.getById(ad.getUserId());

+ 14 - 0
module-report/src/main/java/cn/com/ctop/bytedance/mapper/xml/AccountReportMapper.xml

@@ -85,6 +85,13 @@
         sum(activation) activationCount, -- 激活数
         (sum(charge) / sum(activation)) activationPrice, -- 激活单价
         ((sum(charge) / sum(activation)) / #{discount}) afterActivationPrice, -- 激活单价
+        sum(event_register) eventRegister, -- 注册数
+        (case
+        when sum(event_register) != 0
+        then (sum(charge) / sum(event_register))
+        else 0
+        end
+        ) eventRegisterCost, -- 注册成本
         account_id accountId,
         (select auth_name from ctop_user_allocation where account_id = accountId limit 1) accountName
         from
@@ -152,6 +159,13 @@
         (sum(charge) / sum(form_count)) formPrice, -- 表单提交单价
         sum(activation) activationCount, -- 激活数
         (sum(charge) / sum(activation)) activationPrice, -- 激活单价
+        sum(event_register) eventRegister, -- 注册数
+        (case
+        when sum(event_register) != 0
+        then (sum(charge) / sum(event_register))
+        else 0
+        end
+        ) eventRegisterCost, -- 注册成本
         account_id accountId,
         (select auth_name from ctop_user_allocation where account_id = accountId limit 1) accountName
         from