浏览代码

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

yumeng 4 年之前
父节点
当前提交
c2db7b7a1e
共有 31 个文件被更改,包括 1591 次插入5 次删除
  1. 142 5
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/impl/RuleGroupServiceImpl.java
  2. 234 0
      module-common/src/main/java/cn/com/ctop/common/module/controller/RuleDataAccountController.java
  3. 150 0
      module-common/src/main/java/cn/com/ctop/common/module/controller/RuleDataCreativeController.java
  4. 150 0
      module-common/src/main/java/cn/com/ctop/common/module/controller/RuleDataPlanController.java
  5. 150 0
      module-common/src/main/java/cn/com/ctop/common/module/controller/RuleDataTargetController.java
  6. 150 0
      module-common/src/main/java/cn/com/ctop/common/module/controller/RuleDataWasteCostController.java
  7. 71 0
      module-common/src/main/java/cn/com/ctop/common/module/entity/RuleDataAccount.java
  8. 61 0
      module-common/src/main/java/cn/com/ctop/common/module/entity/RuleDataCreative.java
  9. 79 0
      module-common/src/main/java/cn/com/ctop/common/module/entity/RuleDataPlan.java
  10. 94 0
      module-common/src/main/java/cn/com/ctop/common/module/entity/RuleDataTarget.java
  11. 55 0
      module-common/src/main/java/cn/com/ctop/common/module/entity/RuleDataWasteCost.java
  12. 14 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/RuleDataAccountMapper.java
  13. 14 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/RuleDataCreativeMapper.java
  14. 14 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/RuleDataPlanMapper.java
  15. 14 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/RuleDataTargetMapper.java
  16. 14 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/RuleDataWasteCostMapper.java
  17. 5 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/RuleDataAccountMapper.xml
  18. 5 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/RuleDataCreativeMapper.xml
  19. 5 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/RuleDataPlanMapper.xml
  20. 5 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/RuleDataTargetMapper.xml
  21. 5 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/RuleDataWasteCostMapper.xml
  22. 14 0
      module-common/src/main/java/cn/com/ctop/common/module/service/IRuleDataAccountService.java
  23. 14 0
      module-common/src/main/java/cn/com/ctop/common/module/service/IRuleDataCreativeService.java
  24. 14 0
      module-common/src/main/java/cn/com/ctop/common/module/service/IRuleDataPlanService.java
  25. 14 0
      module-common/src/main/java/cn/com/ctop/common/module/service/IRuleDataTargetService.java
  26. 14 0
      module-common/src/main/java/cn/com/ctop/common/module/service/IRuleDataWasteCostService.java
  27. 18 0
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/RuleDataAccountServiceImpl.java
  28. 18 0
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/RuleDataCreativeServiceImpl.java
  29. 18 0
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/RuleDataPlanServiceImpl.java
  30. 18 0
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/RuleDataTargetServiceImpl.java
  31. 18 0
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/RuleDataWasteCostServiceImpl.java

+ 142 - 5
module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/impl/RuleGroupServiceImpl.java

@@ -2,7 +2,9 @@ package cn.com.ctop.alarm.modules.service.impl;
 
 import cn.com.ctop.alarm.modules.entity.RuleAccountTemplate;
 import cn.com.ctop.alarm.modules.entity.RuleAccountThreshold;
+import cn.com.ctop.alarm.modules.entity.RuleBase;
 import cn.com.ctop.alarm.modules.entity.RuleGroup;
+import cn.com.ctop.alarm.modules.entity.RuleIndicator;
 import cn.com.ctop.alarm.modules.entity.RuleTemplate;
 import cn.com.ctop.alarm.modules.mapper.RuleAccountTemplateMapper;
 import cn.com.ctop.alarm.modules.mapper.RuleAccountThresholdMapper;
@@ -17,6 +19,7 @@ import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -47,21 +50,155 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
 
     @Override
     public void checkRules() {
-        //账户绑定的规则模板
+        //查询账户绑定的规则模板
         List<RuleAccountTemplate> ruleAccountTemplates = ruleAccountTemplateMapper.selectByMap(null);
-        //查询指标数据
+        if (Check.isNull(ruleAccountTemplates)) {
+            log.warn("查询账户绑定过的规则模板失败");
+            return;
+        }
+        //查询匹配数据
         List<JSONObject> dataList = getData();
+        if (Check.isNull(dataList)) {
+            log.warn("查询匹配数据失败");
+            return;
+        }
         //获取规则集
         Map<Long, List<RuleGroup>> ruleGroupMap = getRuleGroupMap();
+        if (Check.isNull(ruleGroupMap)) {
+            log.warn("获取规则集失败");
+            return;
+        }
+        //获取指标内容
+        JSONObject indicators = getRuleIndicator();
+        if (Check.isNull(indicators)) {
+            log.warn("获取指标内容失败");
+            return;
+        }
         for (RuleAccountTemplate templates : ruleAccountTemplates) {
-            for (JSONObject data : dataList) {
-                if (templates.getAccountId() == data.getLong("accountId")) {
+            for (JSONObject matchData : dataList) {
+                if (templates.getAccountId() == matchData.getLong("accountId")) {
                     List<RuleGroup> ruleGroups = ruleGroupMap.get(templates.getTemplateId());
-                    List<RuleAccountThreshold> list = ruleAccountThresholdMapper.selectByAccountId(templates.getAccountId());
+                    matchAlarmRules(ruleGroups, getThreshold(ruleAccountThresholdMapper.selectByAccountId(templates.getAccountId())), matchData, indicators);
+                }
+            }
+        }
+    }
+
+    /**
+     * 匹配预警规则
+     *
+     * @param ruleGroups   规则集
+     * @param thresholdObj 规则id阈值
+     * @param matchData    匹配数据
+     * @param indicators   指标码
+     * @return void
+     * @throws
+     * @author ZHAOXA
+     */
+    private void matchAlarmRules(List<RuleGroup> ruleGroups, JSONObject thresholdObj, JSONObject matchData, JSONObject indicators) {
+        for (RuleGroup ruleGroup : ruleGroups) {
+            String sendType = ruleGroup.getSendType();
+            boolean isPause = "PAUSE".equals(ruleGroup.getOperate());
+            boolean isAllTrue = "and".equals(ruleGroup.getRuleRelationship());
+            boolean flag = true;
+            List<RuleBase> ruleBaseList = ruleGroup.getRuleBaseList();
+            for (RuleBase ruleBase : ruleBaseList) {
+                //and关系,全部匹配规则
+                if (isAllTrue) {
+                    if (flag) {
+                        //指标阈值
+                        String threshold = thresholdObj.getString(ruleBase.getId().toString());
+                        //指标对象
+                        JSONObject indicator = indicators.getJSONObject(ruleBase.getIndicatorCode());
+                        flag = checkThreshold(threshold, ruleBase, indicator);
+                    }
+                } else {
+
+                }
+            }
+        }
 
+    }
+
+    private boolean checkThreshold(String threshold, RuleBase ruleBase, JSONObject indicator) {
+        //条件
+        String condition = ruleBase.getRuleCondition();
+        //指标
+        String indicatorCode = ruleBase.getIndicatorCode();
+        //维度
+        String ruleDimension = ruleBase.getRuleDimension();
+
+        return true;
+    }
+
+    private boolean check(String type, String condition, String threshold, String value) {
+        if ("number".equals(type)) {
+            BigDecimal bigThr = new BigDecimal(threshold);
+            BigDecimal bigVal = new BigDecimal(value);
+            if ("equal".equals(condition))
+                return bigVal.compareTo(bigThr) == 0;
+            else if ("not_equal".equals(condition))
+                return bigVal.compareTo(bigThr) != 0;
+            else if ("greater".equals(condition))
+                return bigVal.compareTo(bigThr) > 0;
+            else if ("less".equals(condition))
+                return bigVal.compareTo(bigThr) < 0;
+            else if ("greater_equal".equals(condition))
+                return bigVal.compareTo(bigThr) >= 0;
+            else if ("less_equal".equals(condition))
+                return bigVal.compareTo(bigThr) <= 0;
+        } else if ("string".equals(type)) {
+            if ("equal".equals(condition))
+                return value.equals(threshold);
+            else if ("not_equal".equals(condition))
+                return !value.equals(threshold);
+            else if ("contain".equals(condition))
+                return !value.contains(threshold);
+            else if ("no_contain".equals(condition))
+                return !value.contains(threshold);
+        } else {
+            String[] strings = threshold.split(",");
+            if ("contain".equals(condition)) {
+                for (String string : strings) {
+                    if (value.contains(string)) {
+                        return true;
+                    }
+                }
+            } else {
+                for (String string : strings) {
+                    if (!value.contains(string)) {
+                        return true;
+                    }
                 }
             }
         }
+        return false;
+    }
+
+
+    //整理阈值数据
+    public JSONObject getThreshold(List<RuleAccountThreshold> thresholdList) {
+        if (Check.isNull(thresholdList)) {
+            return null;
+        }
+        JSONObject obj = new JSONObject();
+        for (RuleAccountThreshold threshold : thresholdList) {
+            obj.put(String.valueOf(threshold.getRuleId()), threshold.getThreshoId());
+        }
+        return obj;
+    }
+
+    //整理指标数据
+    public JSONObject getRuleIndicator() {
+        List<RuleIndicator> indicators = ruleIndicatorMapper.selectByMap(null);
+        if (Check.isNull(indicators)) {
+            return null;
+        }
+        JSONObject obj = new JSONObject();
+        for (RuleIndicator indicator : indicators) {
+            obj.put(indicator.getCode(), indicators);
+        }
+        return obj;
     }
 
 

+ 234 - 0
module-common/src/main/java/cn/com/ctop/common/module/controller/RuleDataAccountController.java

@@ -0,0 +1,234 @@
+package cn.com.ctop.common.module.controller;
+
+import cn.com.ctop.common.module.entity.RuleDataAccount;
+import cn.com.ctop.common.module.service.IRuleDataAccountService;
+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.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
+ * @date   2020-11-16
+ * @version V1.0
+ */
+@Slf4j
+@Api(tags="规则账户清洗数据")
+@RestController
+@RequestMapping("/ctop/ruleDataAccount")
+public class RuleDataAccountController {
+	@Autowired
+	private IRuleDataAccountService ruleDataAccountService;
+
+	/**
+	  * 分页列表查询
+	 * @param ruleDataAccount
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@ApiOperation(value="规则账户清洗数据-分页列表查询", notes="规则账户清洗数据-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<RuleDataAccount>> queryPageList(RuleDataAccount ruleDataAccount,
+                                                        @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                        @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                        HttpServletRequest req) {
+		Result<IPage<RuleDataAccount>> result = new Result<>();
+		QueryWrapper<RuleDataAccount> queryWrapper = QueryGenerator.initQueryWrapper(ruleDataAccount, req.getParameterMap());
+		Page<RuleDataAccount> page = new Page<>(pageNo, pageSize);
+		IPage<RuleDataAccount> pageList = ruleDataAccountService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+
+	/**
+	  *   添加
+	 * @param ruleDataAccount
+	 * @return
+	 */
+	@ApiOperation(value="规则账户清洗数据-添加", notes="规则账户清洗数据-添加")
+	@PostMapping(value = "/add")
+	public Result<RuleDataAccount> add(@RequestBody RuleDataAccount ruleDataAccount) {
+		Result<RuleDataAccount> result = new Result<>();
+		try {
+			ruleDataAccountService.save(ruleDataAccount);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+
+	/**
+	  *  编辑
+	 * @param ruleDataAccount
+	 * @return
+	 */
+	@ApiOperation(value="规则账户清洗数据-编辑", notes="规则账户清洗数据-编辑")
+	@PutMapping(value = "/edit")
+	public Result<RuleDataAccount> edit(@RequestBody RuleDataAccount ruleDataAccount) {
+		Result<RuleDataAccount> result = new Result<>();
+		RuleDataAccount ruleDataAccountEntity = ruleDataAccountService.getById(ruleDataAccount.getId());
+		if(ruleDataAccountEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = ruleDataAccountService.updateById(ruleDataAccount);
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@ApiOperation(value="规则账户清洗数据-通过id删除", notes="规则账户清洗数据-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		try {
+			ruleDataAccountService.removeById(id);
+		} catch (Exception e) {
+			log.error("删除失败",e.getMessage());
+			return Result.error("删除失败!");
+		}
+		return Result.ok("删除成功!");
+	}
+
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@ApiOperation(value="规则账户清洗数据-批量删除", notes="规则账户清洗数据-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<RuleDataAccount> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<RuleDataAccount> result = new Result<>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+			this.ruleDataAccountService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@ApiOperation(value="规则账户清洗数据-通过id查询", notes="规则账户清洗数据-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<RuleDataAccount> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<RuleDataAccount> result = new Result<>();
+		RuleDataAccount ruleDataAccount = ruleDataAccountService.getById(id);
+		if(ruleDataAccount==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(ruleDataAccount);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<RuleDataAccount> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              RuleDataAccount ruleDataAccount = JSON.parseObject(deString, RuleDataAccount.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(ruleDataAccount, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<RuleDataAccount> pageList = ruleDataAccountService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "规则账户清洗数据列表");
+      mv.addObject(NormalExcelConstants.CLASS, RuleDataAccount.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<RuleDataAccount> listRuleDataAccounts = ExcelImportUtil.importExcel(file.getInputStream(), RuleDataAccount.class, params);
+              ruleDataAccountService.saveBatch(listRuleDataAccounts);
+              return Result.ok("文件导入成功!数据行数:" + listRuleDataAccounts.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("文件导入失败!");
+  }
+
+}

+ 150 - 0
module-common/src/main/java/cn/com/ctop/common/module/controller/RuleDataCreativeController.java

@@ -0,0 +1,150 @@
+package cn.com.ctop.common.module.controller;
+
+import cn.com.ctop.common.module.entity.RuleDataCreative;
+import cn.com.ctop.common.module.service.IRuleDataCreativeService;
+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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+
+ /**
+ * 规则创意清洗数据
+ * @author jeecg-boot
+ * @date   2020-11-16
+ * @version V1.0
+ */
+@Slf4j
+@Api(tags="规则创意清洗数据")
+@RestController
+@RequestMapping("/ctop/ruleDataCreative")
+public class RuleDataCreativeController {
+	@Autowired
+	private IRuleDataCreativeService ruleDataCreativeService;
+
+	/**
+	  * 分页列表查询
+	 * @param ruleDataCreative
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@ApiOperation(value="规则创意清洗数据-分页列表查询", notes="规则创意清洗数据-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<RuleDataCreative>> queryPageList(RuleDataCreative ruleDataCreative,
+														 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														 HttpServletRequest req) {
+		Result<IPage<RuleDataCreative>> result = new Result<>();
+		QueryWrapper<RuleDataCreative> queryWrapper = QueryGenerator.initQueryWrapper(ruleDataCreative, req.getParameterMap());
+		Page<RuleDataCreative> page = new Page<>(pageNo, pageSize);
+		IPage<RuleDataCreative> pageList = ruleDataCreativeService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+
+	/**
+	  *   添加
+	 * @param ruleDataCreative
+	 * @return
+	 */
+	@ApiOperation(value="规则创意清洗数据-添加", notes="规则创意清洗数据-添加")
+	@PostMapping(value = "/add")
+	public Result<RuleDataCreative> add(@RequestBody RuleDataCreative ruleDataCreative) {
+		Result<RuleDataCreative> result = new Result<>();
+		try {
+			ruleDataCreativeService.save(ruleDataCreative);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+
+	/**
+	  *  编辑
+	 * @param ruleDataCreative
+	 * @return
+	 */
+	@ApiOperation(value="规则创意清洗数据-编辑", notes="规则创意清洗数据-编辑")
+	@PutMapping(value = "/edit")
+	public Result<RuleDataCreative> edit(@RequestBody RuleDataCreative ruleDataCreative) {
+		Result<RuleDataCreative> result = new Result<RuleDataCreative>();
+		RuleDataCreative ruleDataCreativeEntity = ruleDataCreativeService.getById(ruleDataCreative.getId());
+		if(ruleDataCreativeEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = ruleDataCreativeService.updateById(ruleDataCreative);
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@ApiOperation(value="规则创意清洗数据-通过id删除", notes="规则创意清洗数据-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		try {
+			ruleDataCreativeService.removeById(id);
+		} catch (Exception e) {
+			log.error("删除失败",e.getMessage());
+			return Result.error("删除失败!");
+		}
+		return Result.ok("删除成功!");
+	}
+
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@ApiOperation(value="规则创意清洗数据-批量删除", notes="规则创意清洗数据-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<RuleDataCreative> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<RuleDataCreative> result = new Result<>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+			this.ruleDataCreativeService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@ApiOperation(value="规则创意清洗数据-通过id查询", notes="规则创意清洗数据-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<RuleDataCreative> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<RuleDataCreative> result = new Result<>();
+		RuleDataCreative ruleDataCreative = ruleDataCreativeService.getById(id);
+		if(ruleDataCreative==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(ruleDataCreative);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+}

+ 150 - 0
module-common/src/main/java/cn/com/ctop/common/module/controller/RuleDataPlanController.java

@@ -0,0 +1,150 @@
+package cn.com.ctop.common.module.controller;
+
+import cn.com.ctop.common.module.entity.RuleDataPlan;
+import cn.com.ctop.common.module.service.IRuleDataPlanService;
+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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+
+ /**
+ * 规则计划清洗数据
+ * @author jeecg-boot
+ * @date   2020-11-16
+ * @version V1.0
+ */
+@Slf4j
+@Api(tags="规则计划清洗数据")
+@RestController
+@RequestMapping("/ctop/ruleDataPlan")
+public class RuleDataPlanController {
+	@Autowired
+	private IRuleDataPlanService ruleDataPlanService;
+
+	/**
+	  * 分页列表查询
+	 * @param ruleDataPlan
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@ApiOperation(value="规则计划清洗数据-分页列表查询", notes="规则计划清洗数据-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<RuleDataPlan>> queryPageList(RuleDataPlan ruleDataPlan,
+													 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													 HttpServletRequest req) {
+		Result<IPage<RuleDataPlan>> result = new Result<>();
+		QueryWrapper<RuleDataPlan> queryWrapper = QueryGenerator.initQueryWrapper(ruleDataPlan, req.getParameterMap());
+		Page<RuleDataPlan> page = new Page<>(pageNo, pageSize);
+		IPage<RuleDataPlan> pageList = ruleDataPlanService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+
+	/**
+	  *   添加
+	 * @param ruleDataPlan
+	 * @return
+	 */
+	@ApiOperation(value="规则计划清洗数据-添加", notes="规则计划清洗数据-添加")
+	@PostMapping(value = "/add")
+	public Result<RuleDataPlan> add(@RequestBody RuleDataPlan ruleDataPlan) {
+		Result<RuleDataPlan> result = new Result<>();
+		try {
+			ruleDataPlanService.save(ruleDataPlan);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+
+	/**
+	  *  编辑
+	 * @param ruleDataPlan
+	 * @return
+	 */
+	@ApiOperation(value="规则计划清洗数据-编辑", notes="规则计划清洗数据-编辑")
+	@PutMapping(value = "/edit")
+	public Result<RuleDataPlan> edit(@RequestBody RuleDataPlan ruleDataPlan) {
+		Result<RuleDataPlan> result = new Result<>();
+		RuleDataPlan ruleDataPlanEntity = ruleDataPlanService.getById(ruleDataPlan.getId());
+		if(ruleDataPlanEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = ruleDataPlanService.updateById(ruleDataPlan);
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@ApiOperation(value="规则计划清洗数据-通过id删除", notes="规则计划清洗数据-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		try {
+			ruleDataPlanService.removeById(id);
+		} catch (Exception e) {
+			log.error("删除失败",e.getMessage());
+			return Result.error("删除失败!");
+		}
+		return Result.ok("删除成功!");
+	}
+
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@ApiOperation(value="规则计划清洗数据-批量删除", notes="规则计划清洗数据-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<RuleDataPlan> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<RuleDataPlan> result = new Result<>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+			this.ruleDataPlanService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@ApiOperation(value="规则计划清洗数据-通过id查询", notes="规则计划清洗数据-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<RuleDataPlan> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<RuleDataPlan> result = new Result<>();
+		RuleDataPlan ruleDataPlan = ruleDataPlanService.getById(id);
+		if(ruleDataPlan==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(ruleDataPlan);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+}

+ 150 - 0
module-common/src/main/java/cn/com/ctop/common/module/controller/RuleDataTargetController.java

@@ -0,0 +1,150 @@
+package cn.com.ctop.common.module.controller;
+
+import cn.com.ctop.common.module.entity.RuleDataTarget;
+import cn.com.ctop.common.module.service.IRuleDataTargetService;
+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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+
+ /**
+ * 规则定向清洗数据
+ * @author jeecg-boot
+ * @date   2020-11-16
+ * @version V1.0
+ */
+@Slf4j
+@Api(tags="规则定向清洗数据")
+@RestController
+@RequestMapping("/ctop/ruleDataTarget")
+public class RuleDataTargetController {
+	@Autowired
+	private IRuleDataTargetService ruleDataTargetService;
+
+	/**
+	  * 分页列表查询
+	 * @param ruleDataTarget
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@ApiOperation(value="规则定向清洗数据-分页列表查询", notes="规则定向清洗数据-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<RuleDataTarget>> queryPageList(RuleDataTarget ruleDataTarget,
+													   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													   HttpServletRequest req) {
+		Result<IPage<RuleDataTarget>> result = new Result<>();
+		QueryWrapper<RuleDataTarget> queryWrapper = QueryGenerator.initQueryWrapper(ruleDataTarget, req.getParameterMap());
+		Page<RuleDataTarget> page = new Page<RuleDataTarget>(pageNo, pageSize);
+		IPage<RuleDataTarget> pageList = ruleDataTargetService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+
+	/**
+	  *   添加
+	 * @param ruleDataTarget
+	 * @return
+	 */
+	@ApiOperation(value="规则定向清洗数据-添加", notes="规则定向清洗数据-添加")
+	@PostMapping(value = "/add")
+	public Result<RuleDataTarget> add(@RequestBody RuleDataTarget ruleDataTarget) {
+		Result<RuleDataTarget> result = new Result<>();
+		try {
+			ruleDataTargetService.save(ruleDataTarget);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+
+	/**
+	  *  编辑
+	 * @param ruleDataTarget
+	 * @return
+	 */
+	@ApiOperation(value="规则定向清洗数据-编辑", notes="规则定向清洗数据-编辑")
+	@PutMapping(value = "/edit")
+	public Result<RuleDataTarget> edit(@RequestBody RuleDataTarget ruleDataTarget) {
+		Result<RuleDataTarget> result = new Result<RuleDataTarget>();
+		RuleDataTarget ruleDataTargetEntity = ruleDataTargetService.getById(ruleDataTarget.getId());
+		if(ruleDataTargetEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = ruleDataTargetService.updateById(ruleDataTarget);
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@ApiOperation(value="规则定向清洗数据-通过id删除", notes="规则定向清洗数据-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		try {
+			ruleDataTargetService.removeById(id);
+		} catch (Exception e) {
+			log.error("删除失败",e.getMessage());
+			return Result.error("删除失败!");
+		}
+		return Result.ok("删除成功!");
+	}
+
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@ApiOperation(value="规则定向清洗数据-批量删除", notes="规则定向清洗数据-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<RuleDataTarget> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<RuleDataTarget> result = new Result<>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+			this.ruleDataTargetService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@ApiOperation(value="规则定向清洗数据-通过id查询", notes="规则定向清洗数据-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<RuleDataTarget> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<RuleDataTarget> result = new Result<>();
+		RuleDataTarget ruleDataTarget = ruleDataTargetService.getById(id);
+		if(ruleDataTarget==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(ruleDataTarget);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+}

+ 150 - 0
module-common/src/main/java/cn/com/ctop/common/module/controller/RuleDataWasteCostController.java

@@ -0,0 +1,150 @@
+package cn.com.ctop.common.module.controller;
+
+import cn.com.ctop.common.module.entity.RuleDataWasteCost;
+import cn.com.ctop.common.module.service.IRuleDataWasteCostService;
+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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+
+ /**
+ * 规则空耗清洗数据
+ * @author jeecg-boot
+ * @date   2020-11-16
+ * @version V1.0
+ */
+@Slf4j
+@Api(tags="规则空耗清洗数据")
+@RestController
+@RequestMapping("/ctop/ruleDataWasteCost")
+public class RuleDataWasteCostController {
+	@Autowired
+	private IRuleDataWasteCostService ruleDataWasteCostService;
+
+	/**
+	  * 分页列表查询
+	 * @param ruleDataWasteCost
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@ApiOperation(value="规则空耗清洗数据-分页列表查询", notes="规则空耗清洗数据-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<RuleDataWasteCost>> queryPageList(RuleDataWasteCost ruleDataWasteCost,
+														  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														  HttpServletRequest req) {
+		Result<IPage<RuleDataWasteCost>> result = new Result<>();
+		QueryWrapper<RuleDataWasteCost> queryWrapper = QueryGenerator.initQueryWrapper(ruleDataWasteCost, req.getParameterMap());
+		Page<RuleDataWasteCost> page = new Page<RuleDataWasteCost>(pageNo, pageSize);
+		IPage<RuleDataWasteCost> pageList = ruleDataWasteCostService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+
+	/**
+	  *   添加
+	 * @param ruleDataWasteCost
+	 * @return
+	 */
+	@ApiOperation(value="规则空耗清洗数据-添加", notes="规则空耗清洗数据-添加")
+	@PostMapping(value = "/add")
+	public Result<RuleDataWasteCost> add(@RequestBody RuleDataWasteCost ruleDataWasteCost) {
+		Result<RuleDataWasteCost> result = new Result<>();
+		try {
+			ruleDataWasteCostService.save(ruleDataWasteCost);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+
+	/**
+	  *  编辑
+	 * @param ruleDataWasteCost
+	 * @return
+	 */
+	@ApiOperation(value="规则空耗清洗数据-编辑", notes="规则空耗清洗数据-编辑")
+	@PutMapping(value = "/edit")
+	public Result<RuleDataWasteCost> edit(@RequestBody RuleDataWasteCost ruleDataWasteCost) {
+		Result<RuleDataWasteCost> result = new Result<RuleDataWasteCost>();
+		RuleDataWasteCost ruleDataWasteCostEntity = ruleDataWasteCostService.getById(ruleDataWasteCost.getId());
+		if(ruleDataWasteCostEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = ruleDataWasteCostService.updateById(ruleDataWasteCost);
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@ApiOperation(value="规则空耗清洗数据-通过id删除", notes="规则空耗清洗数据-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		try {
+			ruleDataWasteCostService.removeById(id);
+		} catch (Exception e) {
+			log.error("删除失败",e.getMessage());
+			return Result.error("删除失败!");
+		}
+		return Result.ok("删除成功!");
+	}
+
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@ApiOperation(value="规则空耗清洗数据-批量删除", notes="规则空耗清洗数据-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<RuleDataWasteCost> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<RuleDataWasteCost> result = new Result<>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+			this.ruleDataWasteCostService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@ApiOperation(value="规则空耗清洗数据-通过id查询", notes="规则空耗清洗数据-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<RuleDataWasteCost> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<RuleDataWasteCost> result = new Result<>();
+		RuleDataWasteCost ruleDataWasteCost = ruleDataWasteCostService.getById(id);
+		if(ruleDataWasteCost==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(ruleDataWasteCost);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+}

+ 71 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/RuleDataAccount.java

@@ -0,0 +1,71 @@
+package cn.com.ctop.common.module.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 规则账户清洗数据
+ * @author jeecg-boot
+ * @date   2020-11-16
+ * @version V1.0
+ */
+@Data
+@TableName("ctop_rule_data_account")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ctop_rule_data_account对象", description="规则账户清洗数据")
+public class RuleDataAccount {
+
+	/**id*/
+	@TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "id")
+	private Long id;
+	/**账户id*/
+	@Excel(name = "账户id", width = 15)
+    @ApiModelProperty(value = "账户id")
+	private Long accountId;
+	/**消耗*/
+	@Excel(name = "消耗", width = 15)
+    @ApiModelProperty(value = "消耗")
+	private BigDecimal cost;
+	/**validBalance*/
+	@Excel(name = "validBalance", width = 15)
+    @ApiModelProperty(value = "validBalance")
+	private BigDecimal validBalance;
+	/**转化数*/
+	@Excel(name = "转化数", width = 15)
+    @ApiModelProperty(value = "转化数")
+	private Long convert;
+	/**转化成本*/
+	@Excel(name = "转化成本", width = 15)
+    @ApiModelProperty(value = "转化成本")
+	private BigDecimal convertCost;
+	/**次留数*/
+	@Excel(name = "次留数", width = 15)
+    @ApiModelProperty(value = "次留数")
+	private Long nextDayOpenNum;
+	/**nextDayOpenCost*/
+	@Excel(name = "nextDayOpenCost", width = 15)
+    @ApiModelProperty(value = "nextDayOpenCost")
+	private BigDecimal nextDayOpenCost;
+	/**status*/
+	@Excel(name = "status", width = 15)
+    @ApiModelProperty(value = "status")
+	private Integer status;
+	/**createTime*/
+    @ApiModelProperty(value = "createTime")
+	private Date createTime;
+	/**updateTime*/
+    @ApiModelProperty(value = "updateTime")
+	private Date updateTime;
+}

+ 61 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/RuleDataCreative.java

@@ -0,0 +1,61 @@
+package cn.com.ctop.common.module.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * 规则创意清洗数据
+ * @author jeecg-boot
+ * @date   2020-11-16
+ * @version V1.0
+ */
+@Data
+@TableName("ctop_rule_data_creative")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ctop_rule_data_creative对象", description="规则创意清洗数据")
+public class RuleDataCreative {
+
+	/**id*/
+	@TableId(type = IdType.AUTO)
+	private Long id;
+	/**accountId*/
+	@Excel(name = "accountId", width = 15)
+    @ApiModelProperty(value = "accountId")
+	private Long accountId;
+	/**planId*/
+	@Excel(name = "planId", width = 15)
+    @ApiModelProperty(value = "planId")
+	private Long planId;
+	/**creativeId*/
+	@Excel(name = "creativeId", width = 15)
+    @ApiModelProperty(value = "creativeId")
+	private Long creativeId;
+	/**presentedVideo*/
+	@Excel(name = "presentedVideo", width = 15)
+    @ApiModelProperty(value = "presentedVideo")
+	private Integer presentedVideo;
+	/**creativeTitle*/
+	@Excel(name = "creativeTitle", width = 15)
+    @ApiModelProperty(value = "creativeTitle")
+	private String creativeTitle;
+	/**source*/
+	@Excel(name = "source", width = 15)
+    @ApiModelProperty(value = "source")
+	private String source;
+	/**createTime*/
+    @ApiModelProperty(value = "createTime")
+	private Date createTime;
+	/**updateTime*/
+    @ApiModelProperty(value = "updateTime")
+	private Date updateTime;
+}

+ 79 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/RuleDataPlan.java

@@ -0,0 +1,79 @@
+package cn.com.ctop.common.module.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 规则计划清洗数据
+ * @author jeecg-boot
+ * @date   2020-11-16
+ * @version V1.0
+ */
+@Data
+@TableName("ctop_rule_data_plan")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ctop_rule_data_plan对象", description="规则计划清洗数据")
+public class RuleDataPlan {
+
+	/**id*/
+	@TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "id")
+	private Long id;
+	/**accountId*/
+	@Excel(name = "accountId", width = 15)
+    @ApiModelProperty(value = "accountId")
+	private Long accountId;
+	/**planId*/
+	@Excel(name = "planId", width = 15)
+    @ApiModelProperty(value = "planId")
+	private Long planId;
+	/**externalUrl*/
+	@Excel(name = "externalUrl", width = 15)
+    @ApiModelProperty(value = "externalUrl")
+	private String externalUrl;
+	/**downloadUrl*/
+	@Excel(name = "downloadUrl", width = 15)
+    @ApiModelProperty(value = "downloadUrl")
+	private String downloadUrl;
+	/**cost*/
+	@Excel(name = "cost", width = 15)
+    @ApiModelProperty(value = "cost")
+	private BigDecimal cost;
+	/**convert*/
+	@Excel(name = "convert", width = 15)
+    @ApiModelProperty(value = "convert")
+	private Long convert;
+	/**convertCost*/
+	@Excel(name = "convertCost", width = 15)
+    @ApiModelProperty(value = "convertCost")
+	private BigDecimal convertCost;
+	/**nextDayOpenRate*/
+	@Excel(name = "nextDayOpenRate", width = 15)
+    @ApiModelProperty(value = "nextDayOpenRate")
+	private BigDecimal nextDayOpenRate;
+	/**付费方式*/
+	@Excel(name = "付费方式", width = 15)
+    @ApiModelProperty(value = "付费方式")
+	private String pricing;
+	/**出价*/
+	@Excel(name = "出价", width = 15)
+    @ApiModelProperty(value = "出价")
+	private BigDecimal budget;
+	/**createTime*/
+    @ApiModelProperty(value = "createTime")
+	private Date createTime;
+	/**updateTime*/
+    @ApiModelProperty(value = "updateTime")
+	private Date updateTime;
+}

+ 94 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/RuleDataTarget.java

@@ -0,0 +1,94 @@
+package cn.com.ctop.common.module.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * 规则定向清洗数据
+ * @author jeecg-boot
+ * @date   2020-11-16
+ * @version V1.0
+ */
+@Data
+@TableName("ctop_rule_data_target")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ctop_rule_data_target对象", description="规则定向清洗数据")
+public class RuleDataTarget {
+
+	/**id*/
+	@TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "id")
+	private Long id;
+	/**accountId*/
+	@Excel(name = "accountId", width = 15)
+    @ApiModelProperty(value = "accountId")
+	private Long accountId;
+	/**planId*/
+	@Excel(name = "planId", width = 15)
+    @ApiModelProperty(value = "planId")
+	private Long planId;
+	/**retargetingTagsExclude*/
+	@Excel(name = "retargetingTagsExclude", width = 15)
+    @ApiModelProperty(value = "retargetingTagsExclude")
+	private String retargetingTagsExclude;
+	/**hideIfExists*/
+	@Excel(name = "hideIfExists", width = 15)
+    @ApiModelProperty(value = "hideIfExists")
+	private Integer hideIfExists;
+	/**inventoryType*/
+	@Excel(name = "inventoryType", width = 15)
+    @ApiModelProperty(value = "inventoryType")
+	private String inventoryType;
+	/**sceneInventory*/
+	@Excel(name = "sceneInventory", width = 15)
+    @ApiModelProperty(value = "sceneInventory")
+	private String sceneInventory;
+	/**district*/
+	@Excel(name = "district", width = 15)
+    @ApiModelProperty(value = "district")
+	private String district;
+	/**gender*/
+	@Excel(name = "gender", width = 15)
+    @ApiModelProperty(value = "gender")
+	private String gender;
+	/**age*/
+	@Excel(name = "age", width = 15)
+    @ApiModelProperty(value = "age")
+	private String age;
+	/**excludeFlowPackage*/
+	@Excel(name = "excludeFlowPackage", width = 15)
+    @ApiModelProperty(value = "excludeFlowPackage")
+	private String excludeFlowPackage;
+	/**platform*/
+	@Excel(name = "platform", width = 15)
+    @ApiModelProperty(value = "platform")
+	private String platform;
+	/**hideIfConverted*/
+	@Excel(name = "hideIfConverted", width = 15)
+    @ApiModelProperty(value = "hideIfConverted")
+	private String hideIfConverted;
+	/**deepBidType*/
+	@Excel(name = "deepBidType", width = 15)
+    @ApiModelProperty(value = "deepBidType")
+	private String deepBidType;
+	/**scheduleTime*/
+	@Excel(name = "scheduleTime", width = 15)
+    @ApiModelProperty(value = "scheduleTime")
+	private String scheduleTime;
+	/**createTime*/
+    @ApiModelProperty(value = "createTime")
+	private Date createTime;
+	/**updateTime*/
+    @ApiModelProperty(value = "updateTime")
+	private Date updateTime;
+}

+ 55 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/RuleDataWasteCost.java

@@ -0,0 +1,55 @@
+package cn.com.ctop.common.module.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 规则空耗清洗数据
+ * @author jeecg-boot
+ * @date   2020-11-16
+ * @version V1.0
+ */
+@Data
+@TableName("ctop_rule_data_waste_cost")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ctop_rule_data_waste_cost对象", description="规则空耗清洗数据")
+public class RuleDataWasteCost {
+
+	/**id*/
+	@TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "id")
+	private Long id;
+	/**accountId*/
+	@Excel(name = "accountId", width = 15)
+    @ApiModelProperty(value = "accountId")
+	private Long accountId;
+	/**planId*/
+	@Excel(name = "planId", width = 15)
+    @ApiModelProperty(value = "planId")
+	private Long planId;
+	/**wasteCost*/
+	@Excel(name = "wasteCost", width = 15)
+    @ApiModelProperty(value = "wasteCost")
+	private BigDecimal wasteCost;
+	/**wasteDay*/
+	@Excel(name = "wasteDay", width = 15)
+    @ApiModelProperty(value = "wasteDay")
+	private Integer wasteDay;
+	/**createTime*/
+    @ApiModelProperty(value = "createTime")
+	private Date createTime;
+	/**updateTime*/
+    @ApiModelProperty(value = "updateTime")
+	private Date updateTime;
+}

+ 14 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/RuleDataAccountMapper.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.common.module.mapper;
+
+import cn.com.ctop.common.module.entity.RuleDataAccount;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 规则账户清洗数据
+ * @author: jeecg-boot
+ * @date:   2020-11-16
+ * @cersion: V1.0
+ */
+public interface RuleDataAccountMapper extends BaseMapper<RuleDataAccount> {
+
+}

+ 14 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/RuleDataCreativeMapper.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.common.module.mapper;
+
+import cn.com.ctop.common.module.entity.RuleDataCreative;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 规则创意清洗数据
+ * @author: jeecg-boot
+ * @date:   2020-11-16
+ * @cersion: V1.0
+ */
+public interface RuleDataCreativeMapper extends BaseMapper<RuleDataCreative> {
+
+}

+ 14 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/RuleDataPlanMapper.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.common.module.mapper;
+
+import cn.com.ctop.common.module.entity.RuleDataPlan;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 规则计划清洗数据
+ * @author: jeecg-boot
+ * @date:   2020-11-16
+ * @cersion: V1.0
+ */
+public interface RuleDataPlanMapper extends BaseMapper<RuleDataPlan> {
+
+}

+ 14 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/RuleDataTargetMapper.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.common.module.mapper;
+
+import cn.com.ctop.common.module.entity.RuleDataTarget;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 规则定向清洗数据
+ * @author: jeecg-boot
+ * @date:   2020-11-16
+ * @cersion: V1.0
+ */
+public interface RuleDataTargetMapper extends BaseMapper<RuleDataTarget> {
+
+}

+ 14 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/RuleDataWasteCostMapper.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.common.module.mapper;
+
+import cn.com.ctop.common.module.entity.RuleDataWasteCost;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 规则空耗清洗数据
+ * @author: jeecg-boot
+ * @date:   2020-11-16
+ * @cersion: V1.0
+ */
+public interface RuleDataWasteCostMapper extends BaseMapper<RuleDataWasteCost> {
+
+}

+ 5 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/RuleDataAccountMapper.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.common.module.mapper.RuleDataAccountMapper">
+
+</mapper>

+ 5 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/RuleDataCreativeMapper.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.common.module.mapper.RuleDataCreativeMapper">
+
+</mapper>

+ 5 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/RuleDataPlanMapper.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.common.module.mapper.RuleDataPlanMapper">
+
+</mapper>

+ 5 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/RuleDataTargetMapper.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.common.module.mapper.RuleDataTargetMapper">
+
+</mapper>

+ 5 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/RuleDataWasteCostMapper.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.common.module.mapper.RuleDataWasteCostMapper">
+
+</mapper>

+ 14 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/IRuleDataAccountService.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.common.module.service;
+
+import cn.com.ctop.common.module.entity.RuleDataAccount;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 规则账户清洗数据
+ * @Author: jeecg-boot
+ * @Date:   2020-11-16
+ * @Version: V1.0
+ */
+public interface IRuleDataAccountService extends IService<RuleDataAccount> {
+
+}

+ 14 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/IRuleDataCreativeService.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.common.module.service;
+
+import cn.com.ctop.common.module.entity.RuleDataCreative;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 规则创意清洗数据
+ * @Author: jeecg-boot
+ * @Date:   2020-11-16
+ * @Version: V1.0
+ */
+public interface IRuleDataCreativeService extends IService<RuleDataCreative> {
+
+}

+ 14 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/IRuleDataPlanService.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.common.module.service;
+
+import cn.com.ctop.common.module.entity.RuleDataPlan;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 规则计划清洗数据
+ * @Author: jeecg-boot
+ * @Date:   2020-11-16
+ * @Version: V1.0
+ */
+public interface IRuleDataPlanService extends IService<RuleDataPlan> {
+
+}

+ 14 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/IRuleDataTargetService.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.common.module.service;
+
+import cn.com.ctop.common.module.entity.RuleDataTarget;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 规则定向清洗数据
+ * @Author: jeecg-boot
+ * @Date:   2020-11-16
+ * @Version: V1.0
+ */
+public interface IRuleDataTargetService extends IService<RuleDataTarget> {
+
+}

+ 14 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/IRuleDataWasteCostService.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.common.module.service;
+
+import cn.com.ctop.common.module.entity.RuleDataWasteCost;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 规则空耗清洗数据
+ * @Author: jeecg-boot
+ * @Date:   2020-11-16
+ * @Version: V1.0
+ */
+public interface IRuleDataWasteCostService extends IService<RuleDataWasteCost> {
+
+}

+ 18 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/impl/RuleDataAccountServiceImpl.java

@@ -0,0 +1,18 @@
+package cn.com.ctop.common.module.service.impl;
+
+import cn.com.ctop.common.module.entity.RuleDataAccount;
+import cn.com.ctop.common.module.mapper.RuleDataAccountMapper;
+import cn.com.ctop.common.module.service.IRuleDataAccountService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 规则账户清洗数据
+ * @author jeecg-boot
+ * @date   2020-11-16
+ * @version V1.0
+ */
+@Service
+public class RuleDataAccountServiceImpl extends ServiceImpl<RuleDataAccountMapper, RuleDataAccount> implements IRuleDataAccountService {
+
+}

+ 18 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/impl/RuleDataCreativeServiceImpl.java

@@ -0,0 +1,18 @@
+package cn.com.ctop.common.module.service.impl;
+
+import cn.com.ctop.common.module.entity.RuleDataCreative;
+import cn.com.ctop.common.module.mapper.RuleDataCreativeMapper;
+import cn.com.ctop.common.module.service.IRuleDataCreativeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 规则创意清洗数据
+ * @author jeecg-boot
+ * @date   2020-11-16
+ * @version V1.0
+ */
+@Service
+public class RuleDataCreativeServiceImpl extends ServiceImpl<RuleDataCreativeMapper, RuleDataCreative> implements IRuleDataCreativeService {
+
+}

+ 18 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/impl/RuleDataPlanServiceImpl.java

@@ -0,0 +1,18 @@
+package cn.com.ctop.common.module.service.impl;
+
+import cn.com.ctop.common.module.entity.RuleDataPlan;
+import cn.com.ctop.common.module.mapper.RuleDataPlanMapper;
+import cn.com.ctop.common.module.service.IRuleDataPlanService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 规则计划清洗数据
+ * @author jeecg-boot
+ * @date   2020-11-16
+ * @version V1.0
+ */
+@Service
+public class RuleDataPlanServiceImpl extends ServiceImpl<RuleDataPlanMapper, RuleDataPlan> implements IRuleDataPlanService {
+
+}

+ 18 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/impl/RuleDataTargetServiceImpl.java

@@ -0,0 +1,18 @@
+package cn.com.ctop.common.module.service.impl;
+
+import cn.com.ctop.common.module.entity.RuleDataTarget;
+import cn.com.ctop.common.module.mapper.RuleDataTargetMapper;
+import cn.com.ctop.common.module.service.IRuleDataTargetService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 规则定向清洗数据
+ * @author jeecg-boot
+ * @date   2020-11-16
+ * @version V1.0
+ */
+@Service
+public class RuleDataTargetServiceImpl extends ServiceImpl<RuleDataTargetMapper, RuleDataTarget> implements IRuleDataTargetService {
+
+}

+ 18 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/impl/RuleDataWasteCostServiceImpl.java

@@ -0,0 +1,18 @@
+package cn.com.ctop.common.module.service.impl;
+
+import cn.com.ctop.common.module.entity.RuleDataWasteCost;
+import cn.com.ctop.common.module.mapper.RuleDataWasteCostMapper;
+import cn.com.ctop.common.module.service.IRuleDataWasteCostService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 规则空耗清洗数据
+ * @author jeecg-boot
+ * @date   2020-11-16
+ * @version V1.0
+ */
+@Service
+public class RuleDataWasteCostServiceImpl extends ServiceImpl<RuleDataWasteCostMapper, RuleDataWasteCost> implements IRuleDataWasteCostService {
+
+}