فهرست منبع

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

jiequan.bi 4 سال پیش
والد
کامیت
944e9d0ff1
57فایلهای تغییر یافته به همراه672 افزوده شده و 2517 حذف شده
  1. 9 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialAscriptionController.java
  2. 42 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestController.java
  3. 4 0
      jeecg-boot-module-system/src/main/resources/application-dev.yml
  4. 4 0
      jeecg-boot-module-system/src/main/resources/application-jiaoyang.yml
  5. 4 0
      jeecg-boot-module-system/src/main/resources/application-prod.yml
  6. 4 0
      jeecg-boot-module-system/src/main/resources/application-prod2.yml
  7. 4 0
      jeecg-boot-module-system/src/main/resources/application-test.yml
  8. 5 1
      jeecg-boot-module-system/src/main/resources/application-wps.yml
  9. 61 22
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/constant/MatchLogic.java
  10. 0 274
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/controller/AlarmEventRuleController.java
  11. 0 26
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/controller/AlarmEventSendController.java
  12. 0 269
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/controller/AlarmMetricValueController.java
  13. 0 231
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/controller/AlarmRuleCampaignRelController.java
  14. 79 82
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/controller/AlarmEventMetricController.java
  15. 0 91
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/entity/AlarmEventMetric.java
  16. 0 135
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/entity/AlarmEventRule.java
  17. 0 85
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/entity/AlarmMetricValue.java
  18. 0 80
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/entity/AlarmRuleCampaignRel.java
  19. 119 0
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/entity/AlarmRuleRecord.java
  20. 45 0
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/enums/ConditEnum.java
  21. 0 20
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/mapper/AlarmEventMetricMapper.java
  22. 0 22
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/mapper/AlarmEventRuleMapper.java
  23. 0 18
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/mapper/AlarmMetricValueMapper.java
  24. 0 20
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/mapper/AlarmRuleCampaignRelMapper.java
  25. 15 0
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/mapper/AlarmRuleRecordMapper.java
  26. 0 15
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/mapper/xml/AlarmEventMetricMapper.xml
  27. 0 60
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/mapper/xml/AlarmEventRuleMapper.xml
  28. 0 12
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/mapper/xml/AlarmMetricValueMapper.xml
  29. 0 18
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/mapper/xml/AlarmRuleCampaignRelMapper.xml
  30. 5 0
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/mapper/xml/AlarmRuleRecordMapper.xml
  31. 19 0
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/mapper/xml/AlarmRuleRecordServiceImpl.java
  32. 0 14
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/IAlarmEventMetricService.java
  33. 0 28
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/IAlarmEventRuleService.java
  34. 0 3
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/IAlarmEventSendService.java
  35. 0 16
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/IAlarmMetricValueService.java
  36. 0 14
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/IAlarmRuleCampaignRelService.java
  37. 14 0
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/IAlarmRuleRecordService.java
  38. 0 19
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/impl/AlarmEventMetricServiceImpl.java
  39. 0 314
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/impl/AlarmEventRuleServiceImpl.java
  40. 0 449
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/impl/AlarmEventSendServiceImpl.java
  41. 0 62
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/impl/AlarmMetricValueServiceImpl.java
  42. 0 19
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/impl/AlarmRuleCampaignRelServiceImpl.java
  43. 79 21
      module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/impl/RuleGroupServiceImpl.java
  44. 2 0
      module-common/src/main/java/cn/com/ctop/common/module/entity/RuleDataTargetKuaishou.java
  45. 2 0
      module-common/src/main/java/cn/com/ctop/common/module/entity/RuleDatePlanKuaishou.java
  46. 1 0
      module-common/src/main/java/cn/com/ctop/common/module/entity/RuleDateUnitKuaishou.java
  47. 1 2
      module-common/src/main/java/cn/com/ctop/common/module/utils/CorpWexinUtils.java
  48. 1 0
      module-common/src/main/java/cn/com/ctop/common/module/utils/KuaishouInterfaceConstant.java
  49. 26 0
      module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaiShouAlarmRuleJob.java
  50. 43 0
      module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouAiSuzaoVideoJob.java
  51. 0 5
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/controller/KuaiShouCreateController.java
  52. 1 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/controller/KuaiShouMaterialControer.java
  53. 2 5
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/AiKuaishouNewCreateCampaignServiceImpl.java
  54. 45 35
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/KuaiShouCreateServiceImpl.java
  55. 8 5
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java
  56. 28 21
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouTemplateServiceImpl.java
  57. 0 3
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaiShouGetAccountFundServiceImpl.java

+ 9 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialAscriptionController.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.ctop.controller;
 import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.MaterialAscription;
 import cn.com.ctop.common.module.service.IMaterialAscriptionService;
+import cn.com.ctop.common.module.utils.Check;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -118,7 +119,14 @@ public class MaterialAscriptionController {
         Result<MaterialAscription> result = new Result<>();
         QueryWrapper<MaterialAscription> ascriptionQueryWrapper = new QueryWrapper<>();
         ascriptionQueryWrapper.eq("material_id", materialAscription.getMaterialId());
-        boolean ok = materialAscriptionService.update(materialAscription, ascriptionQueryWrapper);
+        ascriptionQueryWrapper.last("limit 1");
+        MaterialAscription one = materialAscriptionService.getOne(ascriptionQueryWrapper);
+        boolean ok;
+        if (Check.isNull(one)) {
+            ok = materialAscriptionService.save(materialAscription);
+        } else {
+            ok = materialAscriptionService.update(materialAscription, ascriptionQueryWrapper);
+        }
         if (ok) {
             result.success("修改成功!");
         }

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

@@ -8,6 +8,7 @@ import cn.com.ctop.common.module.vo.ResFileDTO;
 import cn.com.ctop.crawler.modules.core.entity.CrawlerDouyinMusicTask;
 import cn.com.ctop.crawler.modules.core.service.CrawlerDouyinMusicTaskService;
 import cn.com.ctop.crawler.modules.douyin.service.DouyinMusicService;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaishouTemplate;
 import cn.com.ctop.kuaishou.modules.batch.service.*;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaiShouDailyAgentService;
@@ -15,6 +16,7 @@ import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataServ
 import cn.com.ctop.toutiao.modules.material.service.IBytedanceEffectVideoInfoService;
 import cn.com.ctop.toutiao.modules.report.service.*;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -90,6 +92,46 @@ public class TestController {
     static ExecutorService suzhaoService = Executors.newFixedThreadPool(5);
     @Autowired
     private IKuaiShouDailyAgentService dailyAgentService;
+    @Autowired
+    private IKuaishouTemplateService templateService;
+
+
+    @GetMapping(value = "/updateTemplate")
+    public void updateTemplate(Long projectId, String startDate, String endDate) {
+
+        List<Long> list = new ArrayList();
+        list.add(7022550L);
+        list.add(7409586L);
+        list.add(5473041L);
+        list.add(5852766L);
+        list.add(6962896L);
+        list.add(7409919L);
+        for (int i = 0; i < list.size(); i++) {
+            Long accountId = list.get(i);
+            CtopOauthToken oauthToken = oauthTokenService.getTokenByAccountId(accountId);
+            templateService.getTemplateByAccountId(oauthToken.getAccountId(), oauthToken.getAccessToken(), 1);
+
+            QueryWrapper<KuaishouTemplate> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("account_id", accountId);
+            List<KuaishouTemplate> list1 = templateService.list(queryWrapper);
+            if (!Check.isNull(list1)) {
+                for (KuaishouTemplate template : list1) {
+                    JSONObject param = new JSONObject();
+                    param.put("templateId", template.getTemplateId());
+                    param.put("accountId", template.getAccountId());
+                    param.put("templateName", template.getTemplateName());
+                    param.put("filterConvertedLevel", 5);
+                    templateService.updateTemplate(oauthToken.getAccountId(), oauthToken.getAccessToken(), param);
+
+                }
+
+            }
+
+
+        }
+
+
+    }
 
 
     @GetMapping(value = "/getCreativeByProjectId")

+ 4 - 0
jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -286,3 +286,7 @@ bytedance:
     ad-report-get: /2/report/ad/get/
     ad-creative-get: /2/report/creative/get/
     advertiser-fund-daily-stat: /2/advertiser/fund/daily_stat/
+ai:
+  callback:
+    callback-unit-url: http://192.168.1.193:31012/ai_callback_add_group
+    callback-creative-url: http://192.168.1.193:31012/ai_callback_add_creative

+ 4 - 0
jeecg-boot-module-system/src/main/resources/application-jiaoyang.yml

@@ -244,3 +244,7 @@ bytedance:
     ad-report-get: /2/report/ad/get/
     ad-creative-get: /2/report/creative/get/
     advertiser-fund-daily-stat: /2/advertiser/fund/daily_stat/
+ai:
+  callback:
+    callback-unit-url: http://192.168.1.193:31012/ai_callback_add_group
+    callback-creative-url: http://192.168.1.193:31012/ai_callback_add_creative

+ 4 - 0
jeecg-boot-module-system/src/main/resources/application-prod.yml

@@ -257,3 +257,7 @@ bytedance:
     ad-report-get: /2/report/ad/get/
     ad-creative-get: /2/report/creative/get/
     advertiser-fund-daily-stat: /2/advertiser/fund/daily_stat/
+ai:
+  callback:
+    callback-unit-url: http://192.168.1.193:31012/ai_callback_add_group
+    callback-creative-url: http://192.168.1.193:31012/ai_callback_add_creative

+ 4 - 0
jeecg-boot-module-system/src/main/resources/application-prod2.yml

@@ -249,3 +249,7 @@ bytedance:
     ad-report-get: /2/report/ad/get/
     ad-creative-get: /2/report/creative/get/
     advertiser-fund-daily-stat: /2/advertiser/fund/daily_stat/
+ai:
+  callback:
+    callback-unit-url: http://192.168.1.193:31012/ai_callback_add_group
+    callback-creative-url: http://192.168.1.193:31012/ai_callback_add_creative

+ 4 - 0
jeecg-boot-module-system/src/main/resources/application-test.yml

@@ -240,3 +240,7 @@ bytedance:
     ad-report-get: /2/report/ad/get/
     ad-creative-get: /2/report/creative/get/
     advertiser-fund-daily-stat: /2/advertiser/fund/daily_stat/
+ai:
+  callback:
+    callback-unit-url: http://192.168.1.193:31012/ai_callback_add_group
+    callback-creative-url: http://192.168.1.193:31012/ai_callback_add_creative

+ 5 - 1
jeecg-boot-module-system/src/main/resources/application-wps.yml

@@ -103,7 +103,7 @@ spring:
   #redis 配置
   redis:
     database: 0
-#    host: 172.30.0.17
+    #    host: 172.30.0.17
     host: 127.0.0.1
     lettuce:
       pool:
@@ -234,4 +234,8 @@ bytedance:
     ad-report-get: /2/report/ad/get/
     ad-creative-get: /2/report/creative/get/
     advertiser-fund-daily-stat: /2/advertiser/fund/daily_stat/
+ai:
+  callback:
+    callback-unit-url: http://192.168.1.193:31012/ai_callback_add_group
+    callback-creative-url: http://192.168.1.193:31012/ai_callback_add_creative
 

+ 61 - 22
module-alarm/src/main/java/cn/com/ctop/alarm/modules/constant/MatchLogic.java

@@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 
 /**
@@ -18,7 +19,6 @@ import java.util.List;
  */
 @Slf4j
 public class MatchLogic {
-
     /**
      * @param type      数据类型
      * @param condition 条件
@@ -28,7 +28,7 @@ public class MatchLogic {
      * @throws
      * @author ZHAOXA
      */
-    public static boolean matchCondition(JSONObject indicator, String condition, String threshold, String value, JSONObject obj) {
+    public static boolean matchCondition(JSONObject indicator, String condition, String threshold, String value, JSONObject obj, String indicatorCode) {
         //阈值数据类型类型
         String type = indicator.getString("dataType");
         try {
@@ -104,50 +104,89 @@ public class MatchLogic {
                  包含逻辑通用: 任一存在则报警
                  */
                 if (value.contains("[") && threshold.contains("[")) {
+                    String logicalType = indicator.getString("logicalType");
                     List<String> values = strToList(value);
                     List<String> thresholds = strToList(threshold);
                     //包含 任一存在则报警
                     if ("contain".equals(condition)) {
-                        for (String v : values) {
-                            if (threshold.contains(v)) {
-                                return true;
+                        //人群包、流量包判断的是对象
+                        if (NoEn.NO1.valueStr().equals(logicalType) || "retargetingTagsInclude".equals(indicatorCode) || "population".equals(indicatorCode) || "district".equals(indicatorCode) || "region".equals(indicatorCode)) {
+                            for (String thr : thresholds) {
+                                if (values.contains(thr)) {
+                                    return true;
+                                }
+                            }
+                        } else {
+                            for (String thr : thresholds) {
+                                if (values.toString().contains(thr)) {
+                                    return true;
+                                }
                             }
                         }
                     } else {
-                        String logicalType = indicator.getString("logicalType");
-                        //排除人群包、流量排除包逻辑
+                        //排除人群包、流量排除包逻辑,不包含,所选必须都存在,否则报警
                         if (NoEn.NO1.valueStr().equals(logicalType)) {
-                            //不包含,所选必须都存在,否则报警
                             if (values.size() != thresholds.size()) {
                                 return true;
                             }
-                            for (String v : values) {
-                                if (!threshold.contains(v)) {
-                                    return true;
-                                }
-                            }
+                            values.sort(Comparator.comparing(String::hashCode));
+                            thresholds.sort(Comparator.comparing(String::hashCode));
+                            return !values.toString().equals(thresholds.toString());
+
                         } else {
-                            boolean flag = true;
                             //不包含,阈值中,存在任一目标则不报警,都不存在时则报警,出现阈值之外的亦报警
-                            for (String v : values) {
-                                if (threshold.contains(v)) {
-                                    flag = false;
-                                } else {
-                                    return true;
+                            boolean flag = true;
+                            if ("retargetingTagsInclude".equals(indicatorCode) || "population".equals(indicatorCode) || "region".equals(indicatorCode) || "district".equals(indicatorCode)) {
+                                //人群包判断是否存在该对象
+                                for (String thr : thresholds) {
+                                    if (values.contains(thr)) {
+                                        flag = false;
+                                    } else {
+                                        return true;
+                                    }
+                                }
+                            } else {
+                                //判断是否存在关键字。
+                                for (String thr : thresholds) {
+                                    if (values.toString().contains(thr)) {
+                                        flag = false;
+                                    } else {
+                                        return true;
+                                    }
                                 }
                             }
                             return flag;
                         }
                     }
+                } else if (threshold.contains("[")) {
+                    List<String> thresholds = strToList(threshold);
+                    if ("contain".equals(condition)) {
+                        for (String thr : thresholds) {
+                            if (value.toString().contains(thr)) {
+                                return true;
+                            }
+                        }
+                    } else {
+                        boolean flag = true;
+                        for (String thr : thresholds) {
+                            if (value.toString().contains(thr)) {
+                                flag = false;
+                            } else {
+                                return true;
+                            }
+                        }
+                        return flag;
+                    }
                 } else {
                     if ("contain".equals(condition)) {
-                        return threshold.contains(value);
+                        return value.toString().contains(threshold);
                     } else {
-                        return !threshold.contains(value);
+                        return !value.toString().contains(threshold);
                     }
                 }
             }
-        } catch (Exception e) {
+        } catch (
+                Exception e) {
             log.error("条件匹配异常,入参为:type={},condition={},threshold={},value={},", type, condition, threshold, value, e);
         }
         return false;

+ 0 - 274
module-alarm/src/main/java/cn/com/ctop/alarm/modules/controller/AlarmEventRuleController.java

@@ -1,274 +0,0 @@
-package cn.com.ctop.alarm.modules.controller;
-
-import cn.com.ctop.alarm.modules.entity.AlarmEventRule;
-import cn.com.ctop.alarm.modules.service.IAlarmEventRuleService;
-import cn.com.ctop.common.module.annotation.AutoLog;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-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.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 预警事件规则表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-10-29
- */
-@Slf4j
-@Api(tags = "预警事件规则表")
-@RestController
-@RequestMapping("/alarm/alarmEventRule")
-public class AlarmEventRuleController {
-    @Autowired
-    private IAlarmEventRuleService alarmEventRuleService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param alarmEventRule
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "预警事件规则表-分页列表查询")
-    @ApiOperation(value = "预警事件规则表-分页列表查询", notes = "预警事件规则表-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<PageInfo<AlarmEventRule>> queryPageList(AlarmEventRule alarmEventRule,
-                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                          HttpServletRequest req) {
-        Result<PageInfo<AlarmEventRule>> result = new Result<>();
-        PageHelper.startPage(pageNo, pageSize);
-        PageInfo<AlarmEventRule> pageList = alarmEventRuleService.selectListPage(alarmEventRule);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 分页列表查询
-     *
-     * @param alarmEventRule
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "获取规则运行记录数据-分页列表查询")
-    @ApiOperation(value = "获取规则运行记录数据-分页列表查询", notes = "获取规则运行记录数据-分页列表查询")
-    @GetMapping(value = "/getRunningRecords")
-    public Result<PageInfo<AlarmEventRule>> getRunningRecord(AlarmEventRule alarmEventRule,
-                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                             HttpServletRequest req) {
-        Result<PageInfo<AlarmEventRule>> result = new Result<>();
-        PageHelper.startPage(pageNo, pageSize);
-        PageInfo<AlarmEventRule> pageList = alarmEventRuleService.queryRunningRecordPage(alarmEventRule);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param alarmEventRule
-     * @return
-     */
-    @AutoLog(value = "预警事件规则表-添加")
-    @ApiOperation(value = "预警事件规则表-添加", notes = "预警事件规则表-添加")
-    @PostMapping(value = "/add")
-    public Result<Object> addAlarmEventRule(@RequestBody JSONObject obj) {
-        Result<Object> result = new Result<>();
-        try {
-            result = alarmEventRuleService.addAlarmEventRule(obj);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param alarmEventRule
-     * @return
-     */
-    @AutoLog(value = "预警事件规则表-编辑")
-    @ApiOperation(value = "预警事件规则表-编辑", notes = "预警事件规则表-编辑")
-    @PostMapping(value = "/edit")
-    public Result<Object> editAlarmEventRule(@RequestBody JSONObject obj) {
-        Result<Object> result = new Result<>();
-        try {
-            result = alarmEventRuleService.editAlarmEventRule(obj);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "预警事件规则表-通过id删除")
-    @ApiOperation(value = "预警事件规则表-通过id删除", notes = "预警事件规则表-通过id删除")
-    @GetMapping(value = "/delete")
-    public Result<?> delete(Long id) {
-        try {
-            alarmEventRuleService.deleteById(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<AlarmEventRule> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<AlarmEventRule> result = new Result<>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.alarmEventRuleService.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<AlarmEventRule> queryById(@RequestParam(name = "id", required = true) Long id) {
-        Result<AlarmEventRule> result = new Result<>();
-        AlarmEventRule alarmEventRule = alarmEventRuleService.selectById(id);
-        if (alarmEventRule == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(alarmEventRule);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<AlarmEventRule> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                AlarmEventRule alarmEventRule = JSON.parseObject(deString, AlarmEventRule.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(alarmEventRule, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<AlarmEventRule> pageList = alarmEventRuleService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "预警事件规则表列表");
-        mv.addObject(NormalExcelConstants.CLASS, AlarmEventRule.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<AlarmEventRule> listAlarmEventRules = ExcelImportUtil.importExcel(file.getInputStream(), AlarmEventRule.class, params);
-                alarmEventRuleService.saveBatch(listAlarmEventRules);
-                return Result.ok("文件导入成功!数据行数:" + listAlarmEventRules.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("文件导入失败!");
-    }
-
-}

+ 0 - 26
module-alarm/src/main/java/cn/com/ctop/alarm/modules/controller/AlarmEventSendController.java

@@ -143,32 +143,6 @@ public class AlarmEventSendController {
         return result;
     }
 
-    @GetMapping(value = "/matchAlarmRules")
-    public Result<?> matchAlarmRules(String type) {
-        Result<AlarmEventSend> result = new Result<>();
-        try {
-            alarmEventSendService.matchAlarmRules(type);
-            result.success("操作成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    @GetMapping(value = "/rechangeValue")
-    public Result<?> rechangeValue(String type) {
-        Result<AlarmEventSend> result = new Result<>();
-        try {
-            alarmEventSendService.getAlarmValue(type);
-            result.success("操作成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
     /**
      * 编辑
      *

+ 0 - 269
module-alarm/src/main/java/cn/com/ctop/alarm/modules/controller/AlarmMetricValueController.java

@@ -1,269 +0,0 @@
-package cn.com.ctop.alarm.modules.controller;
-
-import cn.com.ctop.alarm.modules.entity.AlarmMetricValue;
-import cn.com.ctop.alarm.modules.service.IAlarmMetricValueService;
-import cn.com.ctop.common.module.annotation.AutoLog;
-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.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 指标字段记录表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-10-29
- */
-@Slf4j
-@Api(tags = "指标字段记录表")
-@RestController
-@RequestMapping("/alarm/alarmMetricValue")
-public class AlarmMetricValueController {
-    @Autowired
-    private IAlarmMetricValueService alarmMetricValueService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param alarmMetricValue
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "指标字段记录表-分页列表查询")
-    @ApiOperation(value = "指标字段记录表-分页列表查询", notes = "指标字段记录表-分页列表查询")
-    @GetMapping(value = "/queryPageList")
-    public Result<IPage<AlarmMetricValue>> queryPageList(AlarmMetricValue alarmMetricValue,
-                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                         HttpServletRequest req) {
-        Result<IPage<AlarmMetricValue>> result = new Result<>();
-        QueryWrapper<AlarmMetricValue> queryWrapper = QueryGenerator.initQueryWrapper(alarmMetricValue, req.getParameterMap());
-        Page<AlarmMetricValue> page = new Page<AlarmMetricValue>(pageNo, pageSize);
-        IPage<AlarmMetricValue> pageList = alarmMetricValueService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    @AutoLog(value = "指标字段记录表")
-    @ApiOperation(value = "指标字段记录表-分页列表查询", notes = "指标字段记录表")
-    @GetMapping(value = "/queryParentChildList")
-    public Result<Object> queryParentChildList(AlarmMetricValue alarmMetricValue, HttpServletRequest req) {
-        Result<Object> result = null;
-        try {
-            result = alarmMetricValueService.queryParentChildList(alarmMetricValue);
-        } catch (Exception e) {
-            log.error("查询指标数据异常:", e);
-            result = Result.error("查询失败");
-        }
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param alarmMetricValue
-     * @return
-     */
-    @AutoLog(value = "指标字段记录表-添加")
-    @ApiOperation(value = "指标字段记录表-添加", notes = "指标字段记录表-添加")
-    @PostMapping(value = "/add")
-    public Result<AlarmMetricValue> add(@RequestBody AlarmMetricValue alarmMetricValue) {
-        Result<AlarmMetricValue> result = new Result<>();
-        try {
-            alarmMetricValueService.save(alarmMetricValue);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param alarmMetricValue
-     * @return
-     */
-    @AutoLog(value = "指标字段记录表-编辑")
-    @ApiOperation(value = "指标字段记录表-编辑", notes = "指标字段记录表-编辑")
-    @GetMapping(value = "/edit")
-    public Result<AlarmMetricValue> edit(@RequestBody AlarmMetricValue alarmMetricValue) {
-        Result<AlarmMetricValue> result = new Result<AlarmMetricValue>();
-        AlarmMetricValue alarmMetricValueEntity = alarmMetricValueService.getById(alarmMetricValue.getMetricValueId());
-        if (alarmMetricValueEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = alarmMetricValueService.updateById(alarmMetricValue);
-            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 {
-            alarmMetricValueService.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<AlarmMetricValue> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<AlarmMetricValue> result = new Result<>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.alarmMetricValueService.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<AlarmMetricValue> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<AlarmMetricValue> result = new Result<>();
-        AlarmMetricValue alarmMetricValue = alarmMetricValueService.getById(id);
-        if (alarmMetricValue == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(alarmMetricValue);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<AlarmMetricValue> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                AlarmMetricValue alarmMetricValue = JSON.parseObject(deString, AlarmMetricValue.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(alarmMetricValue, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<AlarmMetricValue> pageList = alarmMetricValueService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "指标字段记录表列表");
-        mv.addObject(NormalExcelConstants.CLASS, AlarmMetricValue.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<AlarmMetricValue> listAlarmMetricValues = ExcelImportUtil.importExcel(file.getInputStream(), AlarmMetricValue.class, params);
-                alarmMetricValueService.saveBatch(listAlarmMetricValues);
-                return Result.ok("文件导入成功!数据行数:" + listAlarmMetricValues.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("文件导入失败!");
-    }
-
-}

+ 0 - 231
module-alarm/src/main/java/cn/com/ctop/alarm/modules/controller/AlarmRuleCampaignRelController.java

@@ -1,231 +0,0 @@
-package cn.com.ctop.alarm.modules.controller;
-
-import cn.com.ctop.alarm.modules.entity.AlarmRuleCampaignRel;
-import cn.com.ctop.alarm.modules.service.IAlarmRuleCampaignRelService;
-import cn.com.ctop.common.module.annotation.AutoLog;
-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.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 规则和计划、组关系表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-11-09
- */
-@Slf4j
-@Api(tags = "规则和计划、组关系表")
-@RestController
-@RequestMapping("/alarm.modules/alarmRuleCampaignRel")
-public class AlarmRuleCampaignRelController {
-    @Autowired
-    private IAlarmRuleCampaignRelService alarmRuleCampaignRelService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param alarmRuleCampaignRel
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "规则和计划、组关系表-分页列表查询")
-    @ApiOperation(value = "规则和计划、组关系表-分页列表查询", notes = "规则和计划、组关系表-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<AlarmRuleCampaignRel>> queryPageList(AlarmRuleCampaignRel alarmRuleCampaignRel,
-                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                             HttpServletRequest req) {
-        Result<IPage<AlarmRuleCampaignRel>> result = new Result<>();
-        QueryWrapper<AlarmRuleCampaignRel> queryWrapper = QueryGenerator.initQueryWrapper(alarmRuleCampaignRel, req.getParameterMap());
-        Page<AlarmRuleCampaignRel> page = new Page<AlarmRuleCampaignRel>(pageNo, pageSize);
-        IPage<AlarmRuleCampaignRel> pageList = alarmRuleCampaignRelService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param alarmRuleCampaignRel
-     * @return
-     */
-    @AutoLog(value = "规则和计划、组关系表-添加")
-    @ApiOperation(value = "规则和计划、组关系表-添加", notes = "规则和计划、组关系表-添加")
-    @PostMapping(value = "/add")
-    public Result<AlarmRuleCampaignRel> add(@RequestBody AlarmRuleCampaignRel alarmRuleCampaignRel) {
-        Result<AlarmRuleCampaignRel> result = new Result<>();
-        try {
-            alarmRuleCampaignRelService.save(alarmRuleCampaignRel);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        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 {
-            alarmRuleCampaignRelService.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<AlarmRuleCampaignRel> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<AlarmRuleCampaignRel> result = new Result<>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.alarmRuleCampaignRelService.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<AlarmRuleCampaignRel> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<AlarmRuleCampaignRel> result = new Result<>();
-        AlarmRuleCampaignRel alarmRuleCampaignRel = alarmRuleCampaignRelService.getById(id);
-        if (alarmRuleCampaignRel == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(alarmRuleCampaignRel);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<AlarmRuleCampaignRel> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                AlarmRuleCampaignRel alarmRuleCampaignRel = JSON.parseObject(deString, AlarmRuleCampaignRel.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(alarmRuleCampaignRel, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<AlarmRuleCampaignRel> pageList = alarmRuleCampaignRelService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "规则和计划、组关系表列表");
-        mv.addObject(NormalExcelConstants.CLASS, AlarmRuleCampaignRel.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<AlarmRuleCampaignRel> listAlarmRuleCampaignRels = ExcelImportUtil.importExcel(file.getInputStream(), AlarmRuleCampaignRel.class, params);
-                alarmRuleCampaignRelService.saveBatch(listAlarmRuleCampaignRels);
-                return Result.ok("文件导入成功!数据行数:" + listAlarmRuleCampaignRels.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("文件导入失败!");
-    }
-
-}

+ 79 - 82
module-alarm/src/main/java/cn/com/ctop/alarm/modules/controller/AlarmEventMetricController.java

@@ -1,81 +1,78 @@
 package cn.com.ctop.alarm.modules.controller;
 
-import cn.com.ctop.alarm.modules.entity.AlarmEventMetric;
-import cn.com.ctop.alarm.modules.service.IAlarmEventMetricService;
+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 com.alibaba.fastjson.JSON;
+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 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.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+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;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 /**
- * 制定详细规则
+ * 预警规则记录表
  *
  * @author jeecg-boot
  * @version V1.0
- * @date 2020-10-29
+ * @date 2021-01-18
  */
 @Slf4j
-@Api(tags = "制定详细规则表")
+@Api(tags = "预警规则记录表")
 @RestController
-@RequestMapping("/alarm/alarmEventMetric")
-public class AlarmEventMetricController {
+@RequestMapping("/kuaishou/alarmRuleRecord")
+public class AlarmRuleRecordController {
     @Autowired
-    private IAlarmEventMetricService alarmEventMetricService;
+    private IAlarmRuleRecordService alarmRuleRecordService;
 
     /**
      * 分页列表查询
      *
-     * @param alarmEventMetric
+     * @param alarmRuleRecord
      * @param pageNo
      * @param pageSize
      * @param req
      * @return
      */
-    @AutoLog(value = "制定详细规则表-分页列表查询")
-    @ApiOperation(value = "制定详细规则表-分页列表查询", notes = "制定详细规则表-分页列表查询")
+    @AutoLog(value = "预警规则记录表-分页列表查询")
+    @ApiOperation(value = "预警规则记录表-分页列表查询", notes = "预警规则记录表-分页列表查询")
     @GetMapping(value = "/list")
-    public Result<IPage<AlarmEventMetric>> queryPageList(AlarmEventMetric alarmEventMetric,
-                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                         HttpServletRequest req) {
-        Result<IPage<AlarmEventMetric>> result = new Result<>();
-        QueryWrapper<AlarmEventMetric> queryWrapper = QueryGenerator.initQueryWrapper(alarmEventMetric, req.getParameterMap());
-        Page<AlarmEventMetric> page = new Page<AlarmEventMetric>(pageNo, pageSize);
-        IPage<AlarmEventMetric> pageList = alarmEventMetricService.page(page, queryWrapper);
+    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;
@@ -84,16 +81,16 @@ public class AlarmEventMetricController {
     /**
      * 添加
      *
-     * @param alarmEventMetric
+     * @param alarmRuleRecord
      * @return
      */
-    @AutoLog(value = "制定详细规则表-添加")
-    @ApiOperation(value = "制定详细规则表-添加", notes = "制定详细规则表-添加")
+    @AutoLog(value = "预警规则记录表-添加")
+    @ApiOperation(value = "预警规则记录表-添加", notes = "预警规则记录表-添加")
     @PostMapping(value = "/add")
-    public Result<AlarmEventMetric> add(@RequestBody AlarmEventMetric alarmEventMetric) {
-        Result<AlarmEventMetric> result = new Result<>();
+    public Result<AlarmRuleRecord> add(@RequestBody AlarmRuleRecord alarmRuleRecord) {
+        Result<AlarmRuleRecord> result = new Result<>();
         try {
-            alarmEventMetricService.save(alarmEventMetric);
+            alarmRuleRecordService.save(alarmRuleRecord);
             result.success("添加成功!");
         } catch (Exception e) {
             log.error(e.getMessage(), e);
@@ -105,19 +102,19 @@ public class AlarmEventMetricController {
     /**
      * 编辑
      *
-     * @param alarmEventMetric
+     * @param alarmRuleRecord
      * @return
      */
-    @AutoLog(value = "制定详细规则表-编辑")
-    @ApiOperation(value = "制定详细规则表-编辑", notes = "制定详细规则表-编辑")
+    @AutoLog(value = "预警规则记录表-编辑")
+    @ApiOperation(value = "预警规则记录表-编辑", notes = "预警规则记录表-编辑")
     @PutMapping(value = "/edit")
-    public Result<AlarmEventMetric> edit(@RequestBody AlarmEventMetric alarmEventMetric) {
-        Result<AlarmEventMetric> result = new Result<AlarmEventMetric>();
-        AlarmEventMetric alarmEventMetricEntity = alarmEventMetricService.getById(alarmEventMetric.getEventMetricId());
-        if (alarmEventMetricEntity == null) {
+    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 = alarmEventMetricService.updateById(alarmEventMetric);
+            boolean ok = alarmRuleRecordService.updateById(alarmRuleRecord);
             if (ok) {
                 result.success("修改成功!");
             }
@@ -132,12 +129,12 @@ public class AlarmEventMetricController {
      * @param id
      * @return
      */
-    @AutoLog(value = "制定详细规则表-通过id删除")
-    @ApiOperation(value = "制定详细规则表-通过id删除", notes = "制定详细规则表-通过id删除")
+    @AutoLog(value = "预警规则记录表-通过id删除")
+    @ApiOperation(value = "预警规则记录表-通过id删除", notes = "预警规则记录表-通过id删除")
     @DeleteMapping(value = "/delete")
     public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
         try {
-            alarmEventMetricService.removeById(id);
+            alarmRuleRecordService.removeById(id);
         } catch (Exception e) {
             log.error("删除失败", e.getMessage());
             return Result.error("删除失败!");
@@ -151,15 +148,15 @@ public class AlarmEventMetricController {
      * @param ids
      * @return
      */
-    @AutoLog(value = "制定详细规则表-批量删除")
-    @ApiOperation(value = "制定详细规则表-批量删除", notes = "制定详细规则表-批量删除")
+    @AutoLog(value = "预警规则记录表-批量删除")
+    @ApiOperation(value = "预警规则记录表-批量删除", notes = "预警规则记录表-批量删除")
     @DeleteMapping(value = "/deleteBatch")
-    public Result<AlarmEventMetric> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<AlarmEventMetric> result = new Result<>();
+    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.alarmEventMetricService.removeByIds(Arrays.asList(ids.split(",")));
+            this.alarmRuleRecordService.removeByIds(Arrays.asList(ids.split(",")));
             result.success("删除成功!");
         }
         return result;
@@ -171,16 +168,16 @@ public class AlarmEventMetricController {
      * @param id
      * @return
      */
-    @AutoLog(value = "制定详细规则表-通过id查询")
-    @ApiOperation(value = "制定详细规则表-通过id查询", notes = "制定详细规则表-通过id查询")
+    @AutoLog(value = "预警规则记录表-通过id查询")
+    @ApiOperation(value = "预警规则记录表-通过id查询", notes = "预警规则记录表-通过id查询")
     @GetMapping(value = "/queryById")
-    public Result<AlarmEventMetric> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<AlarmEventMetric> result = new Result<>();
-        AlarmEventMetric alarmEventMetric = alarmEventMetricService.getById(id);
-        if (alarmEventMetric == null) {
+    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(alarmEventMetric);
+            result.setResult(alarmRuleRecord);
             result.setSuccess(true);
         }
         return result;
@@ -195,13 +192,13 @@ public class AlarmEventMetricController {
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
         // Step.1 组装查询条件
-        QueryWrapper<AlarmEventMetric> queryWrapper = null;
+        QueryWrapper<AlarmRuleRecord> queryWrapper = null;
         try {
             String paramsStr = request.getParameter("paramsStr");
             if (oConvertUtils.isNotEmpty(paramsStr)) {
                 String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                AlarmEventMetric alarmEventMetric = JSON.parseObject(deString, AlarmEventMetric.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(alarmEventMetric, request.getParameterMap());
+                AlarmRuleRecord alarmRuleRecord = JSON.parseObject(deString, AlarmRuleRecord.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(alarmRuleRecord, request.getParameterMap());
             }
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
@@ -209,11 +206,11 @@ public class AlarmEventMetricController {
 
         //Step.2 AutoPoi 导出Excel
         ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<AlarmEventMetric> pageList = alarmEventMetricService.list(queryWrapper);
+        List<AlarmRuleRecord> pageList = alarmRuleRecordService.list(queryWrapper);
         //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "制定详细规则表列表");
-        mv.addObject(NormalExcelConstants.CLASS, AlarmEventMetric.class);
-        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("制定详细规则表列表数据", "导出人:Jeecg", "导出信息"));
+        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;
     }
@@ -236,9 +233,9 @@ public class AlarmEventMetricController {
             params.setHeadRows(1);
             params.setNeedSave(true);
             try {
-                List<AlarmEventMetric> listAlarmEventMetrics = ExcelImportUtil.importExcel(file.getInputStream(), AlarmEventMetric.class, params);
-                alarmEventMetricService.saveBatch(listAlarmEventMetrics);
-                return Result.ok("文件导入成功!数据行数:" + listAlarmEventMetrics.size());
+                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());

+ 0 - 91
module-alarm/src/main/java/cn/com/ctop/alarm/modules/entity/AlarmEventMetric.java

@@ -1,91 +0,0 @@
-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;
-
-import java.util.Date;
-
-/**
- * 制定详细规则表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-10-29
- */
-@Data
-@TableName("ctop_alarm_event_metric")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_alarm_event_metric对象", description = "制定详细规则表")
-public class AlarmEventMetric {
-
-    /**
-     * 主键id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "主键id")
-    private Long eventMetricId;
-    /**
-     * 规则id
-     */
-    @Excel(name = "规则id", width = 15)
-    @ApiModelProperty(value = "规则id")
-    private Long eventRuleId;
-    /**
-     * 指标标识
-     */
-    @Excel(name = "指标标识", width = 15)
-    @ApiModelProperty(value = "指标标识")
-    private String metricValueCode;
-
-    private String metricValueName;
-    /**
-     * 判断方式 > >= < <= =
-     */
-    @Excel(name = "判断方式 > >= < <= =", width = 15)
-    @ApiModelProperty(value = "判断方式 > >= < <= =")
-    private String judgeMethod;
-    /**
-     * 判断类型 1-金额
-     */
-    private String judgeType;
-    /**
-     * 阈值
-     */
-    @Excel(name = "阈值", width = 15)
-    @ApiModelProperty(value = "阈值")
-    private String threshold;
-    /**
-     * 下限阈值
-     */
-    private String minThreshold;
-    /**
-     * 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 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 Date updateTime;
-    /**
-     * 数据范围:TODAY_DATA-当天数据
-     */
-    private String dataRange;
-}

+ 0 - 135
module-alarm/src/main/java/cn/com/ctop/alarm/modules/entity/AlarmEventRule.java

@@ -1,135 +0,0 @@
-package cn.com.ctop.alarm.modules.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 预警事件规则表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-10-29
- */
-@Data
-@TableName("ctop_alarm_event_rule")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_alarm_event_rule对象", description = "预警事件规则表")
-public class AlarmEventRule {
-    /**
-     * 规则id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "规则id")
-    private Long eventRuleId;
-    /**
-     * 账户编号
-     */
-    @Excel(name = "账户编号", width = 15)
-    @ApiModelProperty(value = "账户编号")
-    private Long accountId;
-
-    private Long campaignId;
-
-    /**
-     * 规则名称
-     */
-    @Excel(name = "规则名称", width = 15)
-    @ApiModelProperty(value = "规则名称")
-    private String eventRuleName;
-    /**
-     * 预警事件规则级别 1-普通预警 2-严重预警
-     */
-    @Excel(name = "预警事件规则级别 1-普通预警 2-严重预警", width = 15)
-    @ApiModelProperty(value = "预警事件规则级别 1-普通预警 2-严重预警")
-    private String eventRuleLevel;
-    /**
-     * 检查频率 1每小时,2每半小时
-     */
-    @Excel(name = "检查频率 1每小时,2每半小时", width = 15)
-    @ApiModelProperty(value = "检查频率 1每小时,2每半小时")
-    private String checkFrequency;
-    /**
-     * 预警达标处理方式1发送,2关停并发送
-     */
-    @Excel(name = "预警达标处理方式1发送,2关停并发送", width = 15)
-    @ApiModelProperty(value = "预警达标处理方式1发送,2关停并发送")
-    private String processMethod;
-    /**
-     * 规则状态
-     */
-    @Excel(name = "规则状态", width = 15)
-    @ApiModelProperty(value = "规则状态")
-    private String eventRuleStatus;
-
-    private String appStatus;
-
-    private String createrId;
-
-    private String metricValueCode;
-
-    private String metricValueName;
-    /**
-     * 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 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 Date updateTime;
-
-    @TableField(exist = false)
-    private String createrName;
-
-    @TableField(exist = false)
-    private String userId;
-
-    @TableField(exist = false)
-    private String accountName;
-
-    @TableField(exist = false)
-    private String UserName;
-
-    @TableField(exist = false)
-    private Date runningTime;
-
-    @TableField(exist = false)
-    private String alarmCondition;
-
-    @TableField(exist = false)
-    private String campaignName;
-
-    @TableField(exist = false)
-    private Long unitId;
-
-    @TableField(exist = false)
-    private String unitName;
-
-    @TableField(exist = false)
-    private List<AlarmRuleCampaignRel> rel;
-
-    @TableField(exist = false)
-    private List<AlarmEventMetric> alarmEventMetrics;
-
-}

+ 0 - 85
module-alarm/src/main/java/cn/com/ctop/alarm/modules/entity/AlarmMetricValue.java

@@ -1,85 +0,0 @@
-package cn.com.ctop.alarm.modules.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 指标字段记录表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-10-29
- */
-@Data
-@TableName("ctop_alarm_metric_value")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_alarm_metric_value对象", description = "指标字段记录表")
-public class AlarmMetricValue {
-
-    /**
-     * 指标值编号
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "指标值编号")
-    private Integer metricValueId;
-    /**
-     * 父级编码
-     */
-    @Excel(name = "父级编码", width = 15)
-    @ApiModelProperty(value = "父级编码")
-    private Integer metricParentId;
-    /**
-     * 指标值名称
-     */
-    @Excel(name = "指标值名称", width = 15)
-    @ApiModelProperty(value = "指标值名称")
-    private String metricValueName;
-    /**
-     * 指标值编码
-     */
-    @Excel(name = "指标值编码", width = 15)
-    @ApiModelProperty(value = "指标值编码")
-    private String metricValueCode;
-    //数据级别;1账户计划组可见,2账户计划可见,3账户可见
-    private String metricValueLevel;
-
-    private String msgValueType;
-
-    private String msgValueUnit;
-
-    private String msgTemplate;
-    /**
-     * 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 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 Date updateTime;
-
-    @TableField(exist = false)
-    private List<AlarmMetricValue> childs;
-
-}

+ 0 - 80
module-alarm/src/main/java/cn/com/ctop/alarm/modules/entity/AlarmRuleCampaignRel.java

@@ -1,80 +0,0 @@
-package cn.com.ctop.alarm.modules.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 规则和计划、组关系表
- *alarm_rule_campaign_rel
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-11-09
- */
-@Data
-@TableName("ctop_alarm_rule_campaign_rel")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_alarm_rule_campaign_rel对象", description = "规则和计划、组关系表")
-public class AlarmRuleCampaignRel {
-
-    /**
-     * 规则id
-     */
-    @Excel(name = "规则id", width = 15)
-    @ApiModelProperty(value = "规则id")
-    private Long eventRuleId;
-    /**
-     * 账户id
-     */
-    @Excel(name = "账户id", width = 15)
-    @ApiModelProperty(value = "账户id")
-    private Long accountId;
-    /**
-     * 计划id
-     */
-    @Excel(name = "计划id", width = 15)
-    @ApiModelProperty(value = "计划id")
-    private Long campaignId;
-    @TableField(exist = false)
-    private String campaignName;
-    /**
-     * 组id
-     */
-    @Excel(name = "组id", width = 15)
-    @ApiModelProperty(value = "组id")
-    private Long unitId;
-    @TableField(exist = false)
-    private String unitName;
-    /**
-     * 规则级别 account-账户级;unit-组级;campaign-计划级
-     */
-    @Excel(name = "规则级别 ACCOUNT-账户级;UNIT-组级;CAMPAIGN-计划级", width = 15)
-    @ApiModelProperty(value = "规则级别 account-账户级;unit-组级;campaign-计划级")
-    private String eventRuleLevel;
-    /**
-     * 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 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 Date updateTime;
-}

+ 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;
+    }
+}

+ 0 - 20
module-alarm/src/main/java/cn/com/ctop/alarm/modules/mapper/AlarmEventMetricMapper.java

@@ -1,20 +0,0 @@
-package cn.com.ctop.alarm.modules.mapper;
-
-import cn.com.ctop.alarm.modules.entity.AlarmEventMetric;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import java.util.List;
-
-/**
- * 制定详细规则表
- *
- * @author: jeecg-boot
- * @date: 2020-10-29
- * @cersion: V1.0
- */
-public interface AlarmEventMetricMapper extends BaseMapper<AlarmEventMetric> {
-
-    List<AlarmEventMetric> selectByEventRuleId(Long id);
-
-    void deleteByRuleId(Long id);
-}

+ 0 - 22
module-alarm/src/main/java/cn/com/ctop/alarm/modules/mapper/AlarmEventRuleMapper.java

@@ -1,22 +0,0 @@
-package cn.com.ctop.alarm.modules.mapper;
-
-import cn.com.ctop.alarm.modules.entity.AlarmEventRule;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import java.util.List;
-
-/**
- * 预警事件规则表
- *
- * @author: jeecg-boot
- * @date: 2020-10-29
- * @cersion: V1.0
- */
-public interface AlarmEventRuleMapper extends BaseMapper<AlarmEventRule> {
-
-    List<AlarmEventRule> selectListPage(AlarmEventRule alarmEventRule);
-
-    AlarmEventRule queryById(Long id);
-
-    List<AlarmEventRule> queryRunningRecordPage(AlarmEventRule alarmEventRule);
-}

+ 0 - 18
module-alarm/src/main/java/cn/com/ctop/alarm/modules/mapper/AlarmMetricValueMapper.java

@@ -1,18 +0,0 @@
-package cn.com.ctop.alarm.modules.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import cn.com.ctop.alarm.modules.entity.AlarmMetricValue;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 指标字段记录表
- * @author: jeecg-boot
- * @date:   2020-10-29
- * @cersion: V1.0
- */
-public interface AlarmMetricValueMapper extends BaseMapper<AlarmMetricValue> {
-
-    List<AlarmMetricValue> queryListByLevel(AlarmMetricValue alarmMetricValue);
-}

+ 0 - 20
module-alarm/src/main/java/cn/com/ctop/alarm/modules/mapper/AlarmRuleCampaignRelMapper.java

@@ -1,20 +0,0 @@
-package cn.com.ctop.alarm.modules.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import cn.com.ctop.alarm.modules.entity.AlarmRuleCampaignRel;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 规则和计划、组关系表
- * @author: jeecg-boot
- * @date:   2020-11-09
- * @cersion: V1.0
- */
-public interface AlarmRuleCampaignRelMapper extends BaseMapper<AlarmRuleCampaignRel> {
-
-    void deleteByRuleId(Long id);
-
-    List<AlarmRuleCampaignRel> selectByRuleId(Long id);
-}

+ 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> {
+
+}

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

@@ -1,15 +0,0 @@
-<?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.AlarmEventMetricMapper">
-
-    <select id="selectByEventRuleId" resultType="cn.com.ctop.alarm.modules.entity.AlarmEventMetric">
-        SELECT *
-        FROM ctop_alarm_event_metric
-        WHERE event_rule_id = #{id}
-    </select>
-
-    <delete id="deleteByRuleId">
-        delete from ctop_alarm_event_metric
-        where event_rule_id = #{id}
-    </delete>
-</mapper>

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

@@ -1,60 +0,0 @@
-<?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.AlarmEventRuleMapper">
-
-    <select id="selectListPage" parameterType="cn.com.ctop.alarm.modules.entity.AlarmEventRule"
-            resultType="cn.com.ctop.alarm.modules.entity.AlarmEventRule">
-        SELECT DISTINCT
-        t1.*,t3.realname AS 'createrName',t2.user_id,t2.user_name,t2.auth_name AS 'accountName' FROM
-        ctop_alarm_event_rule t1
-        LEFT JOIN ctop_user_allocation t2 ON t1.account_id = t2.account_id
-        LEFT JOIN sys_user t3 ON t1.creater_id = t3.id
-        <where>
-            <if test="eventRuleStatus != null and eventRuleStatus !='' ">
-                AND t1.event_rule_status = #{eventRuleStatus}
-            </if>
-            <if test="checkFrequency != null and checkFrequency !='' ">
-                AND t1.check_frequency = #{checkFrequency}
-            </if>
-            <if test="unitId != null and unitId !='' ">
-                AND t1.event_rule_id != #{unitId}
-            </if>
-            <if test="accountId != null and accountId !='' ">
-                AND t1.account_id = #{accountId}
-            </if>
-            <if test="eventRuleName != null and eventRuleName !='' ">
-                AND t1.event_rule_name = #{eventRuleName}
-            </if>
-        </where>
-        order by t1.create_time desc
-    </select>
-    <select id="queryRunningRecordPage" parameterType="cn.com.ctop.alarm.modules.entity.AlarmEventRule"
-            resultType="cn.com.ctop.alarm.modules.entity.AlarmEventRule">
-        SELECT t1.*,
-        t3.user_id,t2.create_time AS 'runningTime',
-        t3.auth_name AS 'accountName',
-        t2.alarm_condition AS 'alarmCondition',
-        t3.user_name AS 'userName',t4.realname AS 'createrName'
-        FROM ctop_alarm_event_rule t1
-        INNER JOIN ctop_alarm_event_send t2 ON t1.event_rule_id = t2.event_rule_id
-        LEFT JOIN ctop_user_allocation t3 ON t1.account_id = t3.account_id
-        LEFT JOIN sys_user t4 ON t1.creater_id = t4.id
-        WHERE t1.event_rule_status = '1'
-        <if test="eventRuleId!=null">
-            AND t1.event_rule_id = #{eventRuleId}
-        </if>
-        <if test="eventRuleName!=null">
-            AND t1.event_rule_name LIKE CONCAT('%',#{eventRuleName},'%')
-        </if>
-        ORDER BY t2.create_time DESC
-    </select>
-    <select id="queryById" resultType="cn.com.ctop.alarm.modules.entity.AlarmEventRule">
-       SELECT DISTINCT t1.*,
-       t3.realname AS 'createrName',t2.user_id,t2.user_name,t2.auth_name AS accountName
-       FROM
-        ctop_alarm_event_rule t1
-        LEFT JOIN ctop_user_allocation t2 ON t1.account_id = t2.account_id
-         LEFT JOIN sys_user t3 ON t1.creater_id = t3.id
-        WHERE t1.event_rule_id = #{id}
-    </select>
-</mapper>

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

@@ -1,12 +0,0 @@
-<?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.AlarmMetricValueMapper">
-    <select id="queryListByLevel" parameterType="cn.com.ctop.alarm.modules.entity.AlarmMetricValue"
-            resultType="cn.com.ctop.alarm.modules.entity.AlarmMetricValue">
-        SELECT
-        *
-        FROM
-        ctop_alarm_metric_value t1
-        WHERE metric_value_level LIKE CONCAT("%",#{metricValueLevel},"%")
-    </select>
-</mapper>

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

@@ -1,18 +0,0 @@
-<?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.AlarmRuleCampaignRelMapper">
-
-    <delete id="deleteByRuleId">
-        delete from ctop_alarm_rule_campaign_rel
-        where event_rule_id = #{id}
-    </delete>
-
-    <select id="selectByRuleId" resultType="cn.com.ctop.alarm.modules.entity.AlarmRuleCampaignRel">
-       SELECT t1.*,t2.unit_name AS unitName,t3.campaign_name AS campaignName
-       FROM
-        ctop_alarm_rule_campaign_rel t1
-        LEFT JOIN ctop_kuaishou_group t2 ON t1.unit_id =  t2.unit_id
-		LEFT JOIN ctop_kuaishou_campaign t3 ON t1.campaign_id = t3.campaign_id
-        WHERE event_rule_id = #{id}
-    </select>
-</mapper>

+ 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 {
+
+}

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

@@ -1,14 +0,0 @@
-package cn.com.ctop.alarm.modules.service;
-
-import cn.com.ctop.alarm.modules.entity.AlarmEventMetric;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 制定详细规则表
- * @Author: jeecg-boot
- * @Date: 2020-10-29
- * @Version: V1.0
- */
-public interface IAlarmEventMetricService extends IService<AlarmEventMetric> {
-
-}

+ 0 - 28
module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/IAlarmEventRuleService.java

@@ -1,28 +0,0 @@
-package cn.com.ctop.alarm.modules.service;
-
-import cn.com.ctop.alarm.modules.entity.AlarmEventRule;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.github.pagehelper.PageInfo;
-import org.jeecg.common.api.vo.Result;
-
-/**
- * @Description: 预警事件规则表
- * @Author: jeecg-boot
- * @Date: 2020-10-29
- * @Version: V1.0
- */
-public interface IAlarmEventRuleService extends IService<AlarmEventRule> {
-
-    Result<Object> addAlarmEventRule(JSONObject obj);
-
-    Result<Object> editAlarmEventRule(JSONObject obj);
-
-    AlarmEventRule selectById(Long id);
-
-    PageInfo<AlarmEventRule> selectListPage(AlarmEventRule alarmEventRule);
-
-    void deleteById(Long id);
-
-    PageInfo<AlarmEventRule> queryRunningRecordPage(AlarmEventRule alarmEventRule);
-}

+ 0 - 3
module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/IAlarmEventSendService.java

@@ -12,7 +12,4 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IAlarmEventSendService extends IService<AlarmEventSend> {
 
-    void matchAlarmRules(String checkType);
-
-    JSONObject getAlarmValue(String type);
 }

+ 0 - 16
module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/IAlarmMetricValueService.java

@@ -1,16 +0,0 @@
-package cn.com.ctop.alarm.modules.service;
-
-import cn.com.ctop.alarm.modules.entity.AlarmMetricValue;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.common.api.vo.Result;
-
-/**
- * @Description: 指标字段记录表
- * @Author: jeecg-boot
- * @Date:   2020-10-29
- * @Version: V1.0
- */
-public interface IAlarmMetricValueService extends IService<AlarmMetricValue> {
-
-    Result<Object> queryParentChildList(AlarmMetricValue alarmMetricValue);
-}

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

@@ -1,14 +0,0 @@
-package cn.com.ctop.alarm.modules.service;
-
-import cn.com.ctop.alarm.modules.entity.AlarmRuleCampaignRel;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 规则和计划、组关系表
- * @Author: jeecg-boot
- * @Date: 2020-11-09
- * @Version: V1.0
- */
-public interface IAlarmRuleCampaignRelService extends IService<AlarmRuleCampaignRel> {
-
-}

+ 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> {
+
+}

+ 0 - 19
module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/impl/AlarmEventMetricServiceImpl.java

@@ -1,19 +0,0 @@
-package cn.com.ctop.alarm.modules.service.impl;
-
-import cn.com.ctop.alarm.modules.entity.AlarmEventMetric;
-import cn.com.ctop.alarm.modules.mapper.AlarmEventMetricMapper;
-import cn.com.ctop.alarm.modules.service.IAlarmEventMetricService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * 制定详细规则表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-10-29
- */
-@Service
-public class AlarmEventMetricServiceImpl extends ServiceImpl<AlarmEventMetricMapper, AlarmEventMetric> implements IAlarmEventMetricService {
-
-}

+ 0 - 314
module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/impl/AlarmEventRuleServiceImpl.java

@@ -1,314 +0,0 @@
-package cn.com.ctop.alarm.modules.service.impl;
-
-import cn.com.ctop.alarm.modules.entity.AlarmEventMetric;
-import cn.com.ctop.alarm.modules.entity.AlarmEventRule;
-import cn.com.ctop.alarm.modules.entity.AlarmRuleCampaignRel;
-import cn.com.ctop.alarm.modules.mapper.AlarmEventMetricMapper;
-import cn.com.ctop.alarm.modules.mapper.AlarmEventRuleMapper;
-import cn.com.ctop.alarm.modules.mapper.AlarmRuleCampaignRelMapper;
-import cn.com.ctop.alarm.modules.service.IAlarmEventRuleService;
-import cn.com.ctop.common.module.utils.Check;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroup;
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouCampaignMapper;
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouGroupMapper;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.PageInfo;
-import com.xxl.job.core.enums.NoEn;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.vo.LoginUser;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.transaction.Transactional;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 预警事件规则表
- * 完成Condition
- * CURRENT_TODAY_DATA
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-10-29
- */
-@Transactional
-@Service
-public class AlarmEventRuleServiceImpl extends ServiceImpl<AlarmEventRuleMapper, AlarmEventRule> implements IAlarmEventRuleService {
-
-    @Autowired
-    private AlarmEventRuleMapper alarmEventRuleMapper;
-
-    @Autowired
-    private AlarmEventMetricMapper alarmEventMetricMapper;
-
-    @Autowired
-    private AlarmRuleCampaignRelMapper alarmRuleCampaignRelMapper;
-
-    @Autowired
-    private KuaiShouCampaignMapper kuaiShouCampaignMapper;
-
-    @Autowired
-    private KuaiShouGroupMapper kuaiShouGroupMapper;
-
-    @Override
-    public PageInfo<AlarmEventRule> selectListPage(AlarmEventRule alarmEventRule) {
-        return new PageInfo<AlarmEventRule>(alarmEventRuleMapper.selectListPage(alarmEventRule));
-    }
-
-    @Override
-    public void deleteById(Long id) {
-        alarmEventRuleMapper.deleteById(id);
-        alarmEventMetricMapper.deleteByRuleId(id);
-        alarmRuleCampaignRelMapper.deleteByRuleId(id);
-    }
-
-    @Override
-    public PageInfo<AlarmEventRule> queryRunningRecordPage(AlarmEventRule alarmEventRule) {
-        return new PageInfo<AlarmEventRule>(alarmEventRuleMapper.queryRunningRecordPage(alarmEventRule));
-    }
-
-    @Override
-    public Result<Object> addAlarmEventRule(JSONObject obj) {
-        Map<String, Object> map = new HashMap<>();
-        map.put("account_id", obj.getLong("accountId"));
-        map.put("event_rule_name", obj.getString("eventRuleName"));
-        if (!Check.isNull(alarmEventRuleMapper.selectByMap(map))) {
-            return Result.error(1, "添加失败,重复的规则名,请重新输入");
-        }
-
-        //1。新增rule表
-        AlarmEventRule rule = new AlarmEventRule();
-        reSetRuleEntity(rule, obj);
-        JSONArray metrics = obj.getJSONArray("alarmEventMetric");
-        if (Check.isNull(metrics)) {
-            return Result.error(1, "请选择具体规则指标");
-        }
-        rule.setEventRuleStatus(NoEn.NO1.valueStr());//默认新增为激活状态
-        alarmEventRuleMapper.insert(rule);
-        //2。新增metric表
-        AlarmEventMetric metric = null;
-        for (int i = 0; i < metrics.size(); i++) {
-            metric = new AlarmEventMetric();
-            reSetMetricEntity(metric, metrics.getJSONObject(i), rule.getEventRuleId());
-            alarmEventMetricMapper.insert(metric);
-        }
-        //2。新增rel表
-        //通过指定选择应用
-        JSONArray rels = obj.getJSONArray("rel");
-        if (!Check.isNull(rels)) {
-            addRelByIds(rels, rule);
-        }
-        return new Result<>().success("添加成功!");
-    }
-
-    @Override
-    public Result<Object> editAlarmEventRule(JSONObject obj) {
-        AlarmEventRule alarmEventRule = new AlarmEventRule();
-        alarmEventRule.setUnitId(obj.getLong("eventRuleId"));
-        alarmEventRule.setAccountId(obj.getLong("accountId"));
-        alarmEventRule.setEventRuleName(obj.getString("eventRuleName"));
-        if (!Check.isNull(alarmEventRuleMapper.selectListPage(alarmEventRule))) {
-            return Result.error(1, "修改失败,重复的规则名,请重新输入");
-        }
-        //1.更改rule表
-        AlarmEventRule rule = new AlarmEventRule();
-        reSetRuleEntity(rule, obj);
-        QueryWrapper<AlarmEventRule> ruleWrapper = new QueryWrapper<>();
-        ruleWrapper.eq("event_rule_id", obj.getLong("eventRuleId"));
-        alarmEventRuleMapper.update(rule, ruleWrapper);
-        rule.setEventRuleId(obj.getLong("eventRuleId"));
-        //2.更改metric表
-        JSONArray metrics = obj.getJSONArray("alarmEventMetric");
-        if (Check.isNull(metrics)) {
-            return Result.error(1, "请选择具体规则指标");
-        }
-        AlarmEventMetric metric = null;
-        QueryWrapper<AlarmEventMetric> metricWrapper = null;
-        for (int i = 0; i < metrics.size(); i++) {
-            JSONObject mo = metrics.getJSONObject(i);
-            metric = new AlarmEventMetric();
-            reSetMetricEntity(metric, mo, rule.getEventRuleId());
-            metricWrapper = new QueryWrapper<>();
-            metricWrapper.eq("event_metric_id", mo.getLong("eventMetricId"));
-            metricWrapper.eq("event_rule_id", obj.getLong("eventRuleId"));
-            alarmEventMetricMapper.update(metric, metricWrapper);
-        }
-        //3.更改rel表
-        //通过指定,传参ids绑定应用
-        JSONArray rels = obj.getJSONArray("rel");
-        if (!Check.isNull(rels)) {
-            alarmRuleCampaignRelMapper.deleteByRuleId(rule.getEventRuleId());
-            addRelByIds(rels, rule);
-        }
-        return new Result<>().success("修改成功!");
-    }
-
-    @Override
-    public AlarmEventRule selectById(Long id) {
-        AlarmEventRule alarmEventRule = alarmEventRuleMapper.queryById(id);
-        if (Check.isNull(alarmEventRule)) {
-            return null;
-        }
-        alarmEventRule.setAlarmEventMetrics(alarmEventMetricMapper.selectByEventRuleId(id));
-        if (("CAMPAIGN".equals(alarmEventRule.getEventRuleLevel()) || "UNIT".equals(alarmEventRule.getEventRuleLevel())) && !NoEn.NO1.valueStr().equals(alarmEventRule.getAppStatus())) {
-            alarmEventRule.setRel(alarmRuleCampaignRelMapper.selectByRuleId(id));
-        }
-        return alarmEventRule;
-    }
-
-    //通过状态+level绑定应用
-    private void addRelByStatus(AlarmEventRule rule, Long campaignId) {
-        if ("CAMPAIGN".equals(rule.getEventRuleLevel())) {
-            List<Long> ids = kuaiShouCampaignMapper.queryIdsByPutStatus(rule.getAccountId(), NoEn.NO1.valueStr());
-            if (Check.isNull(ids)) {
-                return;
-            }
-            for (Long id : ids) {
-                AlarmRuleCampaignRel relEntity = new AlarmRuleCampaignRel();
-                relEntity.setEventRuleId(rule.getEventRuleId());
-                relEntity.setAccountId(rule.getAccountId());
-                relEntity.setEventRuleLevel(rule.getEventRuleLevel());
-                relEntity.setCampaignId(id);
-                alarmRuleCampaignRelMapper.insert(relEntity);
-            }
-        }
-        if ("UNIT".equals(rule.getEventRuleLevel())) {
-            Map<String, Object> map = new HashMap<>();
-            map.put("put_status", NoEn.NO1.valueStr());
-            map.put("account_id", rule.getAccountId());
-            if (Check.isNull(campaignId)) {
-                map.put("campaign_id", campaignId);
-            }
-            List<KuaiShouGroup> kuaiShouGroups = kuaiShouGroupMapper.selectByMap(map);
-            if (Check.isNull(kuaiShouGroups)) {
-                return;
-            }
-            for (KuaiShouGroup kuaiShouGroup : kuaiShouGroups) {
-                AlarmRuleCampaignRel relEntity = new AlarmRuleCampaignRel();
-                relEntity.setEventRuleId(rule.getEventRuleId());
-                relEntity.setAccountId(rule.getAccountId());
-                relEntity.setEventRuleLevel(rule.getEventRuleLevel());
-                relEntity.setCampaignId(kuaiShouGroup.getCampaignId());
-                relEntity.setUnitId(kuaiShouGroup.getUnitId());
-                alarmRuleCampaignRelMapper.insert(relEntity);
-            }
-        }
-    }
-
-    //通过指定,传参IDS绑定应用
-    private void addRelByIds(JSONArray rels, AlarmEventRule rule) {
-        for (int k = 0; k < rels.size(); k++) {
-            AlarmRuleCampaignRel relEntity = new AlarmRuleCampaignRel();
-            JSONObject rel = rels.getJSONObject(k);
-            relEntity.setEventRuleId(rule.getEventRuleId());
-            relEntity.setAccountId(rule.getAccountId());
-            relEntity.setEventRuleLevel(rule.getEventRuleLevel());
-            relEntity.setCampaignId(rel.getLong("campaignId"));
-            relEntity.setUnitId(rel.getLong("unitId"));
-            alarmRuleCampaignRelMapper.insert(relEntity);
-        }
-    }
-
-    /**
-     * 规则实体类封装
-     * Message template
-     *
-     * @param
-     * @return void
-     * @throws
-     * @author ZHAOXA
-     */
-    private void reSetRuleEntity(AlarmEventRule rule, JSONObject obj) {
-        Long accountId = obj.getLong("accountId");
-        if (!Check.isNull(accountId)) {
-            rule.setAccountId(accountId);
-        }
-        Long campaignId = obj.getLong("campaignId");
-        if (!Check.isNull(campaignId)) {
-            rule.setCampaignId(campaignId);
-        }
-        String eventRuleName = obj.getString("eventRuleName");
-        if (!Check.isNull(eventRuleName)) {
-            rule.setEventRuleName(eventRuleName);
-        }
-        String eventRuleLevel = obj.getString("eventRuleLevel");
-        if (!Check.isNull(eventRuleLevel)) {
-            rule.setEventRuleLevel(eventRuleLevel);
-        }
-        String checkFrequency = obj.getString("checkFrequency");
-        if (!Check.isNull(checkFrequency)) {
-            rule.setCheckFrequency(checkFrequency);
-        }
-        String metricValueCode = obj.getString("metricValueCode");
-        if (!Check.isNull(metricValueCode)) {
-            rule.setMetricValueCode(metricValueCode);
-        }
-        String metricValueName = obj.getString("metricValueName");
-        if (!Check.isNull(metricValueName)) {
-            rule.setMetricValueName(metricValueName);
-        }
-        String processMethod = obj.getString("processMethod");
-        if (!Check.isNull(processMethod)) {
-            rule.setProcessMethod(processMethod);
-        }
-        String eventRuleStatus = obj.getString("eventRuleStatus");
-        if (!Check.isNull(eventRuleStatus)) {
-            rule.setEventRuleStatus(eventRuleStatus);
-        }
-        rule.setCreaterId(obj.getString("createrId"));
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if (!Check.isNull(sysUser)) {
-            rule.setCreaterId(sysUser.getId());
-        }
-        if (!Check.isNull(obj.getString("appStatus")) && Check.isNull(obj.getJSONArray("rel"))) {
-            rule.setAppStatus(obj.getString("appStatus"));
-        }
-    }
-
-    /**
-     * 填充规则详细实体类
-     *
-     * @param
-     * @return void
-     * @throws
-     * @author ZHAOXA
-     */
-    private void reSetMetricEntity(AlarmEventMetric metric, JSONObject mo, Long ruleId) {
-        metric.setEventRuleId(ruleId);
-        String valueCode = mo.getString("metricValueCode");
-        if (!Check.isNull(valueCode)) {
-            metric.setMetricValueCode(valueCode);
-        }
-        String valueName = mo.getString("metricValueName");
-        if (!Check.isNull(valueName)) {
-            metric.setMetricValueName(valueName);
-        }
-        String judgeType = mo.getString("judgeType");
-        if (!Check.isNull(judgeType)) {
-            metric.setJudgeType(judgeType);
-        }
-        String judgeMethod = mo.getString("judgeMethod");
-        if (!Check.isNull(judgeMethod)) {
-            metric.setJudgeMethod(judgeMethod);
-        }
-        String threshold = mo.getString("threshold");
-        if (!Check.isNull(threshold)) {
-            metric.setThreshold(threshold);
-        }
-        String minThreshold = mo.getString("minThreshold");
-        if (!Check.isNull(minThreshold)) {
-            metric.setMinThreshold(minThreshold);
-        }
-        String dataRange = mo.getString("dataRange");
-        if (!Check.isNull(dataRange)) {
-            metric.setDataRange(dataRange);
-        }
-    }
-
-}

+ 0 - 449
module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/impl/AlarmEventSendServiceImpl.java

@@ -1,42 +1,13 @@
 package cn.com.ctop.alarm.modules.service.impl;
 
-import cn.com.ctop.alarm.modules.entity.AlarmEventMetric;
-import cn.com.ctop.alarm.modules.entity.AlarmEventRule;
 import cn.com.ctop.alarm.modules.entity.AlarmEventSend;
-import cn.com.ctop.alarm.modules.entity.AlarmMetricValue;
-import cn.com.ctop.alarm.modules.entity.AlarmRuleCampaignRel;
-import cn.com.ctop.alarm.modules.enums.StatusEnum;
-import cn.com.ctop.alarm.modules.mapper.AlarmEventMetricMapper;
-import cn.com.ctop.alarm.modules.mapper.AlarmEventRuleMapper;
 import cn.com.ctop.alarm.modules.mapper.AlarmEventSendMapper;
-import cn.com.ctop.alarm.modules.mapper.AlarmMetricValueMapper;
-import cn.com.ctop.alarm.modules.mapper.AlarmRuleCampaignRelMapper;
 import cn.com.ctop.alarm.modules.service.IAlarmEventSendService;
-import cn.com.ctop.common.module.entity.CtopOauthToken;
-import cn.com.ctop.common.module.service.ICtopOauthTokenService;
-import cn.com.ctop.common.module.service.IMessageTemplate;
-import cn.com.ctop.common.module.service.ISendMessageService;
-import cn.com.ctop.common.module.utils.Check;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaign;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroup;
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouCampaignMapper;
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouGroupMapper;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouUpdateService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xxl.job.core.enums.NoEn;
 import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.util.db.DataSourceCachePool;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.HashOperations;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 /**
  * 预警事件发送表
  *
@@ -48,424 +19,4 @@ import java.util.Map;
 @Service
 public class AlarmEventSendServiceImpl extends ServiceImpl<AlarmEventSendMapper, AlarmEventSend> implements IAlarmEventSendService {
 
-    @Autowired
-    private AlarmEventRuleMapper alarmEventRuleMapper;
-
-    @Autowired
-    private AlarmEventMetricMapper alarmEventMetricMapper;
-
-    @Autowired
-    private AlarmRuleCampaignRelMapper alarmRuleCampaignRelMapper;
-
-    @Autowired
-    private AlarmMetricValueMapper alarmMetricValueMapper;
-
-    @Autowired
-    private AlarmEventSendMapper alarmEventSendMapper;
-
-    @Autowired
-    private IMessageTemplate messageTemplate;
-
-    @Autowired
-    private ISendMessageService sendMessageService;
-
-    @Autowired
-    private KuaiShouCampaignMapper kuaiShouCampaignMapper;
-
-    @Autowired
-    private IKuaiShouUpdateService kuaiShouUpdateService;
-
-    @Autowired
-    private ICtopOauthTokenService oauthTokenService;
-
-    @Autowired
-    private KuaiShouGroupMapper kuaiShouGroupMapper;
-
-    private static JSONObject alarmValue;
-
-    /**
-     * value数据存储到内存
-     *
-     * @param
-     * @return com.alibaba.fastjson.JSONObject
-     * @throws
-     * @author ZHAOXA
-     */
-    @Override
-    public JSONObject getAlarmValue(String type) {
-        if (NoEn.NO1.valueStr().equals(type)) {
-            alarmValue = null;
-        }
-        if (Check.isNull(alarmValue)) {
-            alarmValue = new JSONObject();
-            List<AlarmMetricValue> valueList = alarmMetricValueMapper.selectList(null);
-            if (!Check.isNull(valueList)) {
-                for (AlarmMetricValue value : valueList) {
-                    alarmValue.put(value.getMetricValueCode(), value);
-                }
-            }
-            return alarmValue;
-        }
-        return alarmValue;
-    }
-
-    @Override
-    public void matchAlarmRules(String checkType) {
-        log.info("------匹配规则start----------");
-        long startTime = System.currentTimeMillis();
-        List<AlarmEventRule> allRules = getAllAlarmRules(checkType);
-        List<JSONObject> accountCosts = getCostInfo("ACCOUNT");
-        List<JSONObject> campaignCosts = getCostInfo("CAMPAIGN");
-        List<JSONObject> unitCosts = getCostInfo("UNIT");
-        if (Check.isNull(allRules)) {
-            return;
-        }
-        //判断账户级
-        for (AlarmEventRule rule : allRules) {
-            for (JSONObject accountCost : accountCosts) {
-                if ("ACCOUNT".equals(rule.getEventRuleLevel()) && accountCost.getLong("accountId") - rule.getAccountId() == 0) {
-                    matchRules(rule, accountCost, "ACCOUNT");
-                }
-            }
-            //判断计划级
-            for (JSONObject campaignCost : campaignCosts) {
-                if ("CAMPAIGN".equals(rule.getEventRuleLevel()) && campaignCost.getLong("accountId") - rule.getAccountId() == 0) {
-                    List<AlarmRuleCampaignRel> rel = rule.getRel();
-                    if (!Check.isNull(rel)) {
-                        for (AlarmRuleCampaignRel campaignRel : rel) {
-                            if (campaignRel.getCampaignId() - campaignCost.getLong("campaignId") == 0) {
-                                rule.setCampaignId(campaignRel.getCampaignId());
-                                rule.setCampaignName(campaignRel.getCampaignName());
-                                matchRules(rule, campaignCost, "CAMPAIGN");
-                            }
-                        }
-                    }
-                }
-            }
-            //判断组级
-            for (JSONObject unitCost : unitCosts) {
-                if ("UNIT".equals(rule.getEventRuleLevel()) && unitCost.getLong("accountId") - rule.getAccountId() == 0) {
-                    List<AlarmRuleCampaignRel> rel = rule.getRel();
-                    if (!Check.isNull(rel)) {
-                        for (AlarmRuleCampaignRel unitRel : rel) {
-                            if (unitRel.getUnitId() - unitCost.getLong("unitId") == 0) {
-                                rule.setCampaignId(unitRel.getCampaignId());
-                                rule.setCampaignName(unitRel.getCampaignName());
-                                rule.setUnitId(unitRel.getUnitId());
-                                rule.setUnitName(unitRel.getUnitName());
-                                matchRules(rule, unitCost, "UNIT");
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        long endTime = System.currentTimeMillis();
-        log.info("---end---匹配规则用时:{} ms", endTime - startTime);
-    }
-
-    /**
-     * 匹配规则
-     *
-     * @param
-     * @return void
-     * @throws
-     * @author ZHAOXA
-     */
-    private void matchRules(AlarmEventRule rule, JSONObject cost, String level) {
-        try {
-            //目标值
-            String goal = cost.getString(rule.getMetricValueCode());
-            if (Check.isNull(goal)) {
-                log.warn("规则中指标不匹配");
-                return;
-            }
-            //总消耗
-            BigDecimal totalCost = cost.getBigDecimal("totalCost");
-            BigDecimal value = new BigDecimal(goal);
-            List<AlarmEventMetric> metrics = rule.getAlarmEventMetrics();
-            if (Check.isNull(metrics)) {
-                return;
-            }
-            //value配置数据
-            JSONObject alarmValue = getAlarmValue(NoEn.NO0.valueStr());
-            boolean flag = true;
-            StringBuffer _depletion = new StringBuffer();
-            StringBuffer _roi = new StringBuffer();
-            StringBuffer _value = new StringBuffer();
-            for (AlarmEventMetric metric : metrics) {
-                if (flag) {
-                    //阈值
-                    BigDecimal threshold = new BigDecimal(metric.getThreshold());
-                    String judgeMethod = metric.getJudgeMethod();
-                    String metricValue = metric.getMetricValueCode();
-                    JSONObject valObj = alarmValue.getJSONObject(metricValue);
-                    //模板
-                    String msgTemplate = valObj.getString("msgTemplate");
-                    //单位 元、%
-                    String msgValueUnit = valObj.getString("msgValueUnit");
-                    //阈值类型 1-字符串,2-数字(BigDecimal),3-百分数',
-                    String showValue = getThreshold(valObj.getString("msgValueType"), threshold, msgValueUnit);
-                    String judgment = "低于";
-                    //大于等于
-                    if ("GT_EQ".equals(judgeMethod)) {
-                        judgment = "高于";
-                        //判断阈值类型(cost-成本;depletion-消耗;roi)
-                        if (metricValue.contains("_depletion")) {
-                            flag = totalCost.compareTo(threshold) >= 0;
-                            getMsgTemplate(_depletion, msgTemplate, judgment, "消耗值", showValue);
-                        } else if (metricValue.contains("_roi")) {
-                            flag = value.compareTo(threshold) >= 0;
-                            getMsgTemplate(_roi, msgTemplate, judgment, "ROI", showValue);
-                        } else {
-                            flag = value.compareTo(threshold) >= 0;
-                            getMsgTemplate(_value, msgTemplate, judgment, "阈值", showValue);
-                        }
-                        //小于等于
-                    } else if ("LT_EQ".equals(judgeMethod)) {
-                        if (metricValue.contains("_depletion")) {
-                            flag = totalCost.compareTo(threshold) <= 0;
-                            getMsgTemplate(_depletion, msgTemplate, judgment, "消耗值", showValue);
-                        } else if (metricValue.contains("_roi")) {
-                            flag = value.compareTo(threshold) <= 0;
-                            getMsgTemplate(_roi, msgTemplate, judgment, "ROI", showValue);
-                        } else {
-                            flag = value.compareTo(threshold) <= 0;
-                            getMsgTemplate(_value, msgTemplate, judgment, "阈值", showValue);
-                        }
-                        //介于
-                    } else if ("BETWEEN".equals(judgeMethod)) {
-                        BigDecimal minThreshold = new BigDecimal(metric.getMinThreshold());
-                        String minshowValue = getThreshold(valObj.getString("msgValueType"), minThreshold, msgValueUnit);
-                        if (metricValue.contains("_depletion")) {
-                            flag = (totalCost.compareTo(threshold) > 0) || (totalCost.compareTo(minThreshold) < 0);
-                            if (totalCost.compareTo(threshold) > 0) {
-                                judgment = "高于";
-                            }
-                            getMsgTemplate(_depletion, msgTemplate, judgment, "消耗区间", minshowValue.concat("-").concat(showValue));
-                        } else if (metricValue.contains("_roi")) {
-                            flag = (value.compareTo(threshold) > 0) || (value.compareTo(minThreshold) < 0);
-                            if (value.compareTo(threshold) > 0) {
-                                judgment = "高于";
-                            }
-                            getMsgTemplate(_roi, msgTemplate, judgment, "ROI区间", minshowValue.concat("-").concat(showValue));
-                            continue;
-                        } else {
-                            flag = (value.compareTo(threshold) > 0) || (value.compareTo(minThreshold) < 0);
-                            if (value.compareTo(threshold) > 0) {
-                                judgment = "高于";
-                            }
-                            getMsgTemplate(_value, msgTemplate, judgment, "阈值区间", minshowValue.concat("-").concat(showValue));
-                        }
-                        //等于
-                    } else if ("EQ".equals(judgeMethod)) {
-                        judgment = "等于";
-                        flag = value.compareTo(threshold) == 0;
-                        String name = StatusEnum.getEnumByCode(threshold.toString()).getName();
-                        getMsgTemplate(_value, msgTemplate, judgment, "阈值", name);
-                    } else {
-                        log.warn("缺失判断条件");
-                        break;
-                    }
-                } else {
-                    break;
-                }
-            }
-            //规则满足,产生预警
-            if (flag) {
-                String detail = getDetail(_depletion, _roi, _value);
-                String msg = getMsg(level, detail, cost, rule);
-                if (!Check.isNull(msg)) {
-                    sendMessageService.sendMessage(rule.getUserId(), msg);
-                    AlarmEventSend send = new AlarmEventSend();
-                    send.setAlarmDetail(msg);
-
-                    send.setRuleDimension(rule.getMetricValueCode());send.setAlarmStatus(NoEn.NO1.valueStr());
-                    send.setGroupId(rule.getEventRuleId());
-                    send.setGroupName(rule.getMetricValueName().concat("预警:").concat(detail.replace("<br/>", ";")));
-                    send.setUserId(rule.getUserId());
-                    alarmEventSendMapper.insert(send);
-                }
-            }
-        } catch (Exception e) {
-            log.error("匹配规则异常", e);
-        }
-    }
-
-    private boolean shutDown(AlarmEventRule rule, String level) {
-        CtopOauthToken token = oauthTokenService.getTokenByAccountId(rule.getAccountId());
-        Map<String, Object> updateMap = new HashMap<>();
-        if (!Check.isNull(token)) {
-            if ("CAMPAIGN".equals(level)) {
-                updateMap = kuaiShouUpdateService.updateCampaignStatus(token.getAccessToken(), rule.getAccountId(), rule.getCampaignId(), NoEn.NO2.valueInt(), rule.getUserId());
-                log.info("---------规则关停快手计划:{}", rule.getCampaignId());
-            } else if ("UNIT".equals(level)) {
-                updateMap = kuaiShouUpdateService.updateUnitStatus(token.getAccessToken(), rule.getAccountId(), rule.getUnitId(), NoEn.NO2.valueInt(), rule.getUserId());
-                log.info("---------规则关停快手组:{}", rule.getUnitId());
-            }
-        }
-        return (boolean) updateMap.get("success");
-    }
-
-    /**
-     * 判断模板中阈值展示格式(含单位)
-     * 例如:100.0元、55.53%
-     */
-    private String getThreshold(String msgValueType, BigDecimal value, String msgValueUnit) {
-        //1-字符串,2-数字(BigDecimal),3-百分数
-        if ("3".equals(msgValueType)) {
-            return value.multiply(new BigDecimal(100)).setScale(2).toString().concat(msgValueUnit);
-        }
-        return value.toString().concat(msgValueUnit);
-    }
-
-    /**
-     * 匹配消息模板
-     */
-    private void getMsgTemplate(StringBuffer buf, String msgTemplate, String jud, String name, String value) {
-        buf.append(msgTemplate.replace("{judgment}", jud).replace("{name}", name).replace("{value}", value));
-    }
-
-    /**
-     * 组合消息内容
-     */
-    private String getDetail(StringBuffer _depletion, StringBuffer _roi, StringBuffer _value) {
-        StringBuffer detail = new StringBuffer();
-        if (_depletion.length() > 0) {
-            detail.append(_depletion);
-            if (_roi.length() > 0) {
-                detail.append("并且").append(_roi);
-                if (_value.length() > 0) {
-                    detail.append("并且").append(_value);
-                }
-            } else {
-                if (_value.length() > 0) {
-                    detail.append("并且").append(_value);
-                }
-            }
-        } else {
-            if (_roi.length() > 0) {
-                detail.append(_roi);
-                if (_value.length() > 0) {
-                    detail.append("并且").append(_value);
-                }
-            } else {
-                if (_value.length() > 0) {
-                    detail.append(_value);
-                }
-            }
-        }
-        return detail.toString();
-    }
-
-    /**
-     * 整理发送的消息
-     */
-    private String getMsg(String level, String detail, JSONObject cost, AlarmEventRule rule) {
-        StringBuffer header = new StringBuffer();
-        header.append(rule.getMetricValueName()).append("预警").append("<br/>").
-                append("您的账户:").append(cost.getString("accountId")).append(",授权名称为:").append(rule.getAccountName()).append("<br/>");
-        if ("ACCOUNT".equals(level)) {
-            header.append(detail);
-        } else if ("CAMPAIGN".equals(level)) {
-            header.append("计划ID:").append(rule.getCampaignId()).append(",计划名称为:").append(rule.getCampaignName()).append("<br/>").append(detail);
-        } else {
-            header.append("计划ID:").append(rule.getCampaignId()).append(",计划名称为:").append(rule.getCampaignName()).append("<br/>")
-                    .append("组ID:").append(rule.getUnitId()).append(",组名称为:").append(rule.getUnitName()).append("<br/>").append(detail);
-        }
-        String msg = null;
-        if ("PAUSE".equals(rule.getProcessMethod())) {
-            header.append("现已被关停,请您及时查看并调整!");
-            if (shutDown(rule, level)) {
-                msg = header.toString();
-            }
-        } else {
-            header.append("请您及时查看并调整!");
-            msg = header.toString();
-        }
-        return msg;
-    }
-
-
-    /**
-     * 获取成本数据。
-     *
-     * @param code : unit 组级数据,account 账户级数据
-     * @return java.util.List<cn.com.ctop.kuaishou.modules.report.entity.KuaishouCostGroup>
-     * @throws
-     * @author ZHAOXA
-     */
-    private List<JSONObject> getCostInfo(String code) {
-        HashOperations<String, Object, Object> hahs = DataSourceCachePool.getRedisTemplate().opsForHash();
-        return (List<JSONObject>) hahs.get("KS_COST", code);
-    }
-
-    /**
-     * 获取告警规则集合
-     *
-     * @param
-     * @return java.util.List<cn.com.ctop.alarm.modules.entity.AlarmEventRules>
-     * @throws
-     * @author ZHAOXA
-     */
-    private List<AlarmEventRule> getAllAlarmRules(String checkType) {
-        AlarmEventRule alarmEventRule = new AlarmEventRule();
-        alarmEventRule.setEventRuleStatus(NoEn.NO1.valueStr());
-        alarmEventRule.setCheckFrequency(checkType);
-        List<AlarmEventRule> ruleList = alarmEventRuleMapper.selectListPage(alarmEventRule);
-        if (!Check.isNull(ruleList)) {
-            for (AlarmEventRule rule : ruleList) {
-                rule.setAlarmEventMetrics(alarmEventMetricMapper.selectByEventRuleId(rule.getEventRuleId()));
-                if (!"ACCOUNT".equals(rule.getEventRuleLevel())) {
-                    if (NoEn.NO1.valueStr().equals(rule.getAppStatus())) {
-                        rule.setRel(getRel(rule));
-                    } else {
-                        rule.setRel(alarmRuleCampaignRelMapper.selectByRuleId(rule.getEventRuleId()));
-                    }
-                }
-            }
-        }
-        return ruleList;
-    }
-
-    private List<AlarmRuleCampaignRel> getRel(AlarmEventRule rule) {
-        List<AlarmRuleCampaignRel> relList = new ArrayList<>();
-        AlarmRuleCampaignRel rel = null;
-        if ("CAMPAIGN".equals(rule.getEventRuleLevel())) {
-            Map<String, Object> map = new HashMap<>();
-            map.put("put_status", NoEn.NO1.valueStr());
-            map.put("account_id", rule.getAccountId());
-            List<KuaiShouCampaign> kuaiShouCampaigns = kuaiShouCampaignMapper.selectByMap(map);
-            if (!Check.isNull(kuaiShouCampaigns)) {
-                for (KuaiShouCampaign campaign : kuaiShouCampaigns) {
-                    rel = new AlarmRuleCampaignRel();
-                    rel.setCampaignId(campaign.getCampaignId());
-                    rel.setCampaignName(campaign.getCampaignName());
-                    rel.setEventRuleLevel("CAMPAIGN");
-                    relList.add(rel);
-                }
-            }
-        }
-        if ("UNIT".equals(rule.getEventRuleLevel())) {
-            Map<String, Object> map = new HashMap<>();
-            map.put("putStatus", NoEn.NO1.valueStr());
-            map.put("accountId", rule.getAccountId());
-            if (Check.isNull(rule.getCampaignId())) {
-                map.put("campaignId", rule.getCampaignId());
-            }
-            List<KuaiShouGroup> kuaiShouGroups = kuaiShouGroupMapper.queryByMap(map);
-            if (!Check.isNull(kuaiShouGroups)) {
-                for (KuaiShouGroup kuaiShouGroup : kuaiShouGroups) {
-                    rel = new AlarmRuleCampaignRel();
-                    rel.setCampaignId(kuaiShouGroup.getCampaignId());
-                    rel.setCampaignName(kuaiShouGroup.getCampaignName());
-                    rel.setEventRuleLevel("CAMPAIGN");
-                    rel.setUnitId(kuaiShouGroup.getUnitId());
-                    rel.setUnitName(kuaiShouGroup.getUnitName());
-                    relList.add(rel);
-                }
-            }
-        }
-        return relList;
-    }
 }

+ 0 - 62
module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/impl/AlarmMetricValueServiceImpl.java

@@ -1,62 +0,0 @@
-package cn.com.ctop.alarm.modules.service.impl;
-
-import cn.com.ctop.alarm.modules.entity.AlarmMetricValue;
-import cn.com.ctop.alarm.modules.mapper.AlarmMetricValueMapper;
-import cn.com.ctop.alarm.modules.service.IAlarmMetricValueService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 指标字段记录表
- * depletion
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-10-29
- */
-@Slf4j
-@Service
-public class AlarmMetricValueServiceImpl extends ServiceImpl<AlarmMetricValueMapper, AlarmMetricValue> implements IAlarmMetricValueService {
-
-    @Autowired
-    private AlarmMetricValueMapper alarmMetricValueMapper;
-
-    @Override
-    public Result<Object> queryParentChildList(AlarmMetricValue alarmMetricValue) {
-        Result<Object> result = new Result<>();
-        List<AlarmMetricValue> list = alarmMetricValueMapper.queryListByLevel(alarmMetricValue);
-        List<AlarmMetricValue> resultList = new ArrayList<>();
-        Map<Integer, List<AlarmMetricValue>> map = new HashMap<>();
-        List<Integer> parents = new ArrayList<>();
-        for (AlarmMetricValue metricValue : list) {
-            if (0 == metricValue.getMetricParentId()) {
-                parents.add(metricValue.getMetricValueId());
-                resultList.add(metricValue);
-            }
-        }
-        for (Integer id : parents) {
-            List<AlarmMetricValue> childs = new ArrayList<>();
-            for (AlarmMetricValue metricValue : list) {
-                if (0 != metricValue.getMetricParentId()) {
-                    if (id == metricValue.getMetricParentId()) {
-                        childs.add(metricValue);
-                    }
-                }
-                map.put(id, childs);
-            }
-        }
-        for (AlarmMetricValue metricValue : resultList) {
-            metricValue.setChilds(map.get(metricValue.getMetricValueId()));
-        }
-        return Result.ok(resultList);
-    }
-}

+ 0 - 19
module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/impl/AlarmRuleCampaignRelServiceImpl.java

@@ -1,19 +0,0 @@
-package cn.com.ctop.alarm.modules.service.impl;
-
-import cn.com.ctop.alarm.modules.entity.AlarmRuleCampaignRel;
-import cn.com.ctop.alarm.modules.mapper.AlarmRuleCampaignRelMapper;
-import cn.com.ctop.alarm.modules.service.IAlarmRuleCampaignRelService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * 规则和计划、组关系表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-11-09
- */
-@Service
-public class AlarmRuleCampaignRelServiceImpl extends ServiceImpl<AlarmRuleCampaignRelMapper, AlarmRuleCampaignRel> implements IAlarmRuleCampaignRelService {
-
-}

+ 79 - 21
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;
@@ -46,6 +49,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.StringJoiner;
 import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * 规则组
@@ -93,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;
@@ -101,6 +108,8 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
     private final static String PLAN = "plan";
     private final static String CREATIVE = "creative";
 
+    static ExecutorService executorService = Executors.newFixedThreadPool(5);
+
     @Override
     public void checkRules() {
         log.info("------start------");
@@ -126,9 +135,11 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
             log.error("获取指标内容失败");
             return;
         }
-        for (RuleAccountTemplate templates : ruleAccountTemplates) {
+
+        ruleAccountTemplates.forEach(templates -> executorService.submit(() -> {
             matchAlarmRules(ruleGroupMap, indicators, templates);
-        }
+        }));
+
         Long endTime = System.currentTimeMillis();
         log.info("------end------共耗时: {} ms", endTime - startTime);
     }
@@ -215,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);
@@ -243,7 +254,8 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                         for (int i = 0; i < dimensionData.size(); i++) {
                             JSONObject obj = dimensionData.getJSONObject(i);
                             String value = obj.getString(ruleBase.getIndicatorCode());
-                            if (MatchLogic.matchCondition(indicator, ruleBase.getRuleCondition(), threshold, value, obj)) {
+                            if (MatchLogic.matchCondition(indicator, ruleBase.getRuleCondition(), threshold, value, obj, ruleBase.getIndicatorCode())) {
+                                alarmRuleRecord(obj, ruleGroup, ruleBase, indicator, type, threshold);
                                 complianceList.add(obj);
                             }
                         }
@@ -257,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    规则组对象
@@ -270,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();
@@ -323,8 +378,9 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
             //账户维度数据
             if (ACCOUNT.equals(ruleBase.getRuleDimension())) {
                 JSONObject accountEntity = dimensionData.getJSONObject(0);
-                if (MatchLogic.matchCondition(indicator, ruleBase.getRuleCondition(), threshold, accountEntity.getString(ruleBase.getIndicatorCode()), accountEntity)) {
+                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 {
@@ -346,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;
@@ -366,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;
@@ -386,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;
@@ -406,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;
@@ -449,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)) {
-                    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)) {
-                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;
@@ -642,7 +700,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
      * @throws
      * @author ZHAOXA
      */
-    private JSONObject getUserByAccountId(Long accountId) {
+    private synchronized JSONObject getUserByAccountId(Long accountId) {
         JSONObject obj = userObj.getJSONObject(accountId.toString());
         if (Check.isNull(obj)) {
             JSONObject user = sysUserMapper.selectUserByAccount(accountId);

+ 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;
 }

+ 1 - 2
module-common/src/main/java/cn/com/ctop/common/module/utils/CorpWexinUtils.java

@@ -50,8 +50,7 @@ public class CorpWexinUtils {
         }
     }
 
-
-    public static void sendMessageByWeChatId(String weChatId, String content) {
+    public synchronized static void sendMessageByWeChatId(String weChatId, String content) {
         if (wxCpService == null) {
             initService();
         }

+ 1 - 0
module-common/src/main/java/cn/com/ctop/common/module/utils/KuaishouInterfaceConstant.java

@@ -83,6 +83,7 @@ public class KuaishouInterfaceConstant {
      * 创建定向模板
      */
     public static final String TEMPLATE_CREATE = "/rest/openapi/v1/target/template/create";
+    public static final String TEMPLATE_UPDATE = "/rest/openapi/v1/target/template/update";
     /**
      * 获取地域信息
      */

+ 26 - 0
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaiShouAlarmRuleJob.java

@@ -0,0 +1,26 @@
+package cn.com.ctop.job.kuaishou.handler;
+
+
+import cn.com.ctop.alarm.modules.service.IRuleGroupService;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class KuaiShouAlarmRuleJob {
+    @Autowired
+    private IRuleGroupService ruleGroupService;
+
+    /**
+     * 定时任务
+     *
+     * @param
+     * @return
+     * @throws
+     * @author ZHAOXA
+     */
+    @XxlJob("kuaiShoualarmRuleJob")
+    public void execute() throws Exception {
+        ruleGroupService.checkRules();
+    }
+}

+ 43 - 0
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouAiSuzaoVideoJob.java

@@ -0,0 +1,43 @@
+package cn.com.ctop.job.kuaishou.handler;
+
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
+import cn.com.ctop.kuaishou.modules.ai.entity.AiKuaishouAccountTargetTemplate;
+import cn.com.ctop.kuaishou.modules.ai.service.IAiKuaishouAccountTargetTemplateService;
+import cn.com.ctop.kuaishou.modules.ai.service.IAiKuaishouNewCreateCampaign;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import org.jeecg.common.util.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+@Component
+public class KuaishouAiSuzaoVideoJob {
+    @Autowired
+    private IKuaishouInterfaceService kuaishouInterfaceService;
+    @Autowired
+    IAiKuaishouNewCreateCampaign aiKuaishouNewCreateCampaign;
+    @Autowired
+    private IAiKuaishouAccountTargetTemplateService aiKuaishouAccountTargetTemplateService;
+    @Autowired
+    private ICtopOauthTokenService tokenService;
+    @XxlJob("kuaishouAiSuzaoVideoJob")
+    public void kuaishouAiSuzaoVideoJob() {
+        List<AiKuaishouAccountTargetTemplate> accountTargetTemplates = aiKuaishouAccountTargetTemplateService.getAllEffectTemplate();
+        if(null==accountTargetTemplates||accountTargetTemplates.isEmpty()){
+            return;
+        }
+        accountTargetTemplates.forEach(targetTemplate -> {
+            CtopOauthToken token = tokenService.getTokenByAccountId(targetTemplate.getAccountId());
+            int timeStart = -3;
+            int timeEnd = 0;
+            Long now = System.currentTimeMillis();
+            String startTime = DateUtils.formatDate(new Date(now + timeStart*60*1000),"yyyy-MM-dd HH:mm:ss");
+            String endTime = DateUtils.formatDate(new Date(now + timeEnd*60*1000),"yyyy-MM-dd HH:mm:ss");
+            kuaishouInterfaceService.getSuZaoList(token.getAccessToken(), token.getAccountId(), 1, startTime,endTime);
+        });
+    }
+}

+ 0 - 5
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/controller/KuaiShouCreateController.java

@@ -83,7 +83,6 @@ public class KuaiShouCreateController {
             JSONObject data = new JSONObject();
             data.put("account_id", requestJson.getLong("account_id"));
             result.put("data", data);
-
         }
         return result;
     }
@@ -125,11 +124,7 @@ public class KuaiShouCreateController {
             JSONObject data = new JSONObject();
             data.put("account_id", requestJson.getLong("account_id"));
             result.put("data", data);
-
         }
         return result;
-
     }
-
-
 }

+ 1 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/controller/KuaiShouMaterialControer.java

@@ -106,6 +106,7 @@ public class KuaiShouMaterialControer {
 
     @PostMapping(value = "/getHistoryVideoList")
     public JSONObject getHistoryVideoList(@RequestBody JSONObject requestJson) {
+        System.err.println(requestJson);
         JSONObject returnJson = new JSONObject();
         try {
             if (Check.isNull(requestJson)) {

+ 2 - 5
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/AiKuaishouNewCreateCampaignServiceImpl.java

@@ -68,14 +68,11 @@ public class AiKuaishouNewCreateCampaignServiceImpl implements IAiKuaishouNewCre
 
         // 2.2 执行 素造的 视频拉取服务,时间过滤执行 yyyy-MM-dd HH:mm:ss
         // 时间差,单位为分钟
-        int timeStart = -25;
-        int timeEnd = -20;
+        int timeStart = -10;
+        int timeEnd = -5;
         Long now = System.currentTimeMillis();
         String startTime = DateUtils.formatDate(new Date(now + timeStart*60*1000),"yyyy-MM-dd HH:mm:ss");
         String endTime = DateUtils.formatDate(new Date(now + timeEnd*60*1000),"yyyy-MM-dd HH:mm:ss");
-        kuaishouInterfaceService.getSuZaoList(token.getAccessToken(), token.getAccountId(), 1, startTime,endTime);
-
-
         // 3、获取5分钟内,ctop_kuaishou_video_get 的视频数据,记为 N,如果有数据则执行下面步骤
         List<KuaiShouVideoGet> newVideos = videoGetService.getNewVideoBetweenTime(accountId,startTime,endTime);
         int newVideosCnt = newVideos.size();

+ 45 - 35
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/KuaiShouCreateServiceImpl.java

@@ -15,6 +15,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
@@ -32,26 +33,32 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
     private IMaterialCutFrameService cutFrameService;
     @Autowired
     private IKuaiShouMaterialUploadService uploadService;
+    @Autowired
+    private IKuaiShouVideoGetService videoGetService;
+
+    @Value("${ai.callback.callback-unit-url}")
+    private String unitUrl;
+    @Value("${ai.callback.callback-creative-url}")
+    private String creativeUrl;
 
     @Override
     public void createUnitAndCreative(CtopOauthToken oauthToken, Long campaign_id, JSONArray group_list) {
-
         JSONArray returnArr = new JSONArray();
-        try {
-            for (int i = 0; i < group_list.size(); i++) {
-                JSONObject groupCreateJson = group_list.getJSONObject(i);
-                if (Check.isNull(groupCreateJson)) {
-                    continue;
-                }
+        for (int i = 0; i < group_list.size(); i++) {
+            JSONObject groupCreateJson = group_list.getJSONObject(i);
+            if (Check.isNull(groupCreateJson)) {
+                continue;
+            }
+            String group_uuid = groupCreateJson.getString("group_uuid");
+            try {
                 JSONObject createJson = new JSONObject();
                 createJson.put("advertiser_id", oauthToken.getAccountId());
                 createJson.put("campaign_id", campaign_id);
                 createJson.put("unit_name", groupCreateJson.getString("unit_name")); // 组名称
-                createJson.put("bid_type", groupCreateJson.getString("bid_type")); // 组名称
+                createJson.put("bid_type", groupCreateJson.getString("bid_type")); // 出价类型
                 if (!Check.isNull(groupCreateJson.getInteger("use_app_market"))) {
                     createJson.put("use_app_market", groupCreateJson.getInteger("use_app_market")); // 优先从系统应用商店下载
                 }
-
                 if (!Check.isNull(groupCreateJson.getJSONArray("app_store"))) {
                     createJson.put("app_store", groupCreateJson.getJSONArray("app_store")); //应用商店列表
                 }
@@ -140,7 +147,6 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 if (!Check.isNull(groupCreateJson.getBoolean("auto_create_photo"))) {
                     createJson.put("auto_create_photo", groupCreateJson.getBoolean("auto_create_photo")); //是否开启自动生成视频
                 }
-
                 if (!Check.isNull(groupCreateJson.getLong("item_id"))) {
                     createJson.put("item_id", groupCreateJson.getLong("item_id")); //电商关联Id (小店通)
                 }
@@ -155,12 +161,12 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 } else {
                     JSONObject target = getTarget(groupCreateJson);
                     if (!Check.isNull(target)) {
-                        createJson.put("getTarget", target); // 定向数据
+                        createJson.put("target", target); // 定向数据
                     }
                 }
                 Map<String, Object> unitMap = iKuaishouInterfaceService.adUnitCreate(oauthToken.getAccessToken(), oauthToken.getAccountId(), createJson, 1);
                 JSONObject returnJson = new JSONObject();
-                returnJson.put("table_id", groupCreateJson.getLong("table_id"));
+                returnJson.put("group_uuid", group_uuid);
                 if ((Integer) unitMap.get("code") == 0) {
                     Long unitId = (Long) unitMap.get("unitId");
                     returnJson.put("unit_id", unitId);
@@ -182,18 +188,18 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                     returnJson.put("message", unitMap.get("message"));
                 }
                 returnArr.add(returnJson);
+            } catch (Exception e) {
+                JSONObject returnJson = new JSONObject();
+                returnJson.put("group_uuid", group_uuid);
+                returnJson.put("code", -1);
+                returnJson.put("message", e.getMessage());
+                returnArr.add(returnJson);
             }
-            callback("url", returnArr);
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.error("创建组错误!!!!!");
         }
+        callback(unitUrl, returnArr, "unit");
     }
 
 
-    @Autowired
-    private IKuaiShouVideoGetService videoGetService;
-
     /**
      * 创建广告创意
      *
@@ -203,12 +209,13 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
      */
     private void createCreative(CtopOauthToken oauthToken, Long unit_id, JSONArray creative_list) {
         JSONArray returnArr = new JSONArray();
-        try {
-            for (int i = 0; i < creative_list.size(); i++) {
-                JSONObject creativeJson = creative_list.getJSONObject(i);
-                if (Check.isNull(creativeJson)) {
-                    continue;
-                }
+        for (int i = 0; i < creative_list.size(); i++) {
+            JSONObject creativeJson = creative_list.getJSONObject(i);
+            if (Check.isNull(creativeJson)) {
+                continue;
+            }
+            String creative_uuid = creativeJson.getString("creative_uuid");
+            try {
                 JSONObject createJson = new JSONObject();
                 createJson.put("advertiser_id", oauthToken.getAccountId());
                 createJson.put("unit_id", unit_id);
@@ -279,7 +286,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 }
                 Map<String, Object> creativeMap = iKuaishouInterfaceService.creativeCreate(oauthToken.getAccessToken(), oauthToken.getAccountId(), createJson, 1);
                 JSONObject returnJson = new JSONObject();
-                returnJson.put("table_id", creativeJson.getLong("table_id"));
+                returnJson.put("creative_uuid", creative_uuid);
                 if ((Integer) creativeMap.get("code") == 0) {
                     Long creativeId = (Long) creativeMap.get("creativeId");
                     returnJson.put("creative_id", creativeId);
@@ -291,19 +298,25 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                     returnJson.put("message", creativeMap.get("message"));
                 }
                 returnArr.add(returnJson);
+            } catch (Exception e) {
+                e.printStackTrace();
+                JSONObject returnJson = new JSONObject();
+                returnJson.put("creative_uuid", creative_uuid);
+                returnJson.put("message", e.getMessage());
+                returnJson.put("code", -1);
+                returnArr.add(returnJson);
             }
-            callback("url", returnArr);
-        } catch (Exception e) {
-            e.printStackTrace();
         }
+        callback(creativeUrl, returnArr, "creative");
+
     }
 
-    private void callback(String url, JSONArray requestArr) {
+    private void callback(String url, JSONArray requestArr, String type) {
         JSONObject requestJson = new JSONObject();
         requestJson.put("callbackData", requestArr);
         String s = HttpUtils2.httpPostRequest(url, requestJson, null);
         JSONObject jsonObject = JSONObject.parseObject(s);
-        log.info("回调数据返回结果:{}", jsonObject);
+        log.info("{},回调数据返回结果:{}", type, jsonObject);
     }
 
     private String getImageToken(String md5, Long accountId, String accessToken) {
@@ -320,12 +333,10 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
             if (!Check.isNull(cutFrame)) {
                 imageToken = uploadService.kuauiShouImageUpload(cutFrame.getUrl(), md5, accountId, accessToken);
             }
-
         }
         return imageToken;
     }
 
-
     private JSONObject getTarget(JSONObject unitJson) {
         JSONObject target = new JSONObject();
         if (!Check.isNull(unitJson.getJSONArray("region"))) {
@@ -344,7 +355,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
             target.put("age", age); //自定义年龄段
         }
         if (!Check.isNull(unitJson.getJSONArray("ages_range"))) {
-            target.put("ages_range", unitJson.getInteger("ages_range")); // 固定年龄段
+            target.put("ages_range", unitJson.getJSONArray("ages_range")); // 固定年龄段
         }
         if (!Check.isNull(unitJson.getInteger("gender"))) {
             target.put("gender", unitJson.getInteger("gender")); // 性别
@@ -410,7 +421,6 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 intelli_extend.put("no_area_break", unitJson.getInteger("no_area_break")); //  不可突破地域
             }
             target.put("intelli_extend", intelli_extend); // 智能扩量
-
         }
         if (Check.isNull(unitJson.getJSONObject("behavior_interest"))) {
             // TODO 只是单独结构体 后续需要优化

+ 8 - 5
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

@@ -1,8 +1,10 @@
 package cn.com.ctop.kuaishou.modules.batch.service.impl;
 
 import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.entity.MaterialCutFrame;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.enums.MaterialEnum;
+import cn.com.ctop.common.module.service.IMaterialCutFrameService;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.*;
 import cn.com.ctop.kuaishou.modules.batch.entity.*;
@@ -2922,7 +2924,6 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
         }
         String result = HttpUtils.httpPostRequest(url, param, headers);
         JSONObject resultJson = JSONObject.parseObject(result);
-//        System.out.println(resultJson.toJSONString());
         if (Check.isNull(resultJson)) {
             return;
         }
@@ -2973,12 +2974,12 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                 suZhaoService.submit(new Runnable() {
                     @Override
                     public void run() {
-                        videoGetService.getKeyFrame(token, accountId, md5, String.valueOf(photo_id));
-
+                        List<MaterialCutFrame> cutFrames = cutFrameService.getListByVideoSignature(md5);
+                        if(null==cutFrames||cutFrames.isEmpty()){
+                            videoGetService.getKeyFrame(token, accountId, md5, String.valueOf(photo_id));
+                        }
                     }
                 });
-
-
             }
         }
 
@@ -2986,6 +2987,8 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
 
     }
 
+    @Autowired
+    private IMaterialCutFrameService cutFrameService;
     private static ExecutorService executorService = Executors.newFixedThreadPool(10);
 
     @Override

+ 28 - 21
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouTemplateServiceImpl.java

@@ -346,8 +346,12 @@ public class KuaishouTemplateServiceImpl extends ServiceImpl<KuaishouTemplateMap
             }
 
             JSONObject param = new JSONObject();
+            param.put("template_id", requestJson.getLong("templateId"));
             param.put("advertiser_id", accountId);
-            param.put("template_name", requestJson.getString("templateName"));
+            if(!Check.isNull(requestJson.getString("templateName"))){
+                param.put("template_name", requestJson.getString("templateName"));
+            }
+
             JSONObject targetJson = new JSONObject();
             if (!Check.isNull(requestJson.getJSONArray("region"))) {
                 targetJson.put("region", requestJson.getJSONArray("region"));
@@ -362,14 +366,11 @@ public class KuaishouTemplateServiceImpl extends ServiceImpl<KuaishouTemplateMap
                 targetJson.put("ages_range", requestJson.getJSONArray("agesRange"));
             }
 
-            JSONObject ageJson = new JSONObject();
-            if (!Check.isNull(requestJson.getInteger("min"))) {
+
+            if (!Check.isNull(requestJson.getInteger("min")) && !Check.isNull(requestJson.getInteger("max"))) {
+                JSONObject ageJson = new JSONObject();
                 ageJson.put("min", requestJson.getInteger("min"));
-            }
-            if (!Check.isNull(requestJson.getInteger("max"))) {
                 ageJson.put("max", requestJson.getInteger("max"));
-            }
-            if (!Check.isNull(ageJson)) {
                 targetJson.put("age", ageJson);
             }
 
@@ -424,23 +425,27 @@ public class KuaishouTemplateServiceImpl extends ServiceImpl<KuaishouTemplateMap
             if (!Check.isNull(requestJson.getJSONArray("excludePopulation"))) {
                 targetJson.put("exclude_population", requestJson.getJSONArray("excludePopulation"));
             }
-            JSONObject intelliExtendJson = new JSONObject();
+
 
             if (!Check.isNull(requestJson.getInteger("isOpen"))) {
+                JSONObject intelliExtendJson = new JSONObject();
                 intelliExtendJson.put("is_open", requestJson.getInteger("isOpen"));
+
+                if (!Check.isNull(requestJson.getInteger("noAgeBreak"))) {
+                    intelliExtendJson.put("no_age_break", requestJson.getInteger("noAgeBreak"));
+                }
+                if (!Check.isNull(requestJson.getInteger("noGenderBreak"))) {
+                    intelliExtendJson.put("no_gender_break", requestJson.getInteger("noGenderBreak"));
+                }
+                if (!Check.isNull(requestJson.getInteger("noAreaBreak"))) {
+                    intelliExtendJson.put("no_area_break", requestJson.getInteger("noAreaBreak"));
+                }
+                if (!Check.isNull(intelliExtendJson)) {
+                    targetJson.put("intelli_extend", intelliExtendJson);
+                }
+
             }
-            if (!Check.isNull(requestJson.getInteger("noAgeBreak"))) {
-                intelliExtendJson.put("no_age_break", requestJson.getInteger("noAgeBreak"));
-            }
-            if (!Check.isNull(requestJson.getInteger("noGenderBreak"))) {
-                intelliExtendJson.put("no_gender_break", requestJson.getInteger("noGenderBreak"));
-            }
-            if (!Check.isNull(requestJson.getInteger("noAreaBreak"))) {
-                intelliExtendJson.put("no_area_break", requestJson.getInteger("noAreaBreak"));
-            }
-            if (!Check.isNull(intelliExtendJson)) {
-                targetJson.put("intelli_extend", intelliExtendJson);
-            }
+
             if (!Check.isNull(targetJson)) {
                 param.put("target", targetJson);
             }
@@ -448,9 +453,11 @@ public class KuaishouTemplateServiceImpl extends ServiceImpl<KuaishouTemplateMap
             Map<String, String> headers = new HashMap<String, String>();
             headers.put("Access-Token", accessToken);
             headers.put("Content-Type", " application/json");
-            String url = PropertiesUtils.getConfig("kuaishou_api_url") + KuaishouInterfaceConstant.TEMPLATE_CREATE;
+            System.err.println("入参:" + param.toJSONString());
+            String url = PropertiesUtils.getConfig("kuaishou_api_url") + KuaishouInterfaceConstant.TEMPLATE_UPDATE;
             String result = HttpUtils.kuaiShouhttpPostRequest(url, param.toJSONString(), headers);
             JSONObject resultJson = JSONObject.parseObject(result);
+            System.err.println("返回:" + resultJson.toJSONString());
             if (!Check.isNull(resultJson)) {
                 Integer code = resultJson.getInteger("code");
                 if (code == 0) {

+ 0 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaiShouGetAccountFundServiceImpl.java

@@ -24,10 +24,8 @@ public class KuaiShouGetAccountFundServiceImpl implements IKuaiShouGetAccountFun
         Map<String, String> headers = new HashMap<>();
         headers.put("Content-Type", "application/json");
         headers.put("Access-Token", token.getAccessToken());
-
         JSONObject params=new JSONObject();
         params.put("advertiser_id",advertiserId);
-
         JSONObject jsonObject = JSONObject.parseObject(HttpUtils.httpGetRequest("https://ad.e.kuaishou.com/rest/openapi/v1/advertiser/fund/get", headers,params));
         if(jsonObject.getInteger("code")!=0){
             XxlJobHelper.log("查询账户余额失败==》accountId:{},message:{}", token.getAccountId(), jsonObject.getString("message"));
@@ -38,7 +36,6 @@ public class KuaiShouGetAccountFundServiceImpl implements IKuaiShouGetAccountFun
 
     @Override
     public JSONObject getAccountReportBy(CtopOauthToken token, Long advertiserId) {
-
         JSONObject result= new JSONObject();
         Map<String, String> headers = new HashMap<>();
         headers.put("Content-Type", "application/json");