fix : Websocket代码优化

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/ManageApplication.java

@@ -23,7 +23,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 <Websocket快捷回复的增删改查1> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 <Websocket代码优化> ( ´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/KfWebSocketMsgDTO.java

@@ -122,6 +122,15 @@ public class KfWebSocketMsgDTO {
                 .build();
     }
 
+    public static KfWebSocketMsgDTO.PageBean defaultPage(Long pageNum, Long pageSice) {
+        return KfWebSocketMsgDTO.PageBean.builder()
+                .pageNum(pageNum)
+                .pageSize(pageSice)
+                .pageTotal(0L)
+                .total(0L)
+                .build();
+    }
+
     @Data
     @Builder
     @AllArgsConstructor

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

@@ -4,33 +4,26 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.pojo.enums.HttpStatusEnum;
 import com.zanxiang.game.module.manage.enums.KfRoomMsgOwnerEnum;
 import com.zanxiang.game.module.manage.enums.KfRoomMsgTypeEnum;
-import com.zanxiang.game.module.manage.pojo.dto.GameAppletDTO;
-import com.zanxiang.game.module.manage.pojo.dto.GamePayWayDTO;
 import com.zanxiang.game.module.manage.pojo.dto.KfWebSocketMsgDTO;
-import com.zanxiang.game.module.manage.pojo.dto.PayApplicationDTO;
 import com.zanxiang.game.module.manage.pojo.params.KfWebSocketMsgParam;
 import com.zanxiang.game.module.manage.service.IKfRoomMsgService;
 import com.zanxiang.game.module.mybatis.entity.KfRoom;
 import com.zanxiang.game.module.mybatis.entity.KfRoomMsg;
-import com.zanxiang.game.module.mybatis.entity.Order;
 import com.zanxiang.game.module.mybatis.mapper.KfRoomMsgMapper;
 import com.zanxiang.module.util.JsonUtil;
 import com.zanxiang.module.util.bean.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.logging.log4j.util.Strings;
 import org.springframework.stereotype.Service;
-import org.springframework.web.util.UriComponentsBuilder;
 import reactor.util.function.Tuple2;
 import reactor.util.function.Tuples;
 
-import java.math.BigDecimal;
-import java.net.URI;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.List;
+import java.util.Objects;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 /**
@@ -64,7 +57,7 @@ public class KfRoomMsgServiceImpl extends ServiceImpl<KfRoomMsgMapper, KfRoomMsg
                     .in(KfRoomMsg::getMsgId, msgIdList));
         }
         //返回分页数据, 消息列表
-        return Tuples.of(this.transform(kfRoomMsgPage), roomMsgBeanList);
+        return Tuples.of(KfWebSocketMsgDTO.transformPage(kfRoomMsgPage), roomMsgBeanList);
     }
 
     private KfWebSocketMsgDTO.RoomMsgBean transform(KfRoomMsg kfRoomMsg) {
@@ -77,15 +70,6 @@ public class KfRoomMsgServiceImpl extends ServiceImpl<KfRoomMsgMapper, KfRoomMsg
         return roomMsgBean;
     }
 
-    private KfWebSocketMsgDTO.PageBean transform(Page<KfRoomMsg> kfRoomMsgPage) {
-        return KfWebSocketMsgDTO.PageBean.builder()
-                .pageNum(kfRoomMsgPage.getCurrent())
-                .pageSize(kfRoomMsgPage.getSize())
-                .pageTotal(kfRoomMsgPage.getPages())
-                .total(kfRoomMsgPage.getTotal())
-                .build();
-    }
-
     @Override
     public boolean sendMsgSave(Long gameId, KfRoom kfRoom, KfWebSocketMsgParam.MsgContentBean msgContent) {
         return super.save(KfRoomMsg.builder()

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

@@ -68,16 +68,7 @@ public class KfRoomServiceImpl extends ServiceImpl<KfRoomMapper, KfRoom> impleme
         );
         List<KfWebSocketMsgDTO.RoomBean> roomBeanList = kfRoomPage.getRecords().stream()
                 .map(this::transform).collect(Collectors.toList());
-        return Tuples.of(this.transform(kfRoomPage), roomBeanList);
-    }
-
-    private KfWebSocketMsgDTO.PageBean transform(Page<?> pageBean) {
-        return KfWebSocketMsgDTO.PageBean.builder()
-                .pageNum(pageBean.getCurrent())
-                .pageSize(pageBean.getSize())
-                .pageTotal(pageBean.getPages())
-                .total(pageBean.getTotal())
-                .build();
+        return Tuples.of(KfWebSocketMsgDTO.transformPage(kfRoomPage), roomBeanList);
     }
 
     @Override
@@ -246,7 +237,7 @@ public class KfRoomServiceImpl extends ServiceImpl<KfRoomMapper, KfRoom> impleme
     public Tuple2<KfWebSocketMsgDTO.PageBean, List<KfWebSocketMsgDTO.GameRoleBean>> getRoleBeanList(String openId, KfWebSocketMsgParam.PageBean pageBean) {
         KfSessionUser kfSessionUser = kfSessionUserService.getById(openId);
         if (kfSessionUser == null || kfSessionUser.getUserId() == null) {
-            return Tuples.of(this.transform(pageBean), Collections.emptyList());
+            return Tuples.of(KfWebSocketMsgDTO.defaultPage(pageBean.getPageNum(), pageBean.getPageSize()), Collections.emptyList());
         }
         Page<GameUserRole> gameUserRolePage = gameUserRoleService.page(new Page<>(pageBean.getPageNum(), pageBean.getPageSize()),
                 new QueryWrapper<GameUserRole>().lambda()
@@ -256,7 +247,7 @@ public class KfRoomServiceImpl extends ServiceImpl<KfRoomMapper, KfRoom> impleme
         //构造角色列表
         List<KfWebSocketMsgDTO.GameRoleBean> gameRoleList = gameUserRolePage.getRecords().stream()
                 .map(this::transform).collect(Collectors.toList());
-        return Tuples.of(this.transform(gameUserRolePage), gameRoleList);
+        return Tuples.of(KfWebSocketMsgDTO.transformPage(gameUserRolePage), gameRoleList);
     }
 
     private KfWebSocketMsgDTO.GameRoleBean transform(GameUserRole gameUserRole) {
@@ -270,7 +261,7 @@ public class KfRoomServiceImpl extends ServiceImpl<KfRoomMapper, KfRoom> impleme
     public Tuple2<KfWebSocketMsgDTO.PageBean, List<KfWebSocketMsgDTO.OrderBean>> getOrderBeanList(String openId, KfWebSocketMsgParam.PageBean pageBean) {
         KfSessionUser kfSessionUser = kfSessionUserService.getById(openId);
         if (kfSessionUser == null || kfSessionUser.getUserId() == null) {
-            return Tuples.of(this.transform(pageBean), Collections.emptyList());
+            return Tuples.of(KfWebSocketMsgDTO.defaultPage(pageBean.getPageNum(), pageBean.getPageSize()), Collections.emptyList());
         }
         Page<Order> orderPage = orderService.page(new Page<>(pageBean.getPageNum(), pageBean.getPageSize()),
                 new QueryWrapper<Order>().lambda()
@@ -281,7 +272,7 @@ public class KfRoomServiceImpl extends ServiceImpl<KfRoomMapper, KfRoom> impleme
         //构造订单列表
         List<KfWebSocketMsgDTO.OrderBean> orderList = orderPage.getRecords().stream()
                 .map(this::transform).collect(Collectors.toList());
-        return Tuples.of(this.transform(orderPage), orderList);
+        return Tuples.of(KfWebSocketMsgDTO.transformPage(orderPage), orderList);
     }
 
     private KfWebSocketMsgDTO.OrderBean transform(Order order) {
@@ -291,13 +282,4 @@ public class KfRoomServiceImpl extends ServiceImpl<KfRoomMapper, KfRoom> impleme
         return BeanUtil.copy(order, KfWebSocketMsgDTO.OrderBean.class);
     }
 
-    private KfWebSocketMsgDTO.PageBean transform(KfWebSocketMsgParam.PageBean pageBean) {
-        return KfWebSocketMsgDTO.PageBean.builder()
-                .pageNum(pageBean.getPageNum())
-                .pageSize(pageBean.getPageSize())
-                .pageTotal(0L)
-                .total(0L)
-                .build();
-    }
-
 }