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

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

@@ -80,12 +80,22 @@ public class GamePolicyConfigListVO {
     /**
      * 告警人员ID
      */
-    private List<Long> userNameStr;
+    private List<Long> userNameIds;
 
     /**
      * 排除标签名字符串 ID
      */
-    private List<Long> tagsNameStr;
+    private List<Long> tagsNameIds;
+
+    /**
+     * 告警人员
+     */
+    private String userNameStr;
+
+    /**
+     * 排除标签名字符串
+     */
+    private String tagsNameStr;
 
     /**
      * 创建时间

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

@@ -141,6 +141,28 @@ public class GamePolicyConfigServiceImpl extends ServiceImpl<GamePolicyConfigMap
                 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;
+        //告警人员名称
+        StringBuilder userNameStr = new StringBuilder();
+        if (StringUtils.isNotBlank(vo.getUserIds())) {
+            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) {
+                    userNameStr.append(",");
+                }
+            }
+        }
+        //排除标签名称
+        StringBuilder tagNameStr = new StringBuilder();
+        if (StringUtils.isNotBlank(vo.getTagIds())) {
+            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) {
+                    tagNameStr.append(",");
+                }
+            }
+        }
         return GamePolicyConfigListVO.builder()
                 .id(vo.getId())
                 .superGameId(vo.getSuperGameId())
@@ -151,8 +173,10 @@ public class GamePolicyConfigServiceImpl extends ServiceImpl<GamePolicyConfigMap
                 .time(StringUtils.isBlank(time) ? null : Long.valueOf(time))
                 .timeCondition(StringUtils.isBlank(timeCondition) ? null : timeCondition)
                 .configExplain(vo.getConfigExplain())
-                .userNameStr(userIds)
-                .tagsNameStr(tagIds)
+                .userNameStr(StringUtils.isBlank(userNameStr.toString()) ? null : userNameStr.toString())
+                .userNameIds(userIds)
+                .tagsNameStr(StringUtils.isBlank(tagNameStr.toString()) ? null : tagNameStr.toString())
+                .tagsNameIds(tagIds)
                 .createBy(vo.getCreateBy())
                 .createName(sysUserRpc.getById(vo.getCreateBy()).getData().getNickname())
                 .createTime(vo.getCreateTime())