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

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameAdPolicyAddOrUpdateParam.java

@@ -7,9 +7,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Set;
 
 /**
  * @author tianhua
@@ -138,28 +136,4 @@ public class GameAdPolicyAddOrUpdateParam {
     @ApiModelProperty("规则条件(最多可同事设置5个指标条件)")
     private List<GameAdRuleConditionVO> ruleCondition;
 
-    /**
-     * 规则下的账号白名单（','间隔）
-     */
-    @ApiModelProperty("规则下的账号白名单")
-    private Set<Long> accountWhitelist;
-
-    /**
-     * 规则下的账号白名单有效时间类型：1-当日有效（自然日）;2-长期有效
-     */
-    @ApiModelProperty("规则下的账号白名单有效时间类型：1-当日有效（自然日）;2-长期有效")
-    private Integer accountValidTime;
-
-    /**
-     * 规则下的广告白名单（','间隔）
-     */
-    @ApiModelProperty("规则下的广告白名单")
-    private Set<Long> adWhitelist;
-
-    /**
-     * 规则下的广告白名单有效时间类型：1-当日有效（自然日）;2-长期有效
-     */
-    @ApiModelProperty("规则下的广告白名单有效时间类型：1-当日有效（自然日）;2-长期有效")
-    private Integer adValidTime;
-
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameAdPolicyBatchOperationParam.java

@@ -1,19 +1,16 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.manage.pojo.vo.GameAdRuleConditionVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 import java.util.Set;
 
 /**
  * @author tianhua
  * @version 1.0
- * @description: TODO
+ * @description: 批量操作参数列表
  * @date 2023/12/28 15:53
  */
 @Data

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/GameAdPolicyListVO.java

@@ -64,9 +64,9 @@ public class GameAdPolicyListVO {
     private Integer mediaType;
 
     /**
-     * 规则维度：1-默认;2-渠道;1-账号;1-广告
+     * 规则维度：1-默认;2-渠道;3-账号;4-广告
      */
-    @ApiModelProperty(notes = "规则维度：1-默认;2-渠道;1-账号;1-广告")
+    @ApiModelProperty(notes = "规则维度：1-默认;2-渠道;3-账号;4-广告")
     private Integer ruleDimension;
 
     /**

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/GameAdRuleConditionVO.java

@@ -6,6 +6,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
+
 /**
  * @author tianhua
  * @version 1.0
@@ -54,6 +56,6 @@ public class GameAdRuleConditionVO {
      * 具体数据数值
      */
     @ApiModelProperty(notes = "具体数值")
-    private Long dataNum;
+    private BigDecimal dataNum;
 
 }

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

@@ -97,42 +97,14 @@ public class GameAdMonitorServiceImpl extends ServiceImpl<GameAdMonitorMapper, G
                 .executeScope(param.getExecuteScope())
                 .dataVisitsPeriod(param.getDataVisitsPeriod())
                 .ruleCondition(JsonUtil.toString(param.getRuleCondition()))
-                .accountWhitelist(CollectionUtils.isEmpty(param.getAccountWhitelist()) ? null :
-                        StringUtils.join(param.getAccountWhitelist().toArray(), "-"))
-                .accountValidTime(param.getAccountValidTime() == null ? null : param.getAccountValidTime())
-                .adWhitelist(CollectionUtils.isEmpty(param.getAdWhitelist()) ? null :
-                        StringUtils.join(param.getAdWhitelist().toArray(), "-"))
-                .adValidTime(param.getAdValidTime() == null ? null : param.getAdValidTime())
                 .updateBy(sysUserId)
                 .updateTime(now)
                 .build();
 
         if (param.getId() != null) {
             //id不为空表示更新
-            return update(new LambdaUpdateWrapper<GameAdMonitor>()
-                    .set(GameAdMonitor::getRuleName, gameAdMonitor.getRuleName())
-                    .set(GameAdMonitor::getRuleType, gameAdMonitor.getRuleType())
-                    .set(GameAdMonitor::getDepartment, gameAdMonitor.getDepartment())
-                    .set(GameAdMonitor::getGameId, gameAdMonitor.getGameId())
-                    .set(GameAdMonitor::getMediaType, gameAdMonitor.getMediaType())
-                    .set(GameAdMonitor::getRuleDimension, gameAdMonitor.getRuleDimension())
-                    .set(GameAdMonitor::getEffectiveScope, gameAdMonitor.getEffectiveScope())
-                    .set(GameAdMonitor::getIsStart, gameAdMonitor.getIsStart())
-                    .set(GameAdMonitor::getAlarmType, gameAdMonitor.getAlarmType())
-                    .set(GameAdMonitor::getAlarmFrequency, gameAdMonitor.getAlarmFrequency())
-                    .set(GameAdMonitor::getAlarmCount, gameAdMonitor.getAlarmCount())
-                    .set(GameAdMonitor::getOperateDimension, gameAdMonitor.getOperateDimension())
-                    .set(GameAdMonitor::getOperateType, gameAdMonitor.getOperateType())
-                    .set(GameAdMonitor::getExecuteScope, gameAdMonitor.getExecuteScope())
-                    .set(GameAdMonitor::getDataVisitsPeriod, gameAdMonitor.getDataVisitsPeriod())
-                    .set(GameAdMonitor::getRuleCondition, gameAdMonitor.getRuleCondition())
-                    .set(GameAdMonitor::getAccountWhitelist, gameAdMonitor.getAccountWhitelist())
-                    .set(GameAdMonitor::getAccountValidTime, gameAdMonitor.getAccountValidTime())
-                    .set(GameAdMonitor::getAdWhitelist, gameAdMonitor.getAdWhitelist())
-                    .set(GameAdMonitor::getAdValidTime, gameAdMonitor.getAdValidTime())
-                    .set(GameAdMonitor::getUpdateBy, sysUserId)
-                    .set(GameAdMonitor::getUpdateTime, now)
-                    .eq(GameAdMonitor::getId, param.getId()));
+            gameAdMonitor.setId(param.getId());
+            return updateById(gameAdMonitor);
         }
         //id为空表示要新建一条规则
         gameAdMonitor.setCreateBy(sysUserId);