Sfoglia il codice sorgente

预警匹配数据记录

zhaoxian 4 anni fa
parent
commit
1ea30630b5

+ 253 - 0
module-alarm/src/main/java/cn/com/ctop/alarm/modules/controller/AlarmRuleRecordController.java

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

+ 119 - 0
module-alarm/src/main/java/cn/com/ctop/alarm/modules/entity/AlarmRuleRecord.java

@@ -0,0 +1,119 @@
+package cn.com.ctop.alarm.modules.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;
+
+/**
+ * 预警规则记录表
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2021-01-18
+ */
+@Data
+@TableName("ctop_alarm_rule_record")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_alarm_rule_record对象", description = "预警规则记录表")
+public class AlarmRuleRecord {
+
+    /**
+     * 主键id
+     */
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "主键id")
+    private java.lang.Long id;
+
+    private java.lang.Long accountId;
+
+    private java.lang.Long planId;
+
+    private java.lang.Long unitId;
+
+    private java.lang.Long creativeId;
+    /**
+     * 规则id
+     */
+    @Excel(name = "规则id", width = 15)
+    @ApiModelProperty(value = "规则id")
+    private java.lang.Long baseId;
+    /**
+     * 规则组id
+     */
+    @Excel(name = "规则组id", width = 15)
+    @ApiModelProperty(value = "规则组id")
+    private java.lang.Long groupId;
+
+    private java.lang.String groupName;
+    /**
+     * 指标code
+     */
+    @Excel(name = "指标code", width = 15)
+    @ApiModelProperty(value = "指标code")
+    private java.lang.String indicatorCode;
+    /**
+     * 指标名称
+     */
+    @Excel(name = "指标名称", width = 15)
+    @ApiModelProperty(value = "指标名称")
+    private java.lang.String indicatorName;
+    /**
+     * 阈值
+     */
+    @Excel(name = "阈值", width = 15)
+    @ApiModelProperty(value = "阈值")
+    private java.lang.String threshold;
+    //判断条件 大于 等于 小于等
+    private java.lang.String ruleCondition;
+    /**
+     * 实际值
+     */
+    @Excel(name = "实际值", width = 15)
+    @ApiModelProperty(value = "实际值")
+    private java.lang.String dataValue;
+    /**
+     * 获取值时间
+     */
+    @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 java.util.Date valueTime;
+    /**
+     * 操作内容:SEND发送,PAUSE关停并发送
+     */
+    @Excel(name = "操作内容:SEND发送,PAUSE关停并发送", width = 15)
+    @ApiModelProperty(value = "操作内容:SEND发送,PAUSE关停并发送")
+    private java.lang.String operate;
+    /**
+     * 媒体类型
+     */
+    @Excel(name = "媒体类型", width = 15)
+    @ApiModelProperty(value = "媒体类型")
+    private java.lang.String mediaType;
+    /**
+     * createTime
+     */
+    @Excel(name = "createTime", 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 = "createTime")
+    private java.util.Date createTime;
+    /**
+     * updateTime
+     */
+    @Excel(name = "updateTime", 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 = "updateTime")
+    private java.util.Date updateTime;
+}

+ 45 - 0
module-alarm/src/main/java/cn/com/ctop/alarm/modules/enums/ConditEnum.java

@@ -0,0 +1,45 @@
+package cn.com.ctop.alarm.modules.enums;
+
+/**
+ * 条件枚举
+ *
+ * @param
+ * @author ZHAOXA
+ * @return
+ * @throws
+ */
+public enum ConditEnum {
+    EQUAL("equal", "等于"),
+    NOT_EQUAL("not_equal", "不等于"),
+    GREATER("greater", "大于"),
+    LESS("less", "小于"),
+    GREATER_EQUAL("greater_equal", "大于等于"),
+    LESS_EQUAL("less_equal", "小于等于"),
+    NO_CONTAIN("no_contain", "不包含"),
+    CONTAIN("contain", "包含");
+
+    private String name;
+    private String code;
+
+    private ConditEnum(String code, String name) {
+        this.name = name;
+        this.code = code;
+    }
+
+    public static ConditEnum getEnumByCode(String code) {
+        for (ConditEnum em : ConditEnum.values()) {
+            if (em.code.equals(code)) {
+                return em;
+            }
+        }
+        return null;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+}

+ 15 - 0
module-alarm/src/main/java/cn/com/ctop/alarm/modules/mapper/AlarmRuleRecordMapper.java

@@ -0,0 +1,15 @@
+package cn.com.ctop.alarm.modules.mapper;
+
+import cn.com.ctop.alarm.modules.entity.AlarmRuleRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 预警规则记录表
+ *
+ * @author: jeecg-boot
+ * @date: 2021-01-18
+ * @cersion: V1.0
+ */
+public interface AlarmRuleRecordMapper extends BaseMapper<AlarmRuleRecord> {
+
+}

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

+ 19 - 0
module-alarm/src/main/java/cn/com/ctop/alarm/modules/mapper/xml/AlarmRuleRecordServiceImpl.java

@@ -0,0 +1,19 @@
+package cn.com.ctop.alarm.modules.mapper.xml;
+
+import cn.com.ctop.alarm.modules.entity.AlarmRuleRecord;
+import cn.com.ctop.alarm.modules.mapper.AlarmRuleRecordMapper;
+import cn.com.ctop.alarm.modules.service.IAlarmRuleRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 预警规则记录表
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2021-01-18
+ */
+@Service
+public class AlarmRuleRecordServiceImpl extends ServiceImpl<AlarmRuleRecordMapper, AlarmRuleRecord> implements IAlarmRuleRecordService {
+
+}

+ 14 - 0
module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/IAlarmRuleRecordService.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.alarm.modules.service;
+
+import cn.com.ctop.alarm.modules.entity.AlarmRuleRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 预警规则记录表
+ * @Author: jeecg-boot
+ * @Date: 2021-01-18
+ * @Version: V1.0
+ */
+public interface IAlarmRuleRecordService extends IService<AlarmRuleRecord> {
+
+}

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

@@ -2,12 +2,14 @@ package cn.com.ctop.alarm.modules.service.impl;
 
 import cn.com.ctop.alarm.modules.constant.MatchLogic;
 import cn.com.ctop.alarm.modules.entity.AlarmEventSend;
+import cn.com.ctop.alarm.modules.entity.AlarmRuleRecord;
 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.enums.ConditEnum;
 import cn.com.ctop.alarm.modules.mapper.AlarmEventSendMapper;
 import cn.com.ctop.alarm.modules.mapper.RuleAccountTemplateMapper;
 import cn.com.ctop.alarm.modules.mapper.RuleAccountThresholdMapper;
@@ -15,6 +17,7 @@ import cn.com.ctop.alarm.modules.mapper.RuleBaseMapper;
 import cn.com.ctop.alarm.modules.mapper.RuleGroupMapper;
 import cn.com.ctop.alarm.modules.mapper.RuleIndicatorMapper;
 import cn.com.ctop.alarm.modules.mapper.RuleTemplateMapper;
+import cn.com.ctop.alarm.modules.service.IAlarmRuleRecordService;
 import cn.com.ctop.alarm.modules.service.IRuleAccountTemplateService;
 import cn.com.ctop.alarm.modules.service.IRuleGroupService;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
@@ -95,6 +98,8 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
     @Autowired
     private IByteDanceCreativeService byteDanceCreativeService;
     @Autowired
+    private IAlarmRuleRecordService alarmRuleRecordService;
+    @Autowired
     private ICtopOauthTokenService tokenService;
 
     private JSONObject userObj = null;
@@ -221,14 +226,14 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                 for (Map.Entry<String, Object> entry : batchNo.entrySet()) {
                     JSONObject thresholdJn = (JSONObject) entry.getValue();
                     if (!Check.isNull(thresholdJn)) {
-                        CombinationRule(ruleBaseList, thresholdJn, indicators, matchData, complianceList, type);
+                        CombinationRule(ruleGroup, thresholdJn, indicators, matchData, complianceList, type);
                     }
                 }
             } else {
                 boolean isGroup = "group".equals(ruleGroup.getRuleType());
                 //匹配组合规则
                 if (isGroup) {
-                    CombinationRule(ruleBaseList, thresholdObj, indicators, matchData, complianceList, type);
+                    CombinationRule(ruleGroup, thresholdObj, indicators, matchData, complianceList, type);
                     //匹配单规则
                 } else {
                     RuleBase ruleBase = ruleBaseList.get(0);
@@ -250,6 +255,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                             JSONObject obj = dimensionData.getJSONObject(i);
                             String value = obj.getString(ruleBase.getIndicatorCode());
                             if (MatchLogic.matchCondition(indicator, ruleBase.getRuleCondition(), threshold, value, obj, ruleBase.getIndicatorCode())) {
+                                alarmRuleRecord(obj, ruleGroup, ruleBase, indicator, type, threshold);
                                 complianceList.add(obj);
                             }
                         }
@@ -263,6 +269,48 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
     }
 
     /**
+     * 添加预警规则记录
+     *
+     * @param
+     * @return void
+     * @throws
+     * @author ZHAOXA
+     */
+    private void alarmRuleRecord(JSONObject obj, RuleGroup ruleGroup, RuleBase ruleBase, JSONObject indicator, Integer mediaType, String threshold) {
+        try {
+            Long planId = obj.getLong("planId");
+            Long unidId = null;
+            Long creativeId = null;
+            String mediaTypeName = "快手";
+            if ((NoEn.NO1.valueInt() == mediaType || NoEn.NO3.valueInt() == mediaType)) {
+                mediaTypeName = "头条";
+                creativeId = obj.getLong("creativeId");
+            } else {
+                unidId = obj.getLong("unitId");
+            }
+            AlarmRuleRecord alarmRuleRecord = new AlarmRuleRecord();
+            alarmRuleRecord.setBaseId(ruleBase.getId());
+            alarmRuleRecord.setAccountId(obj.getLong("accountId"));
+            alarmRuleRecord.setPlanId(planId);
+            alarmRuleRecord.setUnitId(unidId);
+            alarmRuleRecord.setCreativeId(creativeId);
+            alarmRuleRecord.setGroupId(ruleGroup.getId());
+            alarmRuleRecord.setIndicatorCode(indicator.getString("code"));
+            alarmRuleRecord.setIndicatorName(indicator.getString("name"));
+            alarmRuleRecord.setGroupName(ruleGroup.getGroupName());
+            alarmRuleRecord.setThreshold(threshold);
+            alarmRuleRecord.setRuleCondition(ConditEnum.getEnumByCode(ruleBase.getRuleCondition()).getName());
+            alarmRuleRecord.setDataValue(obj.getString(ruleBase.getIndicatorCode()));
+            alarmRuleRecord.setValueTime(obj.getDate("createTime"));
+            alarmRuleRecord.setOperate("PAUSE".equals(ruleGroup.getOperate()) ? "关停" : "仅发送");
+            alarmRuleRecord.setMediaType(mediaTypeName);
+            alarmRuleRecordService.save(alarmRuleRecord);
+        } catch (Exception e) {
+            log.error("insert ctop_alarm_rule_record error ", e);
+        }
+    }
+
+    /**
      * 组合规则匹配逻辑
      *
      * @param ruleGroup    规则组对象
@@ -276,7 +324,8 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
      * @throws
      * @author ZHAOXA
      */
-    private void CombinationRule(List<RuleBase> ruleBaseList, JSONObject thresholdObj, JSONObject indicators, JSONObject matchData, JSONArray complianceList, Integer type) {
+    private void CombinationRule(RuleGroup ruleGroup, JSONObject thresholdObj, JSONObject indicators, JSONObject matchData, JSONArray complianceList, Integer type) {
+        List<RuleBase> ruleBaseList = ruleGroup.getRuleBaseList();
         //符合规则的数据集
         JSONArray groupDatas = new JSONArray();
         JSONArray targetDatas = new JSONArray();
@@ -331,6 +380,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                 JSONObject accountEntity = dimensionData.getJSONObject(0);
                 if (MatchLogic.matchCondition(indicator, ruleBase.getRuleCondition(), threshold, accountEntity.getString(ruleBase.getIndicatorCode()), accountEntity, ruleBase.getIndicatorCode())) {
                     if (Check.isNull(accountDatas)) {
+                        alarmRuleRecord(accountEntity, ruleGroup, ruleBase, indicator, type, threshold);
                         accountDatas.add(accountEntity);
                     }
                 } else {
@@ -352,7 +402,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                     break;
                 }
             } else if (PLAN.equals(ruleBase.getRuleDimension())) {
-                planDatas = getOKData(planDatas, dimensionData, ruleBase, indicator, threshold);
+                planDatas = getOKData(planDatas, dimensionData, ruleBase, indicator, threshold, ruleGroup, type);
                 if (Check.isNull(planDatas)) {
                     if (!Check.isNull(accountDatas)) {
                         accountDatas = null;
@@ -372,7 +422,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                     break;
                 }
             } else if (CREATIVE.equals(ruleBase.getRuleDimension())) {
-                creativeDatas = getOKData(creativeDatas, dimensionData, ruleBase, indicator, threshold);
+                creativeDatas = getOKData(creativeDatas, dimensionData, ruleBase, indicator, threshold, ruleGroup, type);
                 if (Check.isNull(creativeDatas)) {
                     if (!Check.isNull(accountDatas)) {
                         accountDatas = null;
@@ -392,7 +442,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                     break;
                 }
             } else if ("target".equals(ruleBase.getRuleDimension())) {
-                targetDatas = getOKData(targetDatas, dimensionData, ruleBase, indicator, threshold);
+                targetDatas = getOKData(targetDatas, dimensionData, ruleBase, indicator, threshold, ruleGroup, type);
                 if (Check.isNull(targetDatas)) {
                     if (!Check.isNull(accountDatas)) {
                         accountDatas = null;
@@ -412,7 +462,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                     break;
                 }
             } else if (UNIT.equals(ruleBase.getRuleDimension())) {
-                groupDatas = getOKData(groupDatas, dimensionData, ruleBase, indicator, threshold);
+                groupDatas = getOKData(groupDatas, dimensionData, ruleBase, indicator, threshold, ruleGroup, type);
                 if (Check.isNull(groupDatas)) {
                     if (!Check.isNull(accountDatas)) {
                         accountDatas = null;
@@ -455,23 +505,25 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
      * @throws
      * @author ZHAOXA
      */
-    private JSONArray getOKData(JSONArray ruleDatas, JSONArray dimensionData, RuleBase ruleBase, JSONObject indicator, String threshold) {
+    private JSONArray getOKData(JSONArray ruleDatas, JSONArray dimensionData, RuleBase ruleBase, JSONObject indicator, String threshold, RuleGroup ruleGroup, Integer type) {
         if (!Check.isNull(ruleDatas)) {
             JSONArray okData = new JSONArray();
             for (int i = 0; i < ruleDatas.size(); i++) {
-                JSONObject targetEntity = ruleDatas.getJSONObject(i);
-                String value = targetEntity.getString(ruleBase.getIndicatorCode());
-                if (MatchLogic.matchCondition(indicator, ruleBase.getRuleCondition(), threshold, value, targetEntity, ruleBase.getIndicatorCode())) {
-                    okData.add(targetEntity);
+                JSONObject obj = ruleDatas.getJSONObject(i);
+                String value = obj.getString(ruleBase.getIndicatorCode());
+                if (MatchLogic.matchCondition(indicator, ruleBase.getRuleCondition(), threshold, value, obj, ruleBase.getIndicatorCode())) {
+                    alarmRuleRecord(obj, ruleGroup, ruleBase, indicator, type, threshold);
+                    okData.add(obj);
                 }
             }
             return okData;
         }
         for (int i = 0; i < dimensionData.size(); i++) {
-            JSONObject targetEntity = dimensionData.getJSONObject(i);
-            String value = targetEntity.getString(ruleBase.getIndicatorCode());
-            if (MatchLogic.matchCondition(indicator, ruleBase.getRuleCondition(), threshold, value, targetEntity, ruleBase.getIndicatorCode())) {
-                ruleDatas.add(targetEntity);
+            JSONObject obj = dimensionData.getJSONObject(i);
+            String value = obj.getString(ruleBase.getIndicatorCode());
+            if (MatchLogic.matchCondition(indicator, ruleBase.getRuleCondition(), threshold, value, obj, ruleBase.getIndicatorCode())) {
+                alarmRuleRecord(obj, ruleGroup, ruleBase, indicator, type, threshold);
+                ruleDatas.add(obj);
             }
         }
         return ruleDatas;

+ 2 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/RuleDataTargetKuaishou.java

@@ -58,4 +58,6 @@ public class RuleDataTargetKuaishou {
 	/**网络环境*/
 	private Integer network;
 
+	private java.util.Date createTime;
+
 }

+ 2 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/RuleDatePlanKuaishou.java

@@ -24,4 +24,6 @@ public class RuleDatePlanKuaishou {
 
 	private Integer status;
 
+	private java.util.Date createTime;
+
 }

+ 1 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/RuleDateUnitKuaishou.java

@@ -47,4 +47,5 @@ public class RuleDateUnitKuaishou {
 
     private Integer status;
 
+	private java.util.Date createTime;
 }