fix : 卡夫卡数据结构变化

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服务启动成功 <老的客服系统, 增加调试日志> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 <Websocket客服系统优化处理> ( ´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

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

@@ -1,8 +1,8 @@
 package com.zanxiang.game.module.manage.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.game.module.manage.pojo.params.RoleOperateParam;
 import com.zanxiang.game.module.mybatis.entity.RoleOperate;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -14,5 +14,14 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IRoleOperateService extends IService<RoleOperate> {
 
+    /**
+     * 玩家是否加企微
+     *
+     * @param gameId : 游戏id
+     * @param userId : 玩家id
+     * @return : 返回是否加企微
+     */
+    boolean userAddCorpWechat(Long gameId, Long userId);
+
     boolean modify(RoleOperateParam param);
 }

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

@@ -12,6 +12,7 @@ import com.zanxiang.game.module.mybatis.entity.KfQuickReply;
 import com.zanxiang.game.module.mybatis.mapper.KfQuickReplyMapper;
 import com.zanxiang.module.util.bean.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.logging.log4j.util.Strings;
 import org.springframework.stereotype.Service;
 import reactor.util.function.Tuple2;
 import reactor.util.function.Tuples;
@@ -31,9 +32,13 @@ public class KfQuickReplyServiceImpl extends ServiceImpl<KfQuickReplyMapper, KfQ
 
     @Override
     public boolean quickReplyAdd(KfWebSocketMsgParam.QuickReplyBean param) {
+        String content = param.getContent();
+        if (Strings.isBlank(content) || Strings.isBlank(content.replaceAll("\\s", ""))) {
+            return Boolean.FALSE;
+        }
         return super.save(KfQuickReply.builder()
                 .kfUserId(SecurityUtil.getUserId())
-                .content(param.getContent())
+                .content(content)
                 .status(Boolean.TRUE)
                 .createTime(LocalDateTime.now())
                 .updateTime(LocalDateTime.now())

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

@@ -52,6 +52,9 @@ public class KfRoomServiceImpl extends ServiceImpl<KfRoomMapper, KfRoom> impleme
     @Autowired
     private IOrderService orderService;
 
+    @Autowired
+    private IRoleOperateService roleOperateService;
+
     @Autowired
     private IKfSessionUserService kfSessionUserService;
 
@@ -199,6 +202,8 @@ public class KfRoomServiceImpl extends ServiceImpl<KfRoomMapper, KfRoom> impleme
             roomBean.setLastMsgTime(kfRoomMsg.getCreateTime());
             roomBean.setMsgOwner(kfRoomMsg.getMsgOwner());
         }
+        //玩家是否加企微
+        roomBean.setAddCorpWechat(roleOperateService.userAddCorpWechat(kfRoom.getGameId(), kfRoom.getUserId()));
         return roomBean;
     }
 
@@ -233,6 +238,8 @@ public class KfRoomServiceImpl extends ServiceImpl<KfRoomMapper, KfRoom> impleme
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
             userBean.setOrderAmountSum(totalAmount);
         }
+        //玩家是否加企微
+        userBean.setAddCorpWechat(roleOperateService.userAddCorpWechat(kfSessionUser.getGameId(), kfSessionUser.getUserId()));
         return userBean;
     }
 

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

@@ -8,6 +8,7 @@ import com.zanxiang.game.module.manage.enums.KfRoomMsgTypeEnum;
 import com.zanxiang.game.module.manage.pojo.dto.KfWebSocketMsgDTO;
 import com.zanxiang.game.module.manage.service.IKfRoomMsgService;
 import com.zanxiang.game.module.manage.service.IKfSessionUserService;
+import com.zanxiang.game.module.manage.service.IRoleOperateService;
 import com.zanxiang.game.module.mybatis.entity.KfRoomMsg;
 import com.zanxiang.game.module.mybatis.entity.KfSessionUser;
 import com.zanxiang.game.module.mybatis.mapper.KfSessionUserMapper;
@@ -33,6 +34,9 @@ public class KfSessionUserServiceImpl extends ServiceImpl<KfSessionUserMapper, K
     @Autowired
     private IKfRoomMsgService kfRoomMsgService;
 
+    @Autowired
+    private IRoleOperateService roleOperateService;
+
     @Override
     public List<KfWebSocketMsgDTO.WaitUserBean> getWaitUserList(Long gameId) {
         return super.list(new LambdaQueryWrapper<KfSessionUser>()
@@ -56,6 +60,8 @@ public class KfSessionUserServiceImpl extends ServiceImpl<KfSessionUserMapper, K
                 .stream().map(this::transform).collect(Collectors.toList());
         waitUserBean.setWaitUserMsgList(waitUserMsgList);
         waitUserBean.setUnReadMsgCount(kfRoomMsgPage.getTotal());
+        //玩家是否加企微
+        waitUserBean.setAddCorpWechat(roleOperateService.userAddCorpWechat(kfSessionUser.getGameId(), kfSessionUser.getUserId()));
         return waitUserBean;
     }
 

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

@@ -1,15 +1,12 @@
 package com.zanxiang.game.module.manage.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.erp.security.util.SecurityUtil;
 import com.zanxiang.game.module.manage.pojo.params.RoleOperateParam;
-import com.zanxiang.game.module.mybatis.entity.RoleGiftRecord;
+import com.zanxiang.game.module.manage.service.IRoleOperateService;
 import com.zanxiang.game.module.mybatis.entity.RoleOperate;
 import com.zanxiang.game.module.mybatis.mapper.RoleOperateMapper;
-import com.zanxiang.game.module.manage.service.IRoleOperateService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -28,6 +25,15 @@ import java.util.stream.Collectors;
 @Service
 public class RoleOperateServiceImpl extends ServiceImpl<RoleOperateMapper, RoleOperate> implements IRoleOperateService {
 
+    @Override
+    public boolean userAddCorpWechat(Long gameId, Long userId) {
+        return super.count(new LambdaQueryWrapper<RoleOperate>()
+                .eq(RoleOperate::getGameId, gameId)
+                .eq(RoleOperate::getUserId, userId)
+                .eq(RoleOperate::getIsAddCorpWechat, 1)
+        ) > 0;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean modify(RoleOperateParam param) {