采购：业务员报价看板-业务员报价WebSocket

@@ -4,15 +4,15 @@ import lombok.Getter;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationEvent;
 
 
 /**
 /**
- * 同行报价信息变更事件
+ * 变更事件
  */
  */
 @Getter
 @Getter
-public class SalesmanQuotationPeerChangedEvent extends ApplicationEvent {
+public class CommonChangedEvent extends ApplicationEvent {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     /**
     /**
-     * 同行报价信息ID
+     * 业务主键ID
      */
      */
     private final String id;
     private final String id;
 
 
@@ -21,7 +21,7 @@ public class SalesmanQuotationPeerChangedEvent extends ApplicationEvent {
      */
      */
     private final String eventType;
     private final String eventType;
 
 
-    public SalesmanQuotationPeerChangedEvent(Object source, String id, String eventType) {
+    public CommonChangedEvent(Object source, String id, String eventType) {
         super(source);
         super(source);
         this.id = id;
         this.id = id;
         this.eventType = eventType;
         this.eventType = eventType;

+package com.lframework.xingyun.sc.listeners.app;
+
+import com.lframework.xingyun.sc.events.quotation.CommonChangedEvent;
+import com.lframework.xingyun.sc.procurement.websocket.quotation.line.SalesmanQuotationLineRealtimePushService;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.event.TransactionPhase;
+import org.springframework.transaction.event.TransactionalEventListener;
+
+import javax.annotation.Resource;
+
+/**
+ * 业务员报价实时推送监听器
+ */
+@Component
+public class SalesmanQuotationLineRealtimeListener {
+
+    @Resource
+    private SalesmanQuotationLineRealtimePushService realtimePushService;
+
+    /**
+     * 业务员报价信息变更后广播当日完整数据
+     *
+     * @param event 变更事件
+     */
+    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
+    public void handleChanged(CommonChangedEvent event) {
+        realtimePushService.broadcastCurrentDayFullData(event.getEventType());
+    }
+}

 package com.lframework.xingyun.sc.listeners.app;
 package com.lframework.xingyun.sc.listeners.app;
 
 
-import com.lframework.xingyun.sc.events.quotation.SalesmanQuotationPeerChangedEvent;
-import com.lframework.xingyun.sc.procurement.websocket.quotation.SalesmanQuotationPeerRealtimePushService;
+import com.lframework.xingyun.sc.events.quotation.CommonChangedEvent;
+import com.lframework.xingyun.sc.procurement.websocket.quotation.peer.SalesmanQuotationPeerRealtimePushService;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.event.TransactionPhase;
 import org.springframework.transaction.event.TransactionPhase;
@@ -22,7 +22,7 @@ public class SalesmanQuotationPeerRealtimeListener {
      * @param event 变更事件
      * @param event 变更事件
      */
      */
     @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
     @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
-    public void handleChanged(SalesmanQuotationPeerChangedEvent event) {
+    public void handleChanged(CommonChangedEvent event) {
         realtimePushService.broadcastCurrentDayFullData(event.getEventType());
         realtimePushService.broadcastCurrentDayFullData(event.getEventType());
     }
     }
 }
 }

+package com.lframework.xingyun.sc.procurement.dto.quotation;
+
+import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotationLine;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 业务员报价实时推送消息
+ */
+@Data
+public class QuotationLineRealtimeMessage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 消息类型
+     */
+    private String messageType;
+
+    /**
+     * 事件类型
+     */
+    private String eventType;
+
+    /**
+     * 业务日期
+     */
+    private LocalDate businessDate;
+
+    /**
+     * 推送时间
+     */
+    private LocalDateTime pushTime;
+
+    /**
+     * 数据列表
+     */
+    private List<SalesmanQuotationLine> records;
+}

@@ -90,6 +90,24 @@ public class SalesmanQuotationLine extends BaseEntity implements BaseDto {
     private String itemId;
     private String itemId;
 
 
     /**
     /**
+     * 报价时间
+     */
+    @TableField(exist = false)
+    private String quoteTime;
+
+    /**
+     * 业务员
+     */
+    @TableField(exist = false)
+    private String quoterName;
+
+    /**
+     * 供应商名称
+     */
+    @TableField(exist = false)
+    private String supplierName;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

@@ -16,6 +16,7 @@ import com.lframework.xingyun.sc.procurement.vo.quotation.CreateSalesmanQuotatio
 import com.lframework.xingyun.sc.procurement.vo.quotation.QuerySalesmanQuotationLineVo;
 import com.lframework.xingyun.sc.procurement.vo.quotation.QuerySalesmanQuotationLineVo;
 import com.lframework.xingyun.sc.procurement.vo.quotation.UpdateSalesmanQuotationLineVo;
 import com.lframework.xingyun.sc.procurement.vo.quotation.UpdateSalesmanQuotationLineVo;
 import java.io.Serializable;
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -41,6 +42,17 @@ public class SalesmanQuotationLineServiceImpl
     }
     }
 
 
     /**
     /**
+     * 查询指定日期创建的业务员报价明细
+     *
+     * @param day 日期
+     * @return 业务员报价明细列表
+     */
+    @Override
+    public List<SalesmanQuotationLine> queryCurrentDayList(LocalDate day) {
+        return getBaseMapper().queryCurrentDayList(day);
+    }
+
+    /**
      * 根据ID查询
      * 根据ID查询
      *
      *
      * @param id 主键ID
      * @param id 主键ID

@@ -16,7 +16,7 @@ import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.xingyun.basedata.entity.BreedRelationship;
 import com.lframework.xingyun.basedata.entity.BreedRelationship;
 import com.lframework.xingyun.basedata.service.breed.BreedRelationshipService;
 import com.lframework.xingyun.basedata.service.breed.BreedRelationshipService;
-import com.lframework.xingyun.sc.events.quotation.SalesmanQuotationPeerChangedEvent;
+import com.lframework.xingyun.sc.events.quotation.CommonChangedEvent;
 import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotationPeer;
 import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotationPeer;
 import com.lframework.xingyun.sc.procurement.mappers.quotation.SalesmanQuotationPeerMapper;
 import com.lframework.xingyun.sc.procurement.mappers.quotation.SalesmanQuotationPeerMapper;
 import com.lframework.xingyun.sc.procurement.service.quotation.SalesmanQuotationPeerService;
 import com.lframework.xingyun.sc.procurement.service.quotation.SalesmanQuotationPeerService;
@@ -183,6 +183,6 @@ public class SalesmanQuotationPeerServiceImpl
      * @param eventType 事件类型
      * @param eventType 事件类型
      */
      */
     private void publishChangedEvent(String id, String eventType) {
     private void publishChangedEvent(String id, String eventType) {
-        applicationEventPublisher.publishEvent(new SalesmanQuotationPeerChangedEvent(this, id, eventType));
+        applicationEventPublisher.publishEvent(new CommonChangedEvent(this, id, eventType));
     }
     }
 }
 }

@@ -29,6 +29,7 @@ import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.basedata.entity.BreedRelationship;
 import com.lframework.xingyun.basedata.entity.BreedRelationship;
 import com.lframework.xingyun.basedata.service.breed.BreedRelationshipService;
 import com.lframework.xingyun.basedata.service.breed.BreedRelationshipService;
 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
+import com.lframework.xingyun.sc.events.quotation.CommonChangedEvent;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementDomesticCustomerCredit;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementDomesticCustomerCredit;
 import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotation;
 import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotation;
 import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotationLine;
 import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotationLine;
@@ -57,6 +58,7 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
@@ -88,6 +90,8 @@ public class SalesmanQuotationServiceImpl
     private SalesmanQuotationLineService salesmanQuotationLineService;
     private SalesmanQuotationLineService salesmanQuotationLineService;
     @Resource
     @Resource
     private SysRoleService sysRoleService;
     private SysRoleService sysRoleService;
+    @Resource
+    private ApplicationEventPublisher applicationEventPublisher;
 
 
     /**
     /**
      * 编号前缀
      * 编号前缀
@@ -304,6 +308,7 @@ public class SalesmanQuotationServiceImpl
                     .set(SalesmanQuotation::getStatus, "QUOTED")
                     .set(SalesmanQuotation::getStatus, "QUOTED")
                     .eq(SalesmanQuotation::getId, id);
                     .eq(SalesmanQuotation::getId, id);
             getBaseMapper().update(wrapper);
             getBaseMapper().update(wrapper);
+            publishChangedEvent(id, "CREATE");
         } else {
         } else {
             Wrapper<SalesmanQuotation> wrapper = Wrappers.lambdaUpdate(SalesmanQuotation.class)
             Wrapper<SalesmanQuotation> wrapper = Wrappers.lambdaUpdate(SalesmanQuotation.class)
                     .set(SalesmanQuotation::getApprovalStatus, approvalStatus)
                     .set(SalesmanQuotation::getApprovalStatus, approvalStatus)
@@ -730,6 +735,17 @@ public class SalesmanQuotationServiceImpl
         }
         }
     }
     }
 
 
+
+    /**
+     * 发布业务员报价信息变更事件
+     *
+     * @param id 主键ID
+     * @param eventType 事件类型
+     */
+    private void publishChangedEvent(String id, String eventType) {
+        applicationEventPublisher.publishEvent(new CommonChangedEvent(this, id, eventType));
+    }
+
     /**
     /**
      * 清理缓存
      * 清理缓存
      *
      *

@@ -3,6 +3,7 @@ package com.lframework.xingyun.sc.procurement.mappers.quotation;
 import com.lframework.starter.web.core.mapper.BaseMapper;
 import com.lframework.starter.web.core.mapper.BaseMapper;
 import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotationLine;
 import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotationLine;
 import com.lframework.xingyun.sc.procurement.vo.quotation.QuerySalesmanQuotationLineVo;
 import com.lframework.xingyun.sc.procurement.vo.quotation.QuerySalesmanQuotationLineVo;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
@@ -18,4 +19,12 @@ public interface SalesmanQuotationLineMapper extends BaseMapper<SalesmanQuotatio
      * @return 明细列表
      * @return 明细列表
      */
      */
     List<SalesmanQuotationLine> query(@Param("vo") QuerySalesmanQuotationLineVo vo);
     List<SalesmanQuotationLine> query(@Param("vo") QuerySalesmanQuotationLineVo vo);
+
+    /**
+     * 查询指定日期创建的业务员报价明细
+     *
+     * @param day 日期
+     * @return 业务员报价明细表列表
+     */
+    List<SalesmanQuotationLine> queryCurrentDayList(@Param("day") LocalDate day);
 }
 }

@@ -5,6 +5,7 @@ import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotationLine;
 import com.lframework.xingyun.sc.procurement.vo.quotation.CreateSalesmanQuotationLineVo;
 import com.lframework.xingyun.sc.procurement.vo.quotation.CreateSalesmanQuotationLineVo;
 import com.lframework.xingyun.sc.procurement.vo.quotation.QuerySalesmanQuotationLineVo;
 import com.lframework.xingyun.sc.procurement.vo.quotation.QuerySalesmanQuotationLineVo;
 import com.lframework.xingyun.sc.procurement.vo.quotation.UpdateSalesmanQuotationLineVo;
 import com.lframework.xingyun.sc.procurement.vo.quotation.UpdateSalesmanQuotationLineVo;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
@@ -21,6 +22,14 @@ public interface SalesmanQuotationLineService extends BaseMpService<SalesmanQuot
     List<SalesmanQuotationLine> query(QuerySalesmanQuotationLineVo vo);
     List<SalesmanQuotationLine> query(QuerySalesmanQuotationLineVo vo);
 
 
     /**
     /**
+     * 查询指定日期创建的业务员报价明细
+     *
+     * @param day 日期
+     * @return 业务员报价明细列表
+     */
+    List<SalesmanQuotationLine> queryCurrentDayList(LocalDate day);
+
+    /**
      * 根据ID查询
      * 根据ID查询
      *
      *
      * @param id 主键ID
      * @param id 主键ID

@@ -8,10 +8,10 @@ import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 /**
 /**
- * 同行报价信息 WebSocket 鉴权服务
+ * WebSocket 鉴权服务
  */
  */
 @Service
 @Service
-public class SalesmanQuotationPeerWebSocketAuthService {
+public class CommonWebSocketAuthService {
 
 
     @Resource
     @Resource
     private SysUserService sysUserService;
     private SysUserService sysUserService;

+package com.lframework.xingyun.sc.procurement.websocket.quotation.line;
+
+import com.lframework.starter.web.core.utils.JsonUtil;
+import com.lframework.xingyun.sc.procurement.dto.quotation.QuotationLineRealtimeMessage;
+import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotationLine;
+import com.lframework.xingyun.sc.procurement.service.quotation.SalesmanQuotationLineService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketSession;
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 业务员报价信息实时推送服务
+ */
+@Slf4j
+@Service
+public class SalesmanQuotationLineRealtimePushService {
+
+    /**
+     * 当前在线连接
+     */
+    private final Map<String, WebSocketSession> sessionMap = new ConcurrentHashMap<>();
+
+    @Resource
+    private SalesmanQuotationLineService salesmanQuotationLineService;
+
+    /**
+     * 注册连接
+     *
+     * @param session WebSocket 会话
+     */
+    public void register(WebSocketSession session) {
+        sessionMap.put(session.getId(), session);
+    }
+
+    /**
+     * 注销连接
+     *
+     * @param session WebSocket 会话
+     */
+    public void unregister(WebSocketSession session) {
+        if (session != null) {
+            sessionMap.remove(session.getId());
+        }
+    }
+
+    /**
+     * 广播当日完整业务员报价数据
+     *
+     * @param eventType 事件类型
+     */
+    public void broadcastCurrentDayFullData(String eventType) {
+        if (sessionMap.isEmpty()) {
+            return;
+        }
+
+        QuotationLineRealtimeMessage message = buildCurrentDayMessage(eventType);
+        String payload = JsonUtil.toJsonString(message);
+        for (WebSocketSession session : sessionMap.values()) {
+            sendMessage(session, payload);
+        }
+    }
+
+    /**
+     * 向单个连接补推当日完整数据
+     *
+     * @param session WebSocket 会话
+     * @param eventType 事件类型
+     */
+    public void replayCurrentDayFullData(WebSocketSession session, String eventType) {
+        if (session == null) {
+            return;
+        }
+        sendMessage(session, JsonUtil.toJsonString(buildCurrentDayMessage(eventType)));
+    }
+
+    /**
+     * 构建当日完整数据消息
+     *
+     * @param eventType 事件类型
+     * @return 推送消息
+     */
+    private QuotationLineRealtimeMessage buildCurrentDayMessage(String eventType) {
+        LocalDate today = LocalDate.now();
+        List<SalesmanQuotationLine> records = salesmanQuotationLineService.queryCurrentDayList(today);
+
+        QuotationLineRealtimeMessage message = new QuotationLineRealtimeMessage();
+        message.setMessageType("FULL_SYNC");
+        message.setEventType(eventType);
+        message.setBusinessDate(today);
+        message.setPushTime(LocalDateTime.now());
+        message.setRecords(records);
+        return message;
+    }
+
+    /**
+     * 发送消息
+     *
+     * @param session WebSocket 会话
+     * @param payload 消息体
+     */
+    private void sendMessage(WebSocketSession session, String payload) {
+        if (session == null || !session.isOpen()) {
+            unregister(session);
+            return;
+        }
+
+        try {
+            synchronized (session) {
+                session.sendMessage(new TextMessage(payload));
+            }
+        } catch (IOException e) {
+            log.warn("业务员报价信息实时推送失败，sessionId={}", session.getId(), e);
+            unregister(session);
+        }
+    }
+}

+package com.lframework.xingyun.sc.procurement.websocket.quotation.line;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.config.annotation.EnableWebSocket;
+import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
+import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
+
+import javax.annotation.Resource;
+
+/**
+ * 业务员报价 WebSocket 配置
+ */
+@Configuration
+@EnableWebSocket
+public class SalesmanQuotationLineWebSocketConfig implements WebSocketConfigurer {
+
+    // 添加这段代码
+    static {
+        System.out.println("========== WebSocket配置类正在加载 ==========");
+    }
+
+    /**
+     * WebSocket 路径
+     */
+    public static final String ENDPOINT = "/ws/procurement/salesmanQuotationLine/realtime";
+
+    @Resource
+    private SalesmanQuotationLineWebSocketHandler webSocketHandler;
+    @Resource
+    private SalesmanQuotationLineWebSocketHandshakeInterceptor handshakeInterceptor;
+
+    @Override
+    public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
+        System.out.println("========== 正在注册 WebSocket 路径 ==========");
+        registry.addHandler(webSocketHandler, ENDPOINT)
+                .addInterceptors(handshakeInterceptor)
+                .setAllowedOrigins("*");
+    }
+}

+package com.lframework.xingyun.sc.procurement.websocket.quotation.line;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketSession;
+import org.springframework.web.socket.handler.TextWebSocketHandler;
+
+import javax.annotation.Resource;
+
+/**
+ * 业务员报价 WebSocket 处理器
+ */
+@Slf4j
+@Component
+public class SalesmanQuotationLineWebSocketHandler extends TextWebSocketHandler {
+
+    @Resource
+    private SalesmanQuotationLineRealtimePushService realtimePushService;
+
+    @Override
+    public void afterConnectionEstablished(WebSocketSession session) {
+        realtimePushService.register(session);
+        realtimePushService.replayCurrentDayFullData(session, "INIT");
+    }
+
+    @Override
+    protected void handleTextMessage(WebSocketSession session, TextMessage message) {
+        String payload = StringUtils.trimToEmpty(message.getPayload());
+        if ("SYNC_TODAY".equalsIgnoreCase(payload) || "RESYNC".equalsIgnoreCase(payload)) {
+            realtimePushService.replayCurrentDayFullData(session, "RESYNC");
+        }
+    }
+
+    @Override
+    public void afterConnectionClosed(WebSocketSession session, CloseStatus status) {
+        realtimePushService.unregister(session);
+    }
+
+    @Override
+    public void handleTransportError(WebSocketSession session, Throwable exception) {
+        log.warn("业务员报价 WebSocket 连接异常，sessionId={}", session.getId(), exception);
+        realtimePushService.unregister(session);
+    }
+}

+package com.lframework.xingyun.sc.procurement.websocket.quotation.line;
+
+import com.lframework.starter.web.inner.entity.SysUser;
+import com.lframework.xingyun.sc.procurement.websocket.quotation.CommonWebSocketAuthService;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.server.ServerHttpRequest;
+import org.springframework.http.server.ServerHttpResponse;
+import org.springframework.stereotype.Component;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.server.HandshakeInterceptor;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * 业务员报价 WebSocket 握手鉴权拦截器
+ */
+@Component
+public class SalesmanQuotationLineWebSocketHandshakeInterceptor implements HandshakeInterceptor {
+
+    /**
+     * 用户ID属性名
+     */
+    public static final String ATTR_USER_ID = "userId";
+
+    /**
+     * 用户名称属性名
+     */
+    public static final String ATTR_USER_NAME = "userName";
+
+    @Resource
+    private CommonWebSocketAuthService authService;
+
+    @Override
+    public boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse response,
+                                   WebSocketHandler wsHandler, Map<String, Object> attributes) {
+        try {
+            SysUser user = authService.authenticateCurrentUser();
+            attributes.put(ATTR_USER_ID, user.getId());
+            attributes.put(ATTR_USER_NAME, user.getName());
+            return true;
+        } catch (Exception e) {
+            response.setStatusCode(HttpStatus.FORBIDDEN);
+            return false;
+        }
+    }
+
+    @Override
+    public void afterHandshake(ServerHttpRequest request, ServerHttpResponse response,
+                               WebSocketHandler wsHandler, Exception exception) {
+    }
+}

-package com.lframework.xingyun.sc.procurement.websocket.quotation;
+package com.lframework.xingyun.sc.procurement.websocket.quotation.peer;
 
 
 import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.xingyun.sc.procurement.dto.quotation.PeerQuotationRealtimeMessage;
 import com.lframework.xingyun.sc.procurement.dto.quotation.PeerQuotationRealtimeMessage;

-package com.lframework.xingyun.sc.procurement.websocket.quotation;
+package com.lframework.xingyun.sc.procurement.websocket.quotation.peer;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Configuration;

-package com.lframework.xingyun.sc.procurement.websocket.quotation;
+package com.lframework.xingyun.sc.procurement.websocket.quotation.peer;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;

-package com.lframework.xingyun.sc.procurement.websocket.quotation;
+package com.lframework.xingyun.sc.procurement.websocket.quotation.peer;
 
 
 import com.lframework.starter.web.inner.entity.SysUser;
 import com.lframework.starter.web.inner.entity.SysUser;
 import java.util.Map;
 import java.util.Map;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
+
+import com.lframework.xingyun.sc.procurement.websocket.quotation.CommonWebSocketAuthService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.http.server.ServerHttpResponse;
@@ -27,7 +29,7 @@ public class SalesmanQuotationPeerWebSocketHandshakeInterceptor implements Hands
     public static final String ATTR_USER_NAME = "userName";
     public static final String ATTR_USER_NAME = "userName";
 
 
     @Resource
     @Resource
-    private SalesmanQuotationPeerWebSocketAuthService authService;
+    private CommonWebSocketAuthService authService;
 
 
     @Override
     @Override
     public boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse response,
     public boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse response,

@@ -16,6 +16,9 @@
         <result column="estimated_loss" property="estimatedLoss"/>
         <result column="estimated_loss" property="estimatedLoss"/>
         <result column="application_attrition" property="applicationAttrition"/>
         <result column="application_attrition" property="applicationAttrition"/>
         <result column="item_id" property="itemId"/>
         <result column="item_id" property="itemId"/>
+        <result column="quote_time" property="quoteTime"/>
+        <result column="quoter_name" property="quoterName"/>
+        <result column="supplier_name" property="supplierName"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
         <result column="update_by_id" property="updateById"/>
@@ -58,4 +61,32 @@
         </where>
         </where>
         ORDER BY tb.create_time ASC
         ORDER BY tb.create_time ASC
     </select>
     </select>
+
+    <sql id="SalesmanQuotationLineSql1">
+        SELECT
+            tb.id,
+            tb.quotation_id,
+            sq.quote_time,
+            sq.quoter_name,
+            pdc.unit_name AS supplier_name,
+            br.product_name,
+            tb.quantity,
+            tb.purchase_price,
+            tb.create_by_id,
+            tb.create_by,
+            tb.update_by_id,
+            tb.update_by,
+            tb.create_time,
+            tb.update_time
+        FROM procurement_salesman_quotation_line tb
+        LEFT JOIN base_data_breed_relationship br ON br.id = tb.product_id
+        LEFT JOIN procurement_salesman_quotation sq on sq.id=tb.quotation_id
+        LEFT JOIN procurement_domestic_customer_credit pdc ON pdc.id = sq.supplier_id
+    </sql>
+
+    <select id="queryCurrentDayList" resultMap="SalesmanQuotationLine">
+        <include refid="SalesmanQuotationLineSql1"/>
+        WHERE DATE(sq.create_time) = #{day} and sq.status='QUOTED'
+        ORDER BY tb.create_time DESC, tb.quotation_id DESC
+    </select>
 </mapper>
 </mapper>