Explorar el Código

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-boot

xuzuoyun hace 4 años
padre
commit
0e58c3f09b

+ 2 - 0
module-alarm/src/main/java/cn/com/ctop/alarm/modules/entity/AlarmEventSend.java

@@ -62,6 +62,8 @@ public class AlarmEventSend {
     private String alarmStatus;
 
     private String ruleDimension;
+
+    private String mediaType;
     /**
      * createTime
      */

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

@@ -613,6 +613,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                 send.setAlarmDetail(msg.replace("<br/>", ","));
                 send.setAlarmStatus(NoEn.NO1.valueStr());
                 send.setGroupId(ruleGroup.getId());
+                send.setMediaType((NoEn.NO1.valueInt() == mediaType || NoEn.NO3.valueInt() == mediaType) ? "头条" : "快手");
                 send.setGroupName(ruleGroup.getGroupName());
                 if (CREATIVE.equals(type)) {
                     send.setRuleDimension(type);

+ 1 - 1
pom.xml

@@ -91,7 +91,7 @@
         <java.version>1.8</java.version>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <mybatis-plus.version>3.3.2</mybatis-plus.version>
+        <mybatis-plus.version>3.1.2</mybatis-plus.version>
         <druid.version>1.1.10</druid.version>
         <commons.version>2.6</commons.version>
         <aliyun-java-sdk-core.version>3.5.0</aliyun-java-sdk-core.version>