111

src/main/java/com/fdkankan/contro/mq/listener/BuildSceneProcessLogListener.java

@@ -5,7 +5,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.common.constant.CommonOperStatus;
 import com.fdkankan.common.constant.ModelingBuildStatus;
+import com.fdkankan.contro.entity.JyUser;
 import com.fdkankan.contro.entity.OrigFileUploadBatch;
+import com.fdkankan.contro.entity.ScenePlus;
 import com.fdkankan.contro.service.IJmgaService;
 import com.fdkankan.contro.service.IOrigFileUploadBatchService;
 import com.fdkankan.contro.service.ISceneBuildProcessLogService;
@@ -24,6 +26,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 @Slf4j
 @Component
@@ -71,11 +74,18 @@ public class BuildSceneProcessLogListener{
                 status = CommonOperStatus.WAITING.code();
                 Map<String, Object> param = new HashMap<>();
                 try {
+                    JyUser jyUser = scenePlusService.getJyUserByNum(num);
+                    ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
                     param.put("event_type", "计算中");
-                    param.put("event_content", "计算中");
+                    param.put("event_content", "scene");
                     param.put("scene_num", num);
                     param.put("event_time", new Date());
-                    param.put("ryid", scenePlusService.getRyIdByNum(num));
+                    if(Objects.nonNull(scenePlus)){
+                        param.put("scene_title", scenePlus.getTitle());
+                    }
+                    param.put("ryid", jyUser.getRyId());
+                    param.put("ryno", jyUser.getRyNo());
+                    param.put("nick_name", jyUser.getRyNickName());
                     jmgaService.sendStatus(param);
                 }catch (Exception e){
                     log.info("推送事件失败,param:{}", param);

src/main/java/com/fdkankan/contro/mq/service/impl/BuildObjServiceImpl.java

@@ -146,11 +146,18 @@ public class BuildObjServiceImpl implements IBuildSceneService {
 
             Map<String, Object> param = new HashMap<>();
             try {
+                JyUser jyUser = scenePlusService.getJyUserByNum(num);
+                ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
                 param.put("event_type", "排队中");
-                param.put("event_content", "排队中");
+                param.put("event_content", "scene");
                 param.put("scene_num", num);
                 param.put("event_time", new Date());
-                param.put("ryid", scenePlusService.getRyIdByNum(num));
+                if(Objects.nonNull(scenePlus)){
+                    param.put("scene_title", scenePlus.getTitle());
+                }
+                param.put("ryid", jyUser.getRyId());
+                param.put("ryno", jyUser.getRyNo());
+                param.put("nick_name", jyUser.getRyNickName());
                 jmgaService.sendStatus(param);
             }catch (Exception ex){
                 log.info("推送事件失败,param:{}", param);
@@ -168,11 +175,18 @@ public class BuildObjServiceImpl implements IBuildSceneService {
 
             Map<String, Object> param = new HashMap<>();
             try {
+                JyUser jyUser = scenePlusService.getJyUserByNum(num);
+                ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
                 param.put("event_type", "计算失败");
-                param.put("event_content", "计算资源准备失败");
+                param.put("event_content", "scene");
                 param.put("scene_num", num);
                 param.put("event_time", new Date());
-                param.put("ryid", scenePlusService.getRyIdByNum(num));
+                if(Objects.nonNull(scenePlus)){
+                    param.put("scene_title", scenePlus.getTitle());
+                }
+                param.put("ryid", jyUser.getRyId());
+                param.put("ryno", jyUser.getRyNo());
+                param.put("nick_name", jyUser.getRyNickName());
                 jmgaService.sendStatus(param);
             }catch (Exception ex){
                 log.info("推送事件失败,param:{}", param);
@@ -218,11 +232,18 @@ public class BuildObjServiceImpl implements IBuildSceneService {
 
                 Map<String, Object> param = new HashMap<>();
                 try {
+                    ScenePlus scenePlus = scenePlusService.getScenePlusByNum(projectNum);
+                    JyUser jyUser = scenePlusService.getJyUserByNum(projectNum);
                     param.put("event_type", "计算失败");
-                    param.put("event_content", "算法报错");
+                    param.put("event_content", "scene");
                     param.put("scene_num", projectNum);
                     param.put("event_time", new Date());
-                    param.put("ryid", scenePlusService.getRyIdByNum(projectNum));
+                    if(Objects.nonNull(scenePlus)){
+                        param.put("scene_title", scenePlus.getTitle());
+                    }
+                    param.put("ryid", jyUser.getRyId());
+                    param.put("ryno", jyUser.getRyNo());
+                    param.put("nick_name", jyUser.getRyNickName());
                     jmgaService.sendStatus(param);
                 }catch (Exception ex){
                     log.info("推送事件失败,param:{}", param);
@@ -349,11 +370,17 @@ public class BuildObjServiceImpl implements IBuildSceneService {
 
             Map<String, Object> param = new HashMap<>();
             try {
+                JyUser jyUser = scenePlusService.getJyUserByNum(projectNum);
                 param.put("event_type", "计算成功");
-                param.put("event_content", "计算成功");
+                param.put("event_content", "scene");
                 param.put("scene_num", projectNum);
                 param.put("event_time", new Date());
-                param.put("ryid", scenePlusService.getRyIdByNum(projectNum));
+                if(Objects.nonNull(scenePlus)){
+                    param.put("scene_title", scenePlus.getTitle());
+                }
+                param.put("ryid", jyUser.getRyId());
+                param.put("ryno", jyUser.getRyNo());
+                param.put("nick_name", jyUser.getRyNickName());
                 jmgaService.sendStatus(param);
             }catch (Exception ex){
                 log.info("推送事件失败,param:{}", param);
@@ -377,11 +404,18 @@ public class BuildObjServiceImpl implements IBuildSceneService {
 
             Map<String, Object> param = new HashMap<>();
             try {
+                ScenePlus scenePlus = scenePlusService.getScenePlusByNum(projectNum);
+                JyUser jyUser = scenePlusService.getJyUserByNum(projectNum);
                 param.put("event_type", "计算失败");
-                param.put("event_content", "计算结果处理失败");
+                param.put("event_content", "scene");
                 param.put("scene_num", projectNum);
                 param.put("event_time", new Date());
-                param.put("ryid", scenePlusService.getRyIdByNum(projectNum));
+                if(Objects.nonNull(scenePlus)){
+                    param.put("scene_title", scenePlus.getTitle());
+                }
+                param.put("ryid", jyUser.getRyId());
+                param.put("ryno", jyUser.getRyNo());
+                param.put("nick_name", jyUser.getRyNickName());
                 jmgaService.sendStatus(param);
             }catch (Exception ex){
                 log.info("推送事件失败,param:{}", param);

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -167,7 +167,6 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                 }
             }
 
-
             //重新计算时需要删除文件夹，否知使用缓存
             if(new File(message.getPath() + File.separator + "results").exists()){
                 FileUtils.deleteDirectory(message.getPath() + File.separator + "results");
@@ -249,11 +248,18 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
             Map<String, Object> param = new HashMap<>();
             try {
+                ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
+                JyUser jyUser = scenePlusService.getJyUserByNum(num);
                 param.put("event_type", "排队中");
-                param.put("event_content", "排队中");
+                param.put("event_content", "scene");
                 param.put("scene_num", num);
                 param.put("event_time", new Date());
-                param.put("ryid", scenePlusService.getRyIdByNum(num));
+                if(Objects.nonNull(scenePlus)){
+                    param.put("scene_title", scenePlus.getTitle());
+                }
+                param.put("ryid", jyUser.getRyId());
+                param.put("ryno", jyUser.getRyNo());
+                param.put("nick_name", jyUser.getRyNickName());
                 jmgaService.sendStatus(param);
             }catch (Exception e){
                 log.info("推送事件失败,param:{}", param);
@@ -276,6 +282,8 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                 if(code == ErrorCode.FAILURE_CODE_4001.code()){
                     reason = "文件缺失，请重新上传";
                 }
+            }else{
+                reason = "前置处理异常";
             }
 
             scenePlusService.update(new LambdaUpdateWrapper<ScenePlus>()
@@ -287,11 +295,18 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
             Map<String, Object> param = new HashMap<>();
             try {
+                ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
+                JyUser jyUser = scenePlusService.getJyUserByNum(num);
                 param.put("event_type", "计算失败");
-                param.put("event_content", "计算资源准备失败");
+                param.put("event_content", "scene");
                 param.put("scene_num", num);
                 param.put("event_time", new Date());
-                param.put("ryid", scenePlusService.getRyIdByNum(num));
+                if(Objects.nonNull(scenePlus)){
+                    param.put("scene_title", scenePlus.getTitle());
+                }
+                param.put("ryid", jyUser.getRyId());
+                param.put("ryno", jyUser.getRyNo());
+                param.put("nick_name", jyUser.getRyNickName());
                 jmgaService.sendStatus(param);
             }catch (Exception ex){
                 log.info("推送事件失败,param:{}", param);
@@ -318,21 +333,22 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
         for (OrigFileUpload origFileUpload : fileList) {
             int times = 0;
             String filePath = homePath.concat(origFileUpload.getFileName());
+            log.info("开始下载原始文件, url:{}, filePath:{}", origFileUpload.getFileUrl(), filePath);
             do{
                 try {
                     ++times;
-                    HttpUtil.downloadFile(origFileUpload.getFileUrl(), new File(filePath), 10 * 60 * 1000);
+                    HttpUtil.downloadFile(origFileUpload.getFileUrl(), new File(filePath), 3 * 60 * 1000);
                     if(FileUtil.exist(filePath)){
                         break;
                     }
                 }catch (Exception e){
-                    log.info("原始文件第{}次下载失败，fileUrl:{}, filePath:{}", origFileUpload.getFileUrl(), filePath);
+                    log.info("原始文件第{}次下载失败，fileUrl:{}, filePath:{}", times, origFileUpload.getFileUrl(), filePath);
                 }
-            }while (times < 4);
-
-            if(!FileUtil.exist(filePath)){
-                throw new RuntimeException("原始文件下载失败，fileUrl:" + origFileUpload.getFileUrl() + ", filePath:" + filePath);
-            }
+            }while (times < 3);
+            log.info("下载原始文件结束, url:{}, filePath:{}", origFileUpload.getFileUrl(), filePath);
+//            if(!FileUtil.exist(filePath)){
+//                throw new RuntimeException("原始文件下载失败，fileUrl:" + origFileUpload.getFileUrl() + ", filePath:" + filePath);
+//            }
         }
     }
 
@@ -362,21 +378,22 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             }
             int times = 0;
             String filePath = homePath.concat(relativeFilePath);
+            log.info("开始下载原始文件, url:{}, filePath:{}", origFileUpload.getFileUrl(), filePath);
             do{
                 try {
                     ++times;
-                    HttpUtil.downloadFile(origFileUpload.getFileUrl(), new File(filePath), 10 * 60 * 1000);
+                    HttpUtil.downloadFile(origFileUpload.getFileUrl(), new File(filePath), 3 * 60 * 1000);
                     if(FileUtil.exist(filePath)){
                         break;
                     }
                 }catch (Exception e){
-                    log.info("原始文件第{}次下载失败，fileUrl:{}, filePath:{}", origFileUpload.getFileUrl(), filePath);
+                    log.info("原始文件第{}次下载失败，fileUrl:{}, filePath:{}", times, origFileUpload.getFileUrl(), filePath);
                 }
             }while (times < 4);
-
-            if(!FileUtil.exist(filePath)){
-                throw new RuntimeException("原始文件下载失败，fileUrl:" + origFileUpload.getFileUrl() + ", filePath:" + filePath);
-            }
+            log.info("下载原始文件结束, url:{}, filePath:{}", origFileUpload.getFileUrl(), filePath);
+//            if(!FileUtil.exist(filePath)){
+//                throw new RuntimeException("原始文件下载失败，fileUrl:" + origFileUpload.getFileUrl() + ", filePath:" + filePath);
+//            }
         }
     }
 
@@ -403,11 +420,11 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
         String batchIds = (String) message.getExt().get("batchId");
         Long count = redisUtil.decr("modeling-count:" + sceneCode, 1);
         log.info("场景:{},剩余计算次数：{}", sceneCode, count);
+        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(sceneCode);
         try {
 
             //如果场景被删除，就无需往下运行了
-            ScenePlus scenePlusByNum = scenePlusService.getScenePlusByNum(sceneCode);
-            if(Objects.isNull(scenePlusByNum)){
+            if(Objects.isNull(scenePlus)){
                 log.info("场景已被删除,场景码:{}", sceneCode);
                 return;
             }
@@ -428,17 +445,24 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                 if(count < 1){
                     scenePlusService.update(new LambdaUpdateWrapper<ScenePlus>()
                             .set(ScenePlus::getSceneStatus, SceneStatus.FAILD.code())
+                            .set(ScenePlus::getBuildFailReason, "算法报错")
                             .eq(ScenePlus::getNum, sceneCode));
 
                     this.sendFailToLaser(sceneCode);
 
                     Map<String, Object> param = new HashMap<>();
                     try {
+                        JyUser jyUser = scenePlusService.getJyUserByNum(sceneCode);
                         param.put("event_type", "计算失败");
-                        param.put("event_content", "算法报错");
+                        param.put("event_content", "scene");
                         param.put("scene_num", sceneCode);
                         param.put("event_time", new Date());
-                        param.put("ryid", scenePlusService.getRyIdByNum(sceneCode));
+                        if(Objects.nonNull(scenePlus)){
+                            param.put("scene_title", scenePlus.getTitle());
+                        }
+                        param.put("ryid", jyUser.getRyId());
+                        param.put("ryno", jyUser.getRyNo());
+                        param.put("nick_name", jyUser.getRyNickName());
                         jmgaService.sendStatus(param);
                     }catch (Exception e){
                         log.info("推送事件失败,param:{}", param);
@@ -448,8 +472,6 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                 return;
             }
 
-            ScenePlus scenePlus = scenePlusService.getScenePlusByNum(sceneCode);
-
             Integer cameraType = Integer.parseInt(message.getBuildContext().get("cameraType").toString());
             Map<String, String> uploadFiles = getUploadFiles(scenePlus,path,cameraType,fdageData);
 
@@ -581,9 +603,9 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             this.pushMsgToApp(pushChannel,pushToken, cameraType, scenePlus.getTitle(), scenePlusExt.getWebSite());
 
             //删除计算目录
-//            if(CollUtil.isEmpty(notDeleteNasNumList) || !notDeleteNasNumList.contains(sceneCode)){
-//                CreateObjUtil.deleteFile(path.replace(ConstantFilePath.BUILD_MODEL_PATH, "/"));
-//            }
+            if(CollUtil.isEmpty(notDeleteNasNumList) || !notDeleteNasNumList.contains(sceneCode)){
+                CreateObjUtil.deleteFile(path.replace(ConstantFilePath.BUILD_MODEL_PATH, "/"));
+            }
 
             //更新场景主表
             //如果相机容量不足，需要把场景的paystatus改为容量不足状态
@@ -613,11 +635,17 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
             Map<String, Object> param = new HashMap<>();
             try {
+                JyUser jyUser = scenePlusService.getJyUserByNum(sceneCode);
                 param.put("event_type", "计算成功");
-                param.put("event_content", "计算成功");
+                param.put("event_content", "scene");
                 param.put("scene_num", sceneCode);
                 param.put("event_time", new Date());
-                param.put("ryid", scenePlusService.getRyIdByNum(sceneCode));
+                if(Objects.nonNull(scenePlus)){
+                    param.put("scene_title", scenePlus.getTitle());
+                }
+                param.put("ryid", jyUser.getRyId());
+                param.put("ryno", jyUser.getRyNo());
+                param.put("nick_name", jyUser.getRyNickName());
                 jmgaService.sendStatus(param);
             }catch (Exception e){
                 log.info("推送事件失败,param:{}", param);
@@ -628,17 +656,24 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
             scenePlusService.update(new LambdaUpdateWrapper<ScenePlus>()
                     .set(ScenePlus::getSceneStatus, SceneStatus.FAILD.code())
+                    .set(ScenePlus::getBuildFailReason, "后置处理异常")
                     .eq(ScenePlus::getNum, sceneCode));
 
             this.sendFailToLaser(sceneCode);
 
             Map<String, Object> param = new HashMap<>();
             try {
+                JyUser jyUser = scenePlusService.getJyUserByNum(sceneCode);
                 param.put("event_type", "计算失败");
-                param.put("event_content", "计算结果处理失败");
+                param.put("event_content", "scene");
                 param.put("scene_num", sceneCode);
+                if(Objects.nonNull(scenePlus)){
+                    param.put("scene_title", scenePlus.getTitle());
+                }
                 param.put("event_time", new Date());
-                param.put("ryid", scenePlusService.getRyIdByNum(sceneCode));
+                param.put("ryid", jyUser.getRyId());
+                param.put("ryno", jyUser.getRyNo());
+                param.put("nick_name", jyUser.getRyNickName());
                 jmgaService.sendStatus(param);
             }catch (Exception ex){
                 log.info("推送事件失败,param:{}", param);

src/main/java/com/fdkankan/contro/mq/service/impl/CallBuildServiceImpl.java

@@ -66,7 +66,7 @@ public class CallBuildServiceImpl implements CallBuildService {
         }
         for (String uuid : map.keySet()) {
             ScenePlus scenePlus = scenePlusService.getByUuid(uuid);
-            boolean lock = redisLockUtil.lock("push-modeling-pre:" + scenePlus.getNum(), scenePlus.getNum(), 30*60*1000);
+            boolean lock = redisLockUtil.lock("push-modeling-pre:" + scenePlus.getNum(), scenePlus.getNum(), 20*60);
             if(!lock){
                 continue;
             }
@@ -89,8 +89,6 @@ public class CallBuildServiceImpl implements CallBuildService {
 
             }catch (Exception e){
                 log.error("推送场景计算失败，uuid:{}", uuid, e);
-            }finally {
-                redisLockUtil.unlock("push-modeling-pre:" + scenePlus.getNum(), scenePlus.getNum());
             }
 
         }

src/main/java/com/fdkankan/contro/service/IOrigFileUploadService.java

@@ -1,8 +1,7 @@
 package com.fdkankan.contro.service;
 
-import com.fdkankan.contro.entity.OrigFileUpload;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.contro.entity.OrigFileUploadBatch;
+import com.fdkankan.contro.entity.OrigFileUpload;
 
 import java.util.List;
 

src/main/java/com/fdkankan/contro/service/IScenePlusService.java

@@ -1,6 +1,7 @@
 package com.fdkankan.contro.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.contro.entity.JyUser;
 import com.fdkankan.contro.entity.ScenePlus;
 import com.fdkankan.web.response.ResultData;
 
@@ -24,7 +25,7 @@ public interface IScenePlusService extends IService<ScenePlus> {
 
     Long sumUsedSpaceByCameraId(Long cameraId, String spaceTypeStr);
 
-    String getRyIdByNum(String num);
+    JyUser getJyUserByNum(String num);
 
     ScenePlus getByUuid(String uuid);
 }

src/main/java/com/fdkankan/contro/service/impl/JmgaServiceImpl.java

@@ -134,6 +134,17 @@ public class JmgaServiceImpl implements IJmgaService {
                 }
             }
         }
+        if(camType == 6){
+            String parametersPath = dataSource.concat(File.separator).concat("capture").concat(File.separator).concat("images/parameters.json");
+            if(!FileUtil.exist(parametersPath)){
+                throw new BusinessException(ErrorCode.FAILURE_CODE_4001.code(), ErrorCode.FAILURE_CODE_4001.formatMessage("parameters.json"));
+            }
+
+            String sfmDataBinPath = dataSource.concat(File.separator).concat("capture").concat(File.separator).concat("result/reconstructio/sfm_data.bin");
+            if(!FileUtil.exist(sfmDataBinPath)){
+                throw new BusinessException(ErrorCode.FAILURE_CODE_4001.code(), ErrorCode.FAILURE_CODE_4001.formatMessage("sfm_data.bin"));
+            }
+        }
 
         //从data.fdage中获取需要上传的文件列表
         JSONArray points = fdageData.getJSONArray("points");

src/main/java/com/fdkankan/contro/service/impl/OrigFileUploadServiceImpl.java

@@ -2,13 +2,16 @@ package com.fdkankan.contro.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.contro.entity.OrigFileUpload;
 import com.fdkankan.contro.mapper.IOrigFileUploadMapper;
 import com.fdkankan.contro.service.IOrigFileUploadService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * <p>
@@ -34,4 +37,5 @@ public class OrigFileUploadServiceImpl extends ServiceImpl<IOrigFileUploadMapper
         }
         return list.get(0);
     }
+
 }

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -1723,11 +1723,17 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
 
         Map<String, Object> param = new HashMap<>();
         try {
+            JyUser jyUser = scenePlusService.getJyUserByNum(sceneNum);
             param.put("event_type", "上传完毕");
-            param.put("event_content", "上传完毕");
+            param.put("event_content", "scene");
             param.put("scene_num", sceneNum);
             param.put("event_time", new Date());
-            param.put("ryid", scenePlusService.getRyIdByNum(sceneNum));
+            if(Objects.nonNull(scenePlus)){
+                param.put("scene_title", scenePlus.getTitle());
+            }
+            param.put("ryid", jyUser.getRyId());
+            param.put("ryno", jyUser.getRyNo());
+            param.put("nick_name", jyUser.getRyNickName());
             jmgaService.sendStatus(param);
         }catch (Exception e){
             log.info("推送事件失败,param:{}", param);
@@ -2518,11 +2524,18 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
 
                 Map<String, Object> param = new HashMap<>();
                 try {
+                    JyUser jyUser = scenePlusService.getJyUserByNum(sceneNum);
+                    ScenePlus scenePlus = scenePlusService.getScenePlusByNum(sceneNum);
                     param.put("event_type", "通知计算失败");
-                    param.put("event_content", "通知计算失败");
+                    param.put("event_content", "scene");
                     param.put("scene_num", sceneNum);
                     param.put("event_time", new Date());
-                    param.put("ryid", scenePlusService.getRyIdByNum(sceneNum));
+                    if(Objects.nonNull(scenePlus)){
+                        param.put("scene_title", scenePlus.getTitle());
+                    }
+                    param.put("ryid", jyUser.getRyId());
+                    param.put("ryno", jyUser.getRyNo());
+                    param.put("nick_name", jyUser.getRyNickName());
                     jmgaService.sendStatus(param);
                 }catch (Exception ex){
                     log.info("推送事件失败,param:{}", param);

src/main/java/com/fdkankan/contro/service/impl/ScenePlusServiceImpl.java

@@ -145,11 +145,11 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     }
 
     @Override
-    public String getRyIdByNum(String num) {
+    public JyUser getJyUserByNum(String num) {
         ScenePlus scenePlus = this.getScenePlusByNum(num);
         Long userId = scenePlus.getUserId();
         JyUser jyUser = jyUserService.getByUserId(userId);
-        return jyUser.getRyId();
+        return jyUser;
     }
 
     @Override