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

11 months ago · a03076c89c
parent e5a75bd209 0842bf0736
commit a03076c89c
11 changed files with 102 additions and 105 deletions
--- a/common/pom.xml
+++ b/common/pom.xml
@ -91,10 +91,10 @@
            <artifactId>aliyun-java-sdk-core</artifactId>
        </dependency>

-        <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>aliyun-sdk-vod-upload</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.aliyun</groupId>-->
+<!--            <artifactId>aliyun-sdk-vod-upload</artifactId>-->
+<!--        </dependency>-->

        <dependency>
            <groupId>com.aliyun</groupId>
--- a/common/src/main/java/com/huoran/common/utils/AliyunOssUtil.java
+++ b/common/src/main/java/com/huoran/common/utils/AliyunOssUtil.java
@ -7,9 +7,7 @@ import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.OSSException;
 import com.aliyun.oss.model.*;
-import com.aliyun.vod.upload.impl.UploadVideoImpl;
-import com.aliyun.vod.upload.req.UploadStreamRequest;
-import com.aliyun.vod.upload.resp.UploadStreamResponse;
+
 import com.aliyuncs.DefaultAcsClient;
 import com.aliyuncs.vod.model.v20170321.DeleteVideoRequest;
 import com.aliyuncs.vod.model.v20170321.DeleteVideoResponse;
--- a/nakadai/pom.xml
+++ b/nakadai/pom.xml
@ -22,11 +22,11 @@

 	<dependencies>

-        <dependency>
-            <groupId>com.huoran.parent</groupId>
-            <artifactId>websocket</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.huoran.parent</groupId>-->
+<!--            <artifactId>websocket</artifactId>-->
+<!--            <version>1.0-SNAPSHOT</version>-->
+<!--        </dependency>-->

        <dependency>
            <groupId>org.springframework.boot</groupId>
--- a/nakadai/src/main/java/com/huoran/nakadai/controller/CommentController.java
+++ b/nakadai/src/main/java/com/huoran/nakadai/controller/CommentController.java
@ -12,8 +12,7 @@ import com.huoran.nakadai.entity.Notify;
 import com.huoran.nakadai.entity.res.CommentRes;
 import com.huoran.nakadai.service.CommentService;
 import com.huoran.nakadai.service.NotifyService;
-import com.huoran.websocket.model.dto.WebsocketMsgDTO;
-import com.huoran.websocket.service.WebsocketService;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@ -42,8 +41,8 @@ public class CommentController {
    @Autowired
    private NotifyService notifyService;

-    @Autowired
-    private WebsocketService webSocketService;
+//    @Autowired
+//    private WebsocketService webSocketService;

    @Autowired
    private UserClient userClient;
@ -95,15 +94,15 @@ public class CommentController {
        }

        // 发送webSocket消息
-        if (comment.getReplyAccountId()!=null){
-            WebsocketMsgDTO websocketMsgDTO = new WebsocketMsgDTO();
-            websocketMsgDTO.setForm(accountId);
-            websocketMsgDTO.setUsername(accountId);
-            websocketMsgDTO.setTo(comment.getReplyAccountId().toString());
-            websocketMsgDTO.setContent(comment.getContent());
-            websocketMsgDTO.setExtras(null);
-            webSocketService.send(websocketMsgDTO);
-        }
+//        if (comment.getReplyAccountId()!=null){
+//            WebsocketMsgDTO websocketMsgDTO = new WebsocketMsgDTO();
+//            websocketMsgDTO.setForm(accountId);
+//            websocketMsgDTO.setUsername(accountId);
+//            websocketMsgDTO.setTo(comment.getReplyAccountId().toString());
+//            websocketMsgDTO.setContent(comment.getContent());
+//            websocketMsgDTO.setExtras(null);
+//            webSocketService.send(websocketMsgDTO);
+//        }

        return save ? R.ok() : R.error();
    }
--- a/nakadai/src/main/java/com/huoran/nakadai/controller/MessageController.java
+++ b/nakadai/src/main/java/com/huoran/nakadai/controller/MessageController.java
@ -3,9 +3,6 @@ package com.huoran.nakadai.controller;
 import com.huoran.common.response.R;
 import com.huoran.common.utils.TokenUtils;
 import com.huoran.nakadai.service.MessageService;
-import com.huoran.websocket.model.dto.WebsocketMsgDTO;
-import com.huoran.websocket.model.vo.SendMsgVO;
-import com.huoran.websocket.service.WebsocketService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@ -28,38 +25,38 @@ public class MessageController {
    @Autowired
    private MessageService messageService;

-    @Autowired
-    private WebsocketService webSocketService;
-
-    @ApiOperation(value = "所有在线用户接收消息通知",response = SendMsgVO.class)
-    @PostMapping("/refreshPageNotification")
-    public void refreshPageNotification(
-            @ApiParam(name = "username", value = "发送者名称", required = false)
-            @RequestParam(required = false) String username,
-            @ApiParam(name = "to", value = "发给谁（默认发送给所有在线用户）", required = false)
-            @RequestParam(required = false) String to,
-            @ApiParam(name = "content", value = "消息通知", required = false)
-            @RequestParam(required = false) String content) {
-        WebsocketMsgDTO websocketMsgDTO = new WebsocketMsgDTO();
-        websocketMsgDTO.setForm("系统消息");
-        if (StringUtils.isEmpty(username)){
-            websocketMsgDTO.setUsername("系统通知机器人");
-        }else {
-            websocketMsgDTO.setUsername(username);
-        }
-        if (StringUtils.isEmpty(to)){
-            websocketMsgDTO.setTo("all");
-        }else {
-            websocketMsgDTO.setTo(to);
-        }
-        if (StringUtils.isEmpty(content)){
-            websocketMsgDTO.setContent("refresh");
-        }else {
-            websocketMsgDTO.setContent(content);
-        }
-        websocketMsgDTO.setExtras(null);
-        webSocketService.send(websocketMsgDTO);
-    }
+//    @Autowired
+//    private WebsocketService webSocketService;
+
+//    @ApiOperation(value = "所有在线用户接收消息通知",response = SendMsgVO.class)
+//    @PostMapping("/refreshPageNotification")
+//    public void refreshPageNotification(
+//            @ApiParam(name = "username", value = "发送者名称", required = false)
+//            @RequestParam(required = false) String username,
+//            @ApiParam(name = "to", value = "发给谁（默认发送给所有在线用户）", required = false)
+//            @RequestParam(required = false) String to,
+//            @ApiParam(name = "content", value = "消息通知", required = false)
+//            @RequestParam(required = false) String content) {
+//        WebsocketMsgDTO websocketMsgDTO = new WebsocketMsgDTO();
+//        websocketMsgDTO.setForm("系统消息");
+//        if (StringUtils.isEmpty(username)){
+//            websocketMsgDTO.setUsername("系统通知机器人");
+//        }else {
+//            websocketMsgDTO.setUsername(username);
+//        }
+//        if (StringUtils.isEmpty(to)){
+//            websocketMsgDTO.setTo("all");
+//        }else {
+//            websocketMsgDTO.setTo(to);
+//        }
+//        if (StringUtils.isEmpty(content)){
+//            websocketMsgDTO.setContent("refresh");
+//        }else {
+//            websocketMsgDTO.setContent(content);
+//        }
+//        websocketMsgDTO.setExtras(null);
+//        webSocketService.send(websocketMsgDTO);
+//    }

    /**
     * 发送指定的用户队列
--- a/nakadai/src/main/java/com/huoran/nakadai/entity/UserInfo.java
+++ b/nakadai/src/main/java/com/huoran/nakadai/entity/UserInfo.java
@ -76,6 +76,7 @@ public class UserInfo implements Serializable {
    private Integer isDel;

    @ApiModelProperty(value = "最后登陆时间")
+    @TableField(fill = FieldFill.INSERT)
    private Date lastLoginTime;

    @ApiModelProperty(value = "绑定多个角色id")
--- a/nakadai/src/main/java/com/huoran/nakadai/service/impl/OSSFileServiceImpl.java
+++ b/nakadai/src/main/java/com/huoran/nakadai/service/impl/OSSFileServiceImpl.java
@ -1,9 +1,6 @@
 package com.huoran.nakadai.service.impl;

 import com.aliyun.oss.ClientException;
-import com.aliyun.vod.upload.impl.UploadVideoImpl;
-import com.aliyun.vod.upload.req.UploadStreamRequest;
-import com.aliyun.vod.upload.resp.UploadStreamResponse;
 import com.aliyuncs.DefaultAcsClient;
 import com.aliyuncs.vod.model.v20170321.DeleteVideoRequest;
 import com.aliyuncs.vod.model.v20170321.DeleteVideoResponse;
@ -70,8 +67,8 @@ public class OSSFileServiceImpl implements OSSFileService {
        filesResult.setFileSize(fileSize);

        //上传流请求
-        UploadStreamRequest request = new UploadStreamRequest(ConstantPropertiesUtil.ACCESS_KEY_ID,
-                ConstantPropertiesUtil.ACCESS_KEY_SECRET, title, originalFilename, inputStream);
+//        UploadStreamRequest request = new UploadStreamRequest(ConstantPropertiesUtil.ACCESS_KEY_ID,
+//                ConstantPropertiesUtil.ACCESS_KEY_SECRET, title, originalFilename, inputStream);

        /* 是否使用默认水印(可选)，指定模板组ID时，根据模板组配置确定是否使用默认水印*/
        //request.setShowWaterMark(true);
@ -104,20 +101,20 @@ public class OSSFileServiceImpl implements OSSFileService {
        /* ECS部署区域*/
        // request.setEcsRegionId("cn-shanghai");

-        UploadVideoImpl uploader = new UploadVideoImpl();
-        UploadStreamResponse response = uploader.uploadStream(request);
-
-        //如果设置回调URL无效，不影响视频上传，可以返回VideoId同时会返回错误码。
-        // 其他情况上传失败时，VideoId为空，此时需要根据返回错误码分析具体错误原因
-        String videoId = response.getVideoId();
-        if (!response.isSuccess()) {
-            String errorMessage = "阿里云视频上传错误：" + "code：" + response.getCode() + ", message：" + response.getMessage();
-            log.error(errorMessage);
-            if (StringUtils.isEmpty(videoId)) {
-                throw new CustomException(ExceptionEnum.UNKNOWN_EXCEPTION);
-            }
-        }
-        filesResult.setFileId(videoId);
+//        UploadVideoImpl uploader = new UploadVideoImpl();
+//        UploadStreamResponse response = uploader.uploadStream(request);
+//
+//        //如果设置回调URL无效，不影响视频上传，可以返回VideoId同时会返回错误码。
+//        // 其他情况上传失败时，VideoId为空，此时需要根据返回错误码分析具体错误原因
+//        String videoId = response.getVideoId();
+//        if (!response.isSuccess()) {
+//            String errorMessage = "阿里云视频上传错误：" + "code：" + response.getCode() + ", message：" + response.getMessage();
+//            log.error(errorMessage);
+//            if (StringUtils.isEmpty(videoId)) {
+//                throw new CustomException(ExceptionEnum.UNKNOWN_EXCEPTION);
+//            }
+//        }
+//        filesResult.setFileId(videoId);
        return filesResult;
    }

--- a/occupationlab/src/main/java/com/huoran/occupationlab/service/impl/OSSFileServiceImpl.java
+++ b/occupationlab/src/main/java/com/huoran/occupationlab/service/impl/OSSFileServiceImpl.java
@ -1,8 +1,6 @@
 package com.huoran.occupationlab.service.impl;

-import com.aliyun.vod.upload.impl.UploadVideoImpl;
-import com.aliyun.vod.upload.req.UploadStreamRequest;
-import com.aliyun.vod.upload.resp.UploadStreamResponse;
+
 import com.aliyuncs.DefaultAcsClient;
 import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.vod.model.v20170321.DeleteVideoRequest;
@ -91,23 +89,23 @@ public class OSSFileServiceImpl implements OSSFileService {
        filesResult.setFileType(fileType);

        //上传流请求
-        UploadStreamRequest request = new UploadStreamRequest(ConstantPropertiesUtil.ACCESS_KEY_ID, ConstantPropertiesUtil.ACCESS_KEY_SECRET, title, originalFilename, inputStream);
-
-
-        UploadVideoImpl uploader = new UploadVideoImpl();
-        UploadStreamResponse response = uploader.uploadStream(request);
+//        UploadStreamRequest request = new UploadStreamRequest(ConstantPropertiesUtil.ACCESS_KEY_ID, ConstantPropertiesUtil.ACCESS_KEY_SECRET, title, originalFilename, inputStream);
+//
+//
+//        UploadVideoImpl uploader = new UploadVideoImpl();
+//        UploadStreamResponse response = uploader.uploadStream(request);

        //如果设置回调URL无效，不影响视频上传，可以返回VideoId同时会返回错误码。
        // 其他情况上传失败时，VideoId为空，此时需要根据返回错误码分析具体错误原因
-        String videoId = response.getVideoId();
-        if (!response.isSuccess()) {
-            String errorMessage = "阿里云视频上传错误：" + "code：" + response.getCode() + ", message：" + response.getMessage();
-            log.error(errorMessage);
-            if (StringUtils.isEmpty(videoId)) {
-                throw new CustomException(201, errorMessage);
-            }
-        }
-        filesResult.setFileId(videoId);
+//        String videoId = response.getVideoId();
+//        if (!response.isSuccess()) {
+//            String errorMessage = "阿里云视频上传错误：" + "code：" + response.getCode() + ", message：" + response.getMessage();
+//            log.error(errorMessage);
+//            if (StringUtils.isEmpty(videoId)) {
+//                throw new CustomException(201, errorMessage);
+//            }
+//        }
+//        filesResult.setFileId(videoId);
        return filesResult;
    }

--- a/pom.xml
+++ b/pom.xml
@ -200,11 +200,11 @@
                <version>${aliyun-java-sdk-vod.version}</version>
            </dependency>

-            <dependency>
-                <groupId>com.aliyun</groupId>
-                <artifactId>aliyun-sdk-vod-upload</artifactId>
-                <version>${aliyun-sdk-vod-upload.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>com.aliyun</groupId>-->
+<!--                <artifactId>aliyun-sdk-vod-upload</artifactId>-->
+<!--                <version>${aliyun-sdk-vod-upload.version}</version>-->
+<!--            </dependency>-->

            <!-- Easy poi-->
            <!-- excle导入导出依赖包 start -->
--- a/users/src/main/java/com/huoran/users/mapper/xml/HrUserAccountMapper.xml
+++ b/users/src/main/java/com/huoran/users/mapper/xml/HrUserAccountMapper.xml
@ -843,10 +843,10 @@
        u.login_number,
        CASE
        WHEN count(ai.id) > 0 THEN ai.real_name
-        ELSE u.user_name
+        ELSE GROUP_CONCAT(u.user_name)
        END as user_name,
        a.work_number,
-        s.platform_name,
+        GROUP_CONCAT(s.platform_name) as platformName,
        CASE
        WHEN count(ai.id) > 0 THEN '已认证'
        ELSE '未认证'
@ -881,7 +881,7 @@
            AND ( a.phone LIKE CONCAT('%',#{userInfoReq.searchContent},'%')
            OR u.user_name LIKE CONCAT('%',#{userInfoReq.searchContent},'%'))
        </if>
-        GROUP BY a.id
+        GROUP BY a.app_open_id
        ORDER BY
        create_time DESC
    </select>
--- a/users/src/main/java/com/huoran/users/service/impl/HrUserAccountServiceImpl.java
+++ b/users/src/main/java/com/huoran/users/service/impl/HrUserAccountServiceImpl.java
@ -443,8 +443,15 @@ public class HrUserAccountServiceImpl extends ServiceImpl<HrUserAccountMapper, H
        //查询账号详情List
        List<HrUserAccount> userAccountList = hrUserAccountMapper.selectList(new QueryWrapper<HrUserAccount>()
                .eq("app_open_id", openId));
+        //查询个人端用户信息
+        Integer userId = null;
+        for (HrUserAccount hrUserAccount : userAccountList) {
+            if (hrUserAccount.getPlatformId().equals("7")){
+                userId = hrUserAccount.getUserId();
+            }
+        }
        //查询用户信息
-        HrUserInfo hrUserInfo = hrUserInfoMapper.selectByUserId(userAccountList.get(0).getUserId());
+        HrUserInfo hrUserInfo = hrUserInfoMapper.selectByUserId(userId);
        if (StringUtils.isNotBlank(url)){
            hrUserInfo.setUserAvatars(url);
        }