游戏策略配置

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/GamePolicyConfigController.java

@@ -31,21 +31,21 @@ public class GamePolicyConfigController {
 
     @ApiOperation(value = "游戏策略配置新增或修改")
     @PostMapping("/add/or/update")
-    //@PreAuthorize(permissionKey = "manage:gamePolicy:addOrUpdate")
+    @PreAuthorize(permissionKey = "manage:gamePolicy:addOrUpdate")
     public ResultVO<Boolean> addOrUpdate(@Validated @RequestBody GamePolicyConfigAddOrUpdateParam param) {
         return ResultVO.ok(gamePolicyConfigService.addOrUpdate(param));
     }
 
     @ApiOperation(value = "游戏策略配置删除")
     @DeleteMapping("/deleteById/{id}")
-    //@PreAuthorize(permissionKey = "manage:gamePolicy:delete")
+    @PreAuthorize(permissionKey = "manage:gamePolicy:delete")
     public ResultVO<Boolean> deleteById(@PathVariable("id") Long id) {
         return ResultVO.ok(gamePolicyConfigService.deleteById(id));
     }
 
     @ApiOperation(value = "游戏策略配置列表")
     @PostMapping("/listOfPage")
-    //@PreAuthorize(permissionKey = "manage:gamePolicy:listOfPage")
+    @PreAuthorize(permissionKey = "manage:gamePolicy:listOfPage")
     public ResultVO<IPage<GamePolicyConfigListVO>> listOfPage(@RequestBody GamePolicyConfigListParam param) {
         return ResultVO.ok(gamePolicyConfigService.listOfPage(param));
     }

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

@@ -46,4 +46,11 @@ public class GamePolicyConfigAddOrUpdateParam {
     @ApiModelProperty("时间（单位：小时）")
     private Long time;
 
+    /**
+     * 配置说明
+     */
+    @NotNull(message = "配置说明不能为空")
+    @ApiModelProperty("配置说明：请写出具体的配置细节。如：首次充值金额大于500并且注册时间24小时内的用户，发送钉钉消息")
+    private String configExplain;
+
 }

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

@@ -60,6 +60,11 @@ public class GamePolicyConfigListVO {
     @ApiModelProperty("时间（单位：小时）")
     private Long time;
 
+    /**
+     * 配置说明
+     */
+    private String configExplain;
+
     /**
      * 创建时间
      */

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

@@ -50,7 +50,7 @@ public class GamePolicyConfigServiceImpl extends ServiceImpl<GamePolicyConfigMap
             throw new BaseException("策略配置的金额和时间不能同时为空，请重新输入。");
         }
         //当前操作人员
-        //Long sysUserId = SecurityUtil.getUserId();
+        Long sysUserId = SecurityUtil.getUserId();
         //当前操作时间
         LocalDateTime now = LocalDateTime.now();
 
@@ -75,7 +75,8 @@ public class GamePolicyConfigServiceImpl extends ServiceImpl<GamePolicyConfigMap
                 .superGameId(param.getSuperGameId())
                 .type(param.getType())
                 .configParam(configParam)
-                .updateBy(2L) // 测试用2
+                .configExplain(param.getConfigExplain())
+                .updateBy(sysUserId)
                 .updateTime(now)
                 .build();
 
@@ -86,7 +87,7 @@ public class GamePolicyConfigServiceImpl extends ServiceImpl<GamePolicyConfigMap
         }
 
         //id为空，表示新增配置
-        gamePolicyConfig.setCreateBy(1L); //测试用1
+        gamePolicyConfig.setCreateBy(sysUserId);
         gamePolicyConfig.setCreateTime(now);
         return save(gamePolicyConfig);
     }
@@ -95,10 +96,10 @@ public class GamePolicyConfigServiceImpl extends ServiceImpl<GamePolicyConfigMap
     @Transactional(rollbackFor = Exception.class)
     public boolean deleteById(Long id) {
         //当前操作人员
-        //Long sysUserId = SecurityUtil.getUserId();
+        Long sysUserId = SecurityUtil.getUserId();
         return update(new LambdaUpdateWrapper<GamePolicyConfig>()
                 .set(GamePolicyConfig::getEnabled, false)
-                .set(GamePolicyConfig::getUpdateBy, 3L) //测试用3
+                .set(GamePolicyConfig::getUpdateBy, sysUserId)
                 .set(GamePolicyConfig::getUpdateTime, LocalDateTime.now())
                 .eq(GamePolicyConfig::getId, id));
     }
@@ -125,11 +126,12 @@ public class GamePolicyConfigServiceImpl extends ServiceImpl<GamePolicyConfigMap
                 .type(vo.getType())
                 .amount(amount == null ? null : Long.valueOf(amount))
                 .time(time == null ? null : Long.valueOf(time))
+                .configExplain(vo.getConfigExplain())
                 .createBy(vo.getCreateBy())
-                .createName("创建者")
+                .createName(sysUserRpc.getById(vo.getCreateBy()).getData().getNickname())
                 .createTime(vo.getCreateTime())
                 .updateBy(vo.getUpdateBy())
-                .updateName("修改者")
+                .updateName(sysUserRpc.getById(vo.getUpdateBy()).getData().getNickname())
                 .updateTime(vo.getUpdateTime())
                 .build();
     }

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

@@ -42,6 +42,11 @@ public class GamePolicyConfig {
      */
     private String configParam;
 
+    /**
+     * 配置说明
+     */
+    private String configExplain;
+
     /**
      * 创建时间
      */