Merge branch 'package' of GameCenter/game-center into dev

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/GameMonitorAlarmServiceImpl.java

@@ -45,7 +45,7 @@ public class GameMonitorAlarmServiceImpl implements IGameMonitorAlarmService {
         //结果
         try{
             List<GameMonitorAlarmVO> list = sql.getList(GameMonitorAlarmVO.class).stream().map(vo -> {
-                String[] pitcherIds = vo.getPitcherId().split(",");
+                String[] pitcherIds = vo.getPitcherId().split("-");
                 for (String pitcherId : pitcherIds) {
                     //发送给多个投手
                     dingTalkMsgRpc.sendByUserId(Long.valueOf(pitcherId), alarmStr(vo));

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GamePolicyConfigServiceImpl.java

@@ -88,8 +88,8 @@ public class GamePolicyConfigServiceImpl extends ServiceImpl<GamePolicyConfigMap
                 .type(param.getType())
                 .configParam(configParam)
                 .configExplain(param.getConfigExplain())
-                .userIds(CollectionUtils.isEmpty(param.getUserIds()) ? null : StringUtils.join(param.getUserIds().toArray(), ","))
-                .tagIds(CollectionUtils.isEmpty(param.getTagIds()) ? null : StringUtils.join(param.getTagIds().toArray(), ","))
+                .userIds(CollectionUtils.isEmpty(param.getUserIds()) ? null : StringUtils.join(param.getUserIds().toArray(), "-"))
+                .tagIds(CollectionUtils.isEmpty(param.getTagIds()) ? null : StringUtils.join(param.getTagIds().toArray(), "-"))
                 .updateBy(sysUserId)
                 .updateTime(now)
                 .build();
@@ -138,13 +138,13 @@ public class GamePolicyConfigServiceImpl extends ServiceImpl<GamePolicyConfigMap
         GameDTO game = gameService.getById(vo.getSuperGameId());
         String superGameName = null == gameSupper ? (null == game ? null : game.getName()) : gameSupper.getName();
         List<Long> userIds = StringUtils.isNotBlank(vo.getUserIds()) ?
-                Arrays.stream(vo.getUserIds().split(",")).map(Long::valueOf).collect(Collectors.toList()) : null;
+                Arrays.stream(vo.getUserIds().split("-")).map(Long::valueOf).collect(Collectors.toList()) : null;
         List<Long> tagIds = StringUtils.isNotBlank(vo.getTagIds()) ?
-                Arrays.stream(vo.getTagIds().split(",")).map(Long::valueOf).collect(Collectors.toList()) : null;
+                Arrays.stream(vo.getTagIds().split("-")).map(Long::valueOf).collect(Collectors.toList()) : null;
         //告警人员名称
         StringBuilder userNameStr = new StringBuilder();
         if (StringUtils.isNotBlank(vo.getUserIds())) {
-            String[] ids = vo.getUserIds().split(",");
+            String[] ids = vo.getUserIds().split("-");
             for (int i = 0; i < ids.length; i++) {
                 userNameStr.append(sysUserRpc.getById(Long.valueOf(ids[i])).getData().getNickname());
                 if (i != ids.length -1) {
@@ -155,7 +155,7 @@ public class GamePolicyConfigServiceImpl extends ServiceImpl<GamePolicyConfigMap
         //排除标签名称
         StringBuilder tagNameStr = new StringBuilder();
         if (StringUtils.isNotBlank(vo.getTagIds())) {
-            String[] tIds = vo.getTagIds().split(",");
+            String[] tIds = vo.getTagIds().split("-");
             for (int i = 0; i < tIds.length; i++) {
                 tagNameStr.append(ExcludeTagsEnum.getTagName(Integer.valueOf(tIds[i])));
                 if (i != tIds.length -1) {

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/GameAdMonitor.java

@@ -0,0 +1,154 @@
+package com.zanxiang.game.module.mybatis.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 游戏广告监控告警配置表(TGameAdMonitor)实体类
+ *
+ * @author makejava
+ * @since 2023-12-28 13:45:09
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
+@Builder
+@TableName("t_game_applet_shell")
+public class GameAdMonitor implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+     /**
+      * 主键id
+      */
+     @TableId(value = "id", type = IdType.AUTO)
+     private Long id;
+    
+     /**
+     * 规则名称
+     */     
+     private String ruleName;
+    
+     /**
+     * 规则类型：1-个人规则
+     */     
+     private Integer ruleType;
+    
+     /**
+     * 部门类型：1-游戏投放
+     */     
+     private Integer department;
+    
+     /**
+     * 游戏ID（子游戏维度）
+     */     
+     private Long gameId;
+    
+     /**
+     * 媒体类型：1-腾讯; 2-头条
+     */     
+     private Integer mediaType;
+    
+     /**
+     * 规则维度：1-默认;2-渠道;1-账号;1-广告
+     */     
+     private Integer ruleDimension;
+    
+     /**
+     * 生效范围(依据规则维度变化)：ALLADS（默认维度：当前创建人的所有广告）;其他（对应规则维度的ID字符串，逗号间隔）
+     */     
+     private String effectiveScope;
+    
+     /**
+     * 告警方式：1-短信;2-电话;3-钉钉
+     */     
+     private Integer alarmType;
+    
+     /**
+     * 通知频率，单位：分钟/次
+     */     
+     private Integer alarmFrequency;
+    
+     /**
+     * 通知总次数
+     */     
+     private Integer alarmCount;
+    
+     /**
+     * 操作维度：1-广告
+     */     
+     private Integer operateDimension;
+    
+     /**
+     * 操作类型：1-仅告警通知;2-暂停广告;3-启动广告;4-增加预算;5-减少预算;6-广告置顶标黄;7-广告置顶标红
+     */     
+     private Integer operateType;
+    
+     /**
+     * 执行范围：1-所有广告（不含删除）;2-投放中;3-暂停投放;4-预算不足
+     */     
+     private Integer executeScope;
+    
+     /**
+     * 数据巡视周期：1-实时
+     */     
+     private Integer dataVisitsPeriod;
+    
+     /**
+     * 规则条件（json存储对象格式，最多可同事设置5个指标条件）
+     */     
+     private String ruleCondition;
+    
+     /**
+     * 规则下的账号白名单（字符串形式，逗号隔开）
+     */     
+     private String accountWhitelist;
+    
+     /**
+     * 规则下的账号白名单有效时间类型：1-当日有效（自然日）;2-长期有效
+     */     
+     private Integer accountValidTime;
+    
+     /**
+     * 规则下的广告白名单（字符串形式，逗号隔开）
+     */     
+     private String adWhitelist;
+    
+     /**
+     * 规则下的广告白名单有效时间类型：1-当日有效（自然日）;2-长期有效
+     */     
+     private Integer adValidTime;
+    
+     /**
+     * 创建时间
+     */     
+     private Date createTime;
+    
+     /**
+     * 创建者
+     */     
+     private Long createBy;
+    
+     /**
+     * 更新时间
+     */     
+     private Date updateTime;
+    
+     /**
+     * 更新者
+     */     
+     private Long updateBy;
+    
+     /**
+     * 规则是否可用：1-可用; 0-不可用
+     */     
+     private Integer enabled;
+
+}
+