Merge remote-tracking branch 'origin/dev' into dev

pom.xml

@@ -115,16 +115,17 @@
             <version>2.0.3</version>
         </dependency>
 
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-websocket</artifactId>
-            <version>5.1.2.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-        </dependency>
+<!-- 
+<dependency>
+    <groupId>org.springframework</groupId>
+    <artifactId>spring-websocket</artifactId>
+    <version>5.1.2.RELEASE</version>
+</dependency>
+-->
+<dependency>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-websocket</artifactId>
+</dependency>
 
         <dependency>
             <groupId>net.java.dev.jna</groupId>
@@ -443,7 +444,7 @@
                     <includeSystemScope>true</includeSystemScope>
                     <!-- 关键新增：指定唯一主类（二选一，根据你的实际入口选择） -->
                     <mainClass>com.sqx.SqxApplication</mainClass>
-                    <!-- 若要使用 WebSocketApp 作为入口，替换为：<mainClass>com.sqx.WebSocketApp</mainClass> -->
+                    <!-- 若要使用 WebSocketApp 作为入口，替换为：<mainClass>com.sqx.WebSocketApp</mainClass>  SqxApplication -->
                 </configuration>
             </plugin>
             <!-- 跳过单元测试 -->

src/main/java/com/sqx/SqxApplication.java

@@ -1,11 +1,13 @@
 package com.sqx;
 
+import com.sqx.config.WebSocketConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Import;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 
@@ -13,6 +15,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableScheduling
 @EnableCaching
 @SpringBootApplication
+@Import(WebSocketConfig.class)
 public class SqxApplication {
 
 	public static void main(String[] args) {

src/main/java/com/sqx/common/MyWebSocketHandler.java

@@ -37,4 +37,10 @@ public class MyWebSocketHandler extends TextWebSocketHandler {
         sessions.remove(session);
         System.out.println("连接关闭，当前在线：" + sessions.size());
     }
+
+    @Override
+    public void handleTransportError(WebSocketSession session, Throwable exception) throws Exception {
+        System.err.println("WebSocket 传输错误：" + exception.getMessage());
+        exception.printStackTrace();
+    }
 }

src/main/java/com/sqx/config/WebSocketConfig.java

@@ -7,14 +7,13 @@ import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
 import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
 
 @Configuration
-@EnableWebSocket // 启用WebSocket支持
+@EnableWebSocket // 启用Spring WebSocket支持
 public class WebSocketConfig implements WebSocketConfigurer {
 
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
-        // 注册端点：客户端通过ws://ip:port/ws连接
-        // setAllowedOrigins("*")允许跨域（生产环境需限制来源）
+        // 注册Spring WebSocket处理器，端点为/ws
         registry.addHandler(new MyWebSocketHandler(), "/ws")
-                .setAllowedOrigins("*");
+                .setAllowedOriginPatterns("*"); // 允许跨域（生产环境需限制）
     }
 }

src/main/java/com/sqx/modules/chat/controller/app/AppChatSocket.java

@@ -23,8 +23,8 @@ import java.util.concurrent.ConcurrentHashMap;
 
 @Slf4j
 @Component
-@ServerEndpoint("/sqx_fast/chatSocket/{userId}")
-public class AppChatSocket {//用户聊天
+@ServerEndpoint("/chatSocket/{userId}")
+public class AppChatSocket {// 用户聊天
 
     /**
      * 在线人数
@@ -34,7 +34,7 @@ public class AppChatSocket {//用户聊天
      * 以用户的id为key，WebSocket为对象保存起来
      */
     private static Map<String, AppChatSocket> clients = new ConcurrentHashMap<String, AppChatSocket>();
-    private static SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
     /**
      * 会话
      */
@@ -50,55 +50,51 @@ public class AppChatSocket {//用户聊天
 
     // 注入的时候，给类的 service 注入
     @Autowired
-    public void setWxChatContentService(ChatContentService chatContentService,UserService userService) {
+    public void setWxChatContentService(ChatContentService chatContentService, UserService userService) {
         AppChatSocket.chatContentService = chatContentService;
         AppChatSocket.userService = userService;
     }
 
-
-
     /**
      * 建立连接
      *
      * @param session
      */
     @OnOpen
-    public void onOpen(@PathParam("userId") String userId, Session session)
-    {
+    public void onOpen(@PathParam("userId") String userId, Session session) {
         onlineNumber++;
-        log.info("现在来连接的客户id："+userId);
+        log.info("现在来连接的客户id：" + userId);
         this.userId = userId;
         this.session = session;
         log.info("有新连接加入！ 当前在线人数" + onlineNumber);
         try {
-            //把自己的信息加入到map当中去
+            // 把自己的信息加入到map当中去
             AppChatSocket appChatSocket = clients.get(userId);
-            if(appChatSocket!=null){
+            if (appChatSocket != null) {
                 clients.remove(userId);
             }
             clients.put(userId, this);
 
-            /*sendMessageTo("恭喜你连接成功！",wxUserId);*/
-        }
-        catch (Exception e){
-            log.error(userId+"上线的时候通知所有人发生了错误");
+            /* sendMessageTo("恭喜你连接成功！",wxUserId); */
+        } catch (Exception e) {
+            log.error(userId + "上线的时候通知所有人发生了错误");
         }
 
     }
 
     @OnError
     public void onError(Session session, Throwable error) {
-        log.error("服务端发生了错误"+error.getMessage());
-        //error.printStackTrace();
+        log.error("服务端发生了错误" + error.getMessage());
+        // error.printStackTrace();
     }
+
     /**
      * 连接关闭
      */
     @OnClose
-    public void onClose()
-    {
+    public void onClose() {
         onlineNumber--;
-        //webSockets.remove(this);
+        // webSockets.remove(this);
         clients.remove(userId);
         log.info("有连接关闭！ 当前在线人数" + onlineNumber);
     }
@@ -110,8 +106,7 @@ public class AppChatSocket {//用户聊天
      * @param session 会话
      */
     @OnMessage
-    public void onMessage(String message, Session session)
-    {
+    public void onMessage(String message, Session session) {
 
         if (Objects.equals("HeartBeat", message)) {
             return;
@@ -125,15 +120,16 @@ public class AppChatSocket {//用户聊天
             String height = jsonObject.getString("height");
             String userId = jsonObject.getString("userId");
             String chatConversationId = jsonObject.getString("chatConversationId");
-            chatContentService.updateChatContentStatusByUserIdAndChatId(Long.parseLong(this.userId), Long.parseLong(chatConversationId));
-            if("24".equals(messageType)){
+            chatContentService.updateChatContentStatusByUserIdAndChatId(Long.parseLong(this.userId),
+                    Long.parseLong(chatConversationId));
+            if ("24".equals(messageType)) {
                 AppChatSocket chatSocket = clients.get(userId);
-                if (chatSocket!=null) {
+                if (chatSocket != null) {
                     chatSocket.session.getAsyncRemote().sendText(message);
                 }
-            }else{
-                //将聊天记录保存包数据库中
-                ChatContent wxChatContent=new ChatContent();
+            } else {
+                // 将聊天记录保存包数据库中
+                ChatContent wxChatContent = new ChatContent();
                 wxChatContent.setChatConversationId(Long.parseLong(chatConversationId));
                 wxChatContent.setUserId(Long.parseLong(this.userId));
                 wxChatContent.setWidth(width);
@@ -141,48 +137,48 @@ public class AppChatSocket {//用户聊天
                 wxChatContent.setContent(textMessage);
                 wxChatContent.setMessageType(messageType);
                 wxChatContent.setCreateTime(sdf.format(new Date()));
-                //判断对方是否在线
+                // 判断对方是否在线
                 AppChatSocket chatSocket = clients.get(userId);
-                if (chatSocket!=null) {
+                if (chatSocket != null) {
                     chatSocket.session.getAsyncRemote().sendText(message);
                 }
                 wxChatContent.setStatus(0);
                 chatContentService.save(wxChatContent);
                 UserEntity userEntity = userService.selectUserById(Long.parseLong(userId));
-                if(userEntity!=null && StringUtils.isNotBlank(userEntity.getClientid())){
+                if (userEntity != null && StringUtils.isNotBlank(userEntity.getClientid())) {
                     UserEntity user = userService.selectUserById(Long.parseLong(this.userId));
-                    if("2".equals(messageType)){
-                        textMessage="[图片]";
-                    }else if("3".equals(messageType)){
-                        textMessage="[语音]";
+                    if ("2".equals(messageType)) {
+                        textMessage = "[图片]";
+                    } else if ("3".equals(messageType)) {
+                        textMessage = "[语音]";
                     }
-                    userService.pushToSingle("新消息提醒",user.getUserName()+":"+textMessage,userEntity.getClientid());
+                    userService.pushToSingle("新消息提醒", user.getUserName() + ":" + textMessage, userEntity.getClientid());
                 }
             }
 
-            /*AppChatSocket chatSocket = clients.get(userId);
-            if (chatSocket!=null) {
-                chatSocket.session.getAsyncRemote().sendText(message);
-            }*/
-        }
-        catch (Exception e){
-            log.error("发生了错误了"+e.getMessage(),e);
+            /*
+             * AppChatSocket chatSocket = clients.get(userId);
+             * if (chatSocket!=null) {
+             * chatSocket.session.getAsyncRemote().sendText(message);
+             * }
+             */
+        } catch (Exception e) {
+            log.error("发生了错误了" + e.getMessage(), e);
         }
 
     }
 
-
     public void sendMessageTo(String message, String ToUserName) throws IOException {
         for (AppChatSocket item : clients.values()) {
-            if (item.userId.equals(ToUserName) ) {
+            if (item.userId.equals(ToUserName)) {
                 item.session.getAsyncRemote().sendText(message);
-                System.err.println(this.userId+"发送成功："+ToUserName);
+                System.err.println(this.userId + "发送成功：" + ToUserName);
                 break;
             }
         }
     }
 
-    public void sendMessageAll(String message,String FromUserName) throws IOException {
+    public void sendMessageAll(String message, String FromUserName) throws IOException {
         for (AppChatSocket item : clients.values()) {
             item.session.getAsyncRemote().sendText(message);
         }

src/main/java/com/sqx/modules/firstLogin/entity/WorkExp.java

@@ -1,6 +1,7 @@
 package com.sqx.modules.firstLogin.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -46,5 +47,8 @@ public class WorkExp implements Serializable {
     @Column(name = "company_name", length = 255)
     private String companyName;
 
+    @TableField(exist = false)
+    private List<WorkExpDetail> workExpDetailList;
+
 
 }

src/main/java/com/sqx/modules/resumes/entity/Resumes.java

@@ -4,6 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sqx.modules.firstLogin.entity.Edu;
+import com.sqx.modules.firstLogin.entity.Skill;
+import com.sqx.modules.firstLogin.entity.WorkExp;
+import com.sqx.modules.intention.entity.Intention;
 import lombok.Data;
 import org.joda.time.DateTime;
 
@@ -226,6 +230,18 @@ public class Resumes implements Serializable {
      */
     private String picture;
 
+    @TableField(exist = false)
+    private List<Edu> eduList;
+
+    @TableField(exist = false)
+    private List<Skill> skillList;
+
+    @TableField(exist = false)
+    private List<Intention> intentionList;
+
+    @TableField(exist = false)
+    private List<WorkExp> workExpList;
+
 
     public Resumes() {
     }

src/main/java/com/sqx/modules/resumes/service/impl/ResumesServiceImpl.java

@@ -1,5 +1,7 @@
 package com.sqx.modules.resumes.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -16,7 +18,13 @@ import com.sqx.modules.chat.entity.ChatConversation;
 import com.sqx.modules.chat.service.ChatContentService;
 import com.sqx.modules.chat.service.ChatConversationService;
 import com.sqx.modules.common.service.CommonInfoService;
-import com.sqx.modules.firstLogin.entity.ResumesDto;
+import com.sqx.modules.firstLogin.entity.*;
+import com.sqx.modules.firstLogin.service.EduService;
+import com.sqx.modules.firstLogin.service.SkillService;
+import com.sqx.modules.firstLogin.service.WorkExpDetailService;
+import com.sqx.modules.firstLogin.service.WorkExpService;
+import com.sqx.modules.intention.entity.Intention;
+import com.sqx.modules.intention.service.IntentionService;
 import com.sqx.modules.message.entity.MessageInfo;
 import com.sqx.modules.message.service.MessageService;
 import com.sqx.modules.resumes.dao.ResumesDao;
@@ -222,6 +230,21 @@ public class ResumesServiceImpl extends ServiceImpl<ResumesDao, Resumes> impleme
         return Result.success();
     }
 
+    @Autowired
+    private EduService eduService;
+
+    @Autowired
+    private SkillService skillService;
+
+    @Autowired
+    private IntentionService intentionService;
+
+    @Autowired
+    private WorkExpService workExpService;
+
+    @Autowired
+    private WorkExpDetailService workExpDetailService;
+
     @Override
     public Result selectResumesList(Integer page, Integer limit, String startTime, String endTime, Resumes resumes) {
        IPage<Resumes> resumesPage = baseMapper.selectResumesList(new Page<>(page, limit), startTime, endTime, resumes);
@@ -309,6 +332,27 @@ public class ResumesServiceImpl extends ServiceImpl<ResumesDao, Resumes> impleme
             resumes.setAvatar(userEntity.getAvatar());
             resumes.setUserName(userEntity.getUserName());
         }
+
+        if(true){
+            List<Edu> eduList = eduService.list(new QueryWrapper<Edu>().eq("user_id", resumes.getUserId()).eq("is_use", 1));
+            List<Skill> skillList = skillService.list(new QueryWrapper<Skill>().eq("user_id", resumes.getUserId()).eq("is_use", 1));
+            List<Intention> intentionList = intentionService.list(new QueryWrapper<Intention>().eq("user_id", resumes.getUserId()));
+            List<WorkExp> workExpList = workExpService.list(new QueryWrapper<WorkExp>().eq("user_id", resumes.getUserId()).eq("is_use", 1));
+            if(CollUtil.isNotEmpty(workExpList)){
+                for (WorkExp workExp : workExpList) {
+                    List<WorkExpDetail> workExpDetailList = workExpDetailService.list(new QueryWrapper<WorkExpDetail>().eq("work_exp_id", workExp.getWorkExpId()));
+                    workExp.setWorkExpDetailList(workExpDetailList);
+                }
+            }
+
+            resumes.setEduList(eduList);
+            resumes.setSkillList(skillList);
+            resumes.setIntentionList(intentionList);
+            resumes.setWorkExpList(workExpList);
+            /*System.out.println("+++++++++++++++++++++++++++++++++");
+            System.out.println("---------------------------------");*/
+        }
+
         return resumes;
     }