ソースを参照

结构规范化

Zhangbw 2 ヶ月 前
コミット
fc35db3efc

+ 1 - 1
ruoyi-modules/yp-talk/src/main/java/org/dromara/talk/domain/dto/MessageStreamRequest.java

@@ -9,7 +9,7 @@ import java.util.Map;
  * 流式消息请求
  *
  * @author Lion Li
- * @date 2026-02-07
+ *  2026-02-07
  */
 @Data
 public class MessageStreamRequest {

+ 2 - 20
ruoyi-modules/yp-talk/src/main/java/org/dromara/talk/domain/dto/WhatsAppMessageRequest.java

@@ -1,8 +1,6 @@
 package org.dromara.talk.domain.dto;
 
 import lombok.Data;
-import java.util.List;
-
 /**
  * WhatsApp消息接收请求
  */
@@ -22,23 +20,7 @@ public class WhatsAppMessageRequest {
     /**
      * 对话历史
      */
-    private List<ConversationMessage> conversationHistory;
-
-    @Data
-    public static class ConversationMessage {
-        /**
-         * 角色: user/assistant
-         */
-        private String role;
-
-        /**
-         * 消息内容
-         */
-        private String content;
+    private String conversationHistory;
 
-        /**
-         * 时间戳
-         */
-        private String timestamp;
-    }
+    
 }

+ 0 - 2
ruoyi-modules/yp-talk/src/main/java/org/dromara/talk/service/IChatService.java

@@ -3,7 +3,6 @@ package org.dromara.talk.service;
 import org.dromara.talk.domain.dto.MessageStreamRequest;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
-import java.security.MessageDigest;
 import java.util.List;
 import java.util.Map;
 
@@ -14,7 +13,6 @@ public interface IChatService {
 
     /**
      * 流式处理用户消息
-     *
      *  userMessage 用户消息
      *  agentId 客服ID
      *  agentGender 客服性别

+ 0 - 7
ruoyi-modules/yp-talk/src/main/java/org/dromara/talk/service/IDifyService.java

@@ -8,8 +8,6 @@ import java.util.function.Consumer;
 
 public interface IDifyService {
 
-   Map<String, String> callWorkflow(String userMessage, Map<String, Object> inputs, Long userId, String conversationId);
-
    /**
     * 流式调用Dify工作流(按句子分段)
     */
@@ -18,11 +16,6 @@ public interface IDifyService {
                           Consumer<String> onTextChunk,
                           SentenceCallback onSentence);
 
-   @FunctionalInterface
-   interface TriConsumer<T, U, V> {
-       void accept(T t, U u, V v);
-   }
-
    @FunctionalInterface
    interface SentenceCallback {
        void onSentence(String sentence, String conversationId, boolean isComplete);

+ 0 - 11
ruoyi-modules/yp-talk/src/main/java/org/dromara/talk/service/impl/PhoneUserServiceImpl.java

@@ -69,7 +69,6 @@ public class PhoneUserServiceImpl implements IPhoneUserService {
     @Override
     public Boolean insertByBo(PhoneUserBo bo) {
         PhoneUser add = MapstructUtils.convert(bo, PhoneUser.class);
-        validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
@@ -83,25 +82,15 @@ public class PhoneUserServiceImpl implements IPhoneUserService {
     @Override
     public Boolean updateByBo(PhoneUserBo bo) {
         PhoneUser update = MapstructUtils.convert(bo, PhoneUser.class);
-        validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
     }
 
-    /**
-     * 保存前的数据校验
-     */
-    private void validEntityBeforeSave(PhoneUser entity){
-        // TODO 做一些数据校验,如唯一约束
-    }
 
     /**
      * 批量删除ZoomPhone用户
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            // TODO 做一些业务上的校验,判断是否需要校验
-        }
         return baseMapper.deleteByIds(ids) > 0;
     }
 }

+ 0 - 12
ruoyi-modules/yp-talk/src/main/java/org/dromara/talk/service/impl/TalkAgentServiceImpl.java

@@ -75,7 +75,6 @@ public class TalkAgentServiceImpl implements ITalkAgentService {
     }
 
     private LambdaQueryWrapper<TalkAgent> buildQueryWrapper(TalkAgentBo bo) {
-        Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<TalkAgent> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(TalkAgent::getId);
         lqw.like(StringUtils.isNotBlank(bo.getName()), TalkAgent::getName, bo.getName());
@@ -100,7 +99,6 @@ public class TalkAgentServiceImpl implements ITalkAgentService {
     @Override
     public Boolean insertByBo(TalkAgentBo bo) {
         TalkAgent add = MapstructUtils.convert(bo, TalkAgent.class);
-        validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
@@ -117,16 +115,9 @@ public class TalkAgentServiceImpl implements ITalkAgentService {
     @Override
     public Boolean updateByBo(TalkAgentBo bo) {
         TalkAgent update = MapstructUtils.convert(bo, TalkAgent.class);
-        validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
     }
 
-    /**
-     * 保存前的数据校验
-     */
-    private void validEntityBeforeSave(TalkAgent entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
 
     /**
      * 校验并批量删除客服配置信息
@@ -137,9 +128,6 @@ public class TalkAgentServiceImpl implements ITalkAgentService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
         return baseMapper.deleteByIds(ids) > 0;
     }
 

+ 0 - 12
ruoyi-modules/yp-talk/src/main/java/org/dromara/talk/service/impl/TalkSessionServiceImpl.java

@@ -72,7 +72,6 @@ public class TalkSessionServiceImpl implements ITalkSessionService {
     }
 
     private LambdaQueryWrapper<TalkSession> buildQueryWrapper(TalkSessionBo bo) {
-        Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<TalkSession> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(TalkSession::getId);
         lqw.eq(StringUtils.isNotBlank(bo.getSessionId()), TalkSession::getSessionId, bo.getSessionId());
@@ -93,7 +92,6 @@ public class TalkSessionServiceImpl implements ITalkSessionService {
     @Override
     public Boolean insertByBo(TalkSessionBo bo) {
         TalkSession add = MapstructUtils.convert(bo, TalkSession.class);
-        validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
@@ -110,16 +108,9 @@ public class TalkSessionServiceImpl implements ITalkSessionService {
     @Override
     public Boolean updateByBo(TalkSessionBo bo) {
         TalkSession update = MapstructUtils.convert(bo, TalkSession.class);
-        validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
     }
 
-    /**
-     * 保存前的数据校验
-     */
-    private void validEntityBeforeSave(TalkSession entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
 
     /**
      * 校验并批量删除对话会话信息
@@ -130,9 +121,6 @@ public class TalkSessionServiceImpl implements ITalkSessionService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
         return baseMapper.deleteByIds(ids) > 0;
     }
 

+ 0 - 12
ruoyi-modules/yp-talk/src/main/java/org/dromara/talk/service/impl/TalkUserServiceImpl.java

@@ -80,7 +80,6 @@ public class TalkUserServiceImpl implements ITalkUserService {
     }
 
     private LambdaQueryWrapper<TalkUser> buildQueryWrapper(TalkUserBo bo) {
-        Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<TalkUser> lqw = Wrappers.lambdaQuery();
         lqw.eq(TalkUser::getUserType, "talk_web_user");
         lqw.orderByDesc(TalkUser::getId);
@@ -101,7 +100,6 @@ public class TalkUserServiceImpl implements ITalkUserService {
     public Boolean insertByBo(TalkUserBo bo) {
         TalkUser add = MapstructUtils.convert(bo, TalkUser.class);
         add.setUserType("talk_web_user");
-        validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
@@ -118,16 +116,9 @@ public class TalkUserServiceImpl implements ITalkUserService {
     @Override
     public Boolean updateByBo(TalkUserBo bo) {
         TalkUser update = MapstructUtils.convert(bo, TalkUser.class);
-        validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
     }
 
-    /**
-     * 保存前的数据校验
-     */
-    private void validEntityBeforeSave(TalkUser entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
 
     /**
      * 校验并批量删除对话用户信息
@@ -138,9 +129,6 @@ public class TalkUserServiceImpl implements ITalkUserService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
         return baseMapper.deleteByIds(ids) > 0;
     }
     @Override

+ 0 - 12
ruoyi-modules/yp-talk/src/main/java/org/dromara/talk/service/impl/WhatsAppHistoryServiceImpl.java

@@ -77,7 +77,6 @@ public class WhatsAppHistoryServiceImpl implements IWhatsAppHistoryService {
     }
 
     private LambdaQueryWrapper<WhatsAppHistory> buildQueryWrapper(WhatsAppHistoryBo bo) {
-        Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<WhatsAppHistory> lqw = Wrappers.lambdaQuery();
         lqw.orderByDesc(WhatsAppHistory::getId);
         lqw.eq(StringUtils.isNotBlank(bo.getSessionId()), WhatsAppHistory::getSessionId, bo.getSessionId());
@@ -96,7 +95,6 @@ public class WhatsAppHistoryServiceImpl implements IWhatsAppHistoryService {
     @Override
     public Boolean insertByBo(WhatsAppHistoryBo bo) {
         WhatsAppHistory add = MapstructUtils.convert(bo, WhatsAppHistory.class);
-        validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
@@ -113,16 +111,9 @@ public class WhatsAppHistoryServiceImpl implements IWhatsAppHistoryService {
     @Override
     public Boolean updateByBo(WhatsAppHistoryBo bo) {
         WhatsAppHistory update = MapstructUtils.convert(bo, WhatsAppHistory.class);
-        validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
     }
 
-    /**
-     * 保存前的数据校验
-     */
-    private void validEntityBeforeSave(WhatsAppHistory entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
 
     /**
      * 校验并批量删除WhatsApp历史记录信息
@@ -133,9 +124,6 @@ public class WhatsAppHistoryServiceImpl implements IWhatsAppHistoryService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
         return baseMapper.deleteByIds(ids) > 0;
     }
 

+ 0 - 12
ruoyi-modules/yp-talk/src/main/java/org/dromara/talk/service/impl/WhatsAppUserServiceImpl.java

@@ -71,7 +71,6 @@ public class WhatsAppUserServiceImpl implements IWhatsAppUserService {
     }
 
     private LambdaQueryWrapper<WhatsAppUser> buildQueryWrapper(WhatsAppUserBo bo) {
-        Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<WhatsAppUser> lqw = Wrappers.lambdaQuery();
         lqw.orderByDesc(WhatsAppUser::getId);
         lqw.eq(StringUtils.isNotBlank(bo.getUserAccount()), WhatsAppUser::getUserAccount, bo.getUserAccount());
@@ -87,7 +86,6 @@ public class WhatsAppUserServiceImpl implements IWhatsAppUserService {
     @Override
     public Boolean insertByBo(WhatsAppUserBo bo) {
         WhatsAppUser add = MapstructUtils.convert(bo, WhatsAppUser.class);
-        validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
@@ -104,16 +102,9 @@ public class WhatsAppUserServiceImpl implements IWhatsAppUserService {
     @Override
     public Boolean updateByBo(WhatsAppUserBo bo) {
         WhatsAppUser update = MapstructUtils.convert(bo, WhatsAppUser.class);
-        validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
     }
 
-    /**
-     * 保存前的数据校验
-     */
-    private void validEntityBeforeSave(WhatsAppUser entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
 
     /**
      * 校验并批量删除WhatsApp用户信息
@@ -124,9 +115,6 @@ public class WhatsAppUserServiceImpl implements IWhatsAppUserService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
         return baseMapper.deleteByIds(ids) > 0;
     }
 }