1.8.0

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

@@ -5,9 +5,7 @@ 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;
@@ -23,10 +21,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.nio.charset.StandardCharsets;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
 
 @Slf4j
 @Component
@@ -72,24 +66,6 @@ public class BuildSceneProcessLogListener{
                     origFileUploadBatchService.update(new LambdaUpdateWrapper<OrigFileUploadBatch>().set(OrigFileUploadBatch::getStatus, 2).in(OrigFileUploadBatch::getBatchId, batchIds.split(",")));
                 }
                 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", "scene");
-                    param.put("event_content", "计算中");
-                    param.put("scene_num", num);
-                    param.put("event_time", new Date());
-                    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);
-                }
             }else{
                 if(buildStatus != ModelingBuildStatus.SUCCESS.code()){
                     status = CommonOperStatus.FAILD.code();

src/main/java/com/fdkankan/contro/mq/service/CallBuildService.java

@@ -2,7 +2,6 @@ package com.fdkankan.contro.mq.service;
 
 public interface CallBuildService {
 
-    void pushPre();
 
 
 }

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

@@ -144,25 +144,6 @@ public class BuildObjServiceImpl implements IBuildSceneService {
             message.setPath(laserObjFilePath);
             message.setResultReceiverMqName(queueObjModelingPost);
 
-            Map<String, Object> param = new HashMap<>();
-            try {
-                JyUser jyUser = scenePlusService.getJyUserByNum(num);
-                ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
-                param.put("event_type", "scene");
-                param.put("event_content", "排队中");
-                param.put("scene_num", num);
-                param.put("event_time", new Date());
-                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);
-            }
-
             //发送mq，就进行计算
             mqProducer.sendByWorkQueue(queueModelingCall, message);
 
@@ -173,25 +154,6 @@ public class BuildObjServiceImpl implements IBuildSceneService {
         }catch (Exception e){
             log.error("生成OBJ场景资源准备异常,num=" + num, e);
 
-            Map<String, Object> param = new HashMap<>();
-            try {
-                JyUser jyUser = scenePlusService.getJyUserByNum(num);
-                ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
-                param.put("event_type", "scene");
-                param.put("event_content", "计算失败");
-                param.put("scene_num", num);
-                param.put("event_time", new Date());
-                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);
-            }
-
 //            buildSceneDTService.handBaseFail("生成OBJ场景资源准备异常", message.getPath(), message.getSceneNum(), "计算控制服务器");
             throw e;
         }finally {
@@ -230,25 +192,6 @@ public class BuildObjServiceImpl implements IBuildSceneService {
             if (!message.getBuildSuccess()) {
                 log.error("生成OBJ场景计算失败！");
 
-                Map<String, Object> param = new HashMap<>();
-                try {
-                    ScenePlus scenePlus = scenePlusService.getScenePlusByNum(projectNum);
-                    JyUser jyUser = scenePlusService.getJyUserByNum(projectNum);
-                    param.put("event_type", "scene");
-                    param.put("event_content", "计算失败");
-                    param.put("scene_num", projectNum);
-                    param.put("event_time", new Date());
-                    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);
-                }
-
                 // 发送钉钉消息，计算失败
 //                buildSceneDTService.handModelFail("生成OBJ场景计算失败！", message.getPath(), message.getBuildContext().get("sceneNum").toString(), message.getHostName());
                 return;
@@ -368,24 +311,6 @@ public class BuildObjServiceImpl implements IBuildSceneService {
             //重置异步操作记录
             commonService.removeSceneAsynOperLog(projectNum);
 
-            Map<String, Object> param = new HashMap<>();
-            try {
-                JyUser jyUser = scenePlusService.getJyUserByNum(projectNum);
-                param.put("event_type", "scene");
-                param.put("event_content", "计算成功");
-                param.put("scene_num", projectNum);
-                param.put("event_time", new Date());
-                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);
-            }
-
             // 如果未升级V4,则升级V4
             if("v3".equals(version)){
                 fdkkV4Service.upgradeToV4(projectNum);
@@ -401,26 +326,6 @@ public class BuildObjServiceImpl implements IBuildSceneService {
         }catch (Exception e){
             log.error("生成OBJ场景计算结果处理异常,num=" + projectNum, e);
 //            buildSceneDTService.handBaseFail("生成OBJ场景计算结果处理异常", message.getPath(), projectNum, "计算控制服务器");
-
-            Map<String, Object> param = new HashMap<>();
-            try {
-                ScenePlus scenePlus = scenePlusService.getScenePlusByNum(projectNum);
-                JyUser jyUser = scenePlusService.getJyUserByNum(projectNum);
-                param.put("event_type", "scene");
-                param.put("event_content", "计算失败");
-                param.put("scene_num", projectNum);
-                param.put("event_time", new Date());
-                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);
-            }
-
             throw e;
         }finally {
             fdkkLaserService.pushBuildStatusToLaserSystem(projectNum, laserObjFilePath + "/laserData/mesh", success ? CommonOperStatus.SUCCESS.code() : CommonOperStatus.FAILD.code());

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

@@ -36,6 +36,7 @@ import com.fdkankan.push.utils.PushMsgUtil;
 import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
 import com.fdkankan.rabbitmq.bean.BuildSceneResultMqMessage;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
+import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
@@ -361,6 +362,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
         String sceneCode = message.getBuildContext().get("sceneNum").toString();
         String path = message.getPath();
         boolean status = false;
+        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(sceneCode);
         try {
 
             //如果场景被删除，就无需往下运行了
@@ -381,11 +383,10 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
             if (!message.getBuildSuccess()) {
                 log.error("建模失败，修改状态为失败状态");
-                if(count < 1){
-                    scenePlusService.update(new LambdaUpdateWrapper<ScenePlus>()
-                            .set(ScenePlus::getSceneStatus, SceneStatus.FAILD.code())
-                            .set(ScenePlus::getBuildFailReason, "算法报错")
-                            .eq(ScenePlus::getNum, sceneCode));
+                scenePlusService.update(new LambdaUpdateWrapper<ScenePlus>()
+                        .set(ScenePlus::getSceneStatus, SceneStatus.FAILD.code())
+                        .set(ScenePlus::getBuildFailReason, "算法报错")
+                        .eq(ScenePlus::getNum, sceneCode));
 
                 this.sendFailToLaser(sceneCode);
                 redisUtil.set(String.format(RedisKey.SCENE_BUILD_FINISH_NUM, sceneCode), "-1");

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

@@ -1,15 +1,10 @@
 package com.fdkankan.contro.mq.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.contro.entity.OrigFileUploadBatch;
-import com.fdkankan.contro.entity.ScenePlus;
 import com.fdkankan.contro.mq.service.CallBuildService;
 import com.fdkankan.contro.service.IOrigFileUploadBatchService;
 import com.fdkankan.contro.service.IOrigFileUploadService;
 import com.fdkankan.contro.service.IScenePlusService;
-import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.redis.util.RedisLockUtil;
 import com.fdkankan.redis.util.RedisUtil;
@@ -19,7 +14,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 @Slf4j
 @Service
@@ -41,61 +37,6 @@ public class CallBuildServiceImpl implements CallBuildService {
     private RedisUtil redisUtil;
 
 
-    @Override
-    public void pushPre() {
-
-        log.info("推送计算定时任务开始");
-
-        List<OrigFileUploadBatch> list = origFileUploadBatchService.list(
-                new LambdaQueryWrapper<OrigFileUploadBatch>()
-                        .eq(OrigFileUploadBatch::getStatus, 4)
-                        .orderByAsc(OrigFileUploadBatch::getCreateTime));
-        if(CollUtil.isEmpty(list)){
-            return;
-        }
-        LinkedHashMap<String, LinkedList<OrigFileUploadBatch>> map = new LinkedHashMap<>();
-        for (OrigFileUploadBatch origFileUploadBatch : list) {
-            String uuid = origFileUploadBatch.getUuid();
-            LinkedList<OrigFileUploadBatch> origFileUploadBatches = map.get(uuid);
-            if(origFileUploadBatches == null){
-                origFileUploadBatches = new LinkedList<>();
-                map.put(uuid, origFileUploadBatches);
-            }
-            origFileUploadBatches.add(origFileUploadBatch);
-
-        }
-        for (String uuid : map.keySet()) {
-            ScenePlus scenePlus = scenePlusService.getByUuid(uuid);
-            boolean lock = redisLockUtil.lock("push-modeling-pre:" + scenePlus.getNum(), scenePlus.getNum(), 20*60);
-            if(!lock){
-                continue;
-            }
-            try {
-                //过滤出同一个场景且待推送的上传批次
-                Set<String> batchIds = new HashSet<>();
-                StringBuilder batchIdStr = new StringBuilder();
-                for (OrigFileUploadBatch fileUploadBatch : map.get(uuid)) {
-                    if(uuid.equals(fileUploadBatch.getUuid())){
-                        batchIds.add(fileUploadBatch.getBatchId());
-                        batchIdStr.append(",").append(fileUploadBatch.getBatchId());
-                    }
-                }
-                BuildSceneCallMessage mqMessage = JSON.parseObject(map.get(uuid).getLast().getMqContent(), BuildSceneCallMessage.class);
-                mqMessage.getExt().put("batchId", batchIdStr.substring(1));
-                rabbitMqProducer.sendByWorkQueue(queueModelingPre, mqMessage);
-
-                long incr = redisUtil.incr("modeling-count:" + scenePlus.getNum(), 1);
-                log.info("场景：{},计算推送次数：{}", scenePlus.getNum(), incr);
-
-            }catch (Exception e){
-                log.error("推送场景计算失败，uuid:{}", uuid, e);
-            }
-
-        }
-
-        log.info("推送计算定时任务结束");
-    }
-
     public static void main(String[] args) {
         List<OrigFileUploadBatch> list = new ArrayList<>();
         OrigFileUploadBatch a = new OrigFileUploadBatch();

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

@@ -24,7 +24,5 @@ public interface IScenePlusService extends IService<ScenePlus> {
 
     Long sumUsedSpaceByCameraId(Long cameraId, String spaceTypeStr);
 
-    String getRyIdByNum(String num);
-
     ScenePlus getByTaskId(String taskId);
 }

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

@@ -1656,70 +1656,70 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         return ResultData.ok(result);
     }
 
-    private ScenePlusVO buildScenePost(String dataSource, JSONObject jsonObject, String buildType, long cameraType,
-                                       String sceneNum, Camera camera, CameraDetail cameraDetail, int rebuild,String icon,User user) throws Exception {
-        String imgViewPath = String.format(UploadFilePath.IMG_VIEW_PATH, sceneNum);
-
-        JSONObject firmwareVersion = new JSONObject();
-        if (!ObjectUtils.isEmpty(jsonObject.getString("camSoftwareVersion"))) {
-            firmwareVersion.put("camSoftwareVersion", jsonObject.getString("camSoftwareVersion"));
-        }
-
-        if (!ObjectUtils.isEmpty(jsonObject.getString("version"))) {
-            firmwareVersion.put("version", jsonObject.getString("version"));
-        }
-
-        String sceneUrl = "/" + sceneProNewUrl;
-
-        //重算的场景，先移除该场景对应的容量
-        if (rebuild == 1) {
-//            try {
-//                scenePlusService.resetSpace(sceneNum);
-//            }catch (Exception e){
-//                log.error("重置容量失败", e);
+//    private ScenePlusVO buildScenePost(String dataSource, JSONObject jsonObject, String buildType, long cameraType,
+//                                       String sceneNum, Camera camera, CameraDetail cameraDetail, int rebuild,String icon,User user) throws Exception {
+//        String imgViewPath = String.format(UploadFilePath.IMG_VIEW_PATH, sceneNum);
+//
+//        JSONObject firmwareVersion = new JSONObject();
+//        if (!ObjectUtils.isEmpty(jsonObject.getString("camSoftwareVersion"))) {
+//            firmwareVersion.put("camSoftwareVersion", jsonObject.getString("camSoftwareVersion"));
+//        }
+//
+//        if (!ObjectUtils.isEmpty(jsonObject.getString("version"))) {
+//            firmwareVersion.put("version", jsonObject.getString("version"));
+//        }
+//
+//        String sceneUrl = "/" + sceneProNewUrl;
+//
+//        //重算的场景，先移除该场景对应的容量
+//        if (rebuild == 1) {
+////            try {
+////                scenePlusService.resetSpace(sceneNum);
+////            }catch (Exception e){
+////                log.error("重置容量失败", e);
+////            }
+////            //删除oss的houst_floor.json(国际版可能会卡住)
+////            fYunFileService.deleteFile(dataViewPath + "houst_floor.json");
+//        } else {
+//            //上传log-main.png
+//            fYunFileService.uploadFile(ConstantFilePath.LOGO_PATH + "logo-main.png", imgViewPath + "logo-main.png");
+//            fYunFileService.uploadFile(ConstantFilePath.LOGO_PATH + "logo-main-en.png", imgViewPath + "logo-main-en.png");
+//        }
+//        String algorithm = jsonObject.getString("location") != null && "1".equals(jsonObject.getString("location")) ? "sfm" : "slam";
+//        String unicode = jsonObject.getString("creator") + "_" + jsonObject.getString("uuidtime");
+//
+//        ScenePlusVO scenePlusVO = this.createScenePlus(sceneNum, camera.getId(), camera.getChildName(), jsonObject.getString("creator"),
+//                jsonObject.getString("pwd"), unicode, cameraType,jsonObject.getJSONObject("cam").getIntValue("type"), dataSource, icon, user.getId() , null, algorithm, jsonObject.getInteger("location"),
+//                jsonObject.getJSONArray("points").size(), jsonObject.getString("name"), jsonObject.getString("info"),
+//                jsonObject.getInteger("scenetype"), jsonObject.getString("gps"), rebuild,
+//                jsonObject.getInteger("resolution"), firmwareVersion.toString(), sceneUrl, buildType, cameraDetail.getCooperationUser());
+//
+//        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(sceneNum);
+//        scenePlus.setTaskId(jsonObject.getString("taskId"));
+//        scenePlus.setKNo(jsonObject.getString("kNo"));
+//        scenePlusService.updateById(scenePlus);
+//        ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
+//        boolean isObj = jsonObject.containsKey("exportMeshObj") && jsonObject.getIntValue("exportMeshObj") == 1;
+//        scenePlusExt.setIsObj(isObj ? CommonStatus.YES.code() : CommonStatus.NO.code());
+//        scenePlusExtService.updateById(scenePlusExt);
+//
+//        BuildSceneCallMessage mqMessage = getBuildSceneMqMessage(sceneNum, cameraType, algorithm, jsonObject, buildType, scenePlusVO.getDataSource());
+//
+//        if (cameraDetail.getCompanyId() != null) {
+//            Company company = companyService.getById(cameraDetail.getCompanyId());
+//            if (company != null && !ObjectUtils.isEmpty(company.getCalculateFlexibility()) && !company.getCalculateFlexibility()) {
+//                mqMessage.setFlexibility(-1);
 //            }
-//            //删除oss的houst_floor.json(国际版可能会卡住)
-//            fYunFileService.deleteFile(dataViewPath + "houst_floor.json");
-        } else {
-            //上传log-main.png
-            fYunFileService.uploadFile(ConstantFilePath.LOGO_PATH + "logo-main.png", imgViewPath + "logo-main.png");
-            fYunFileService.uploadFile(ConstantFilePath.LOGO_PATH + "logo-main-en.png", imgViewPath + "logo-main-en.png");
-        }
-        String algorithm = jsonObject.getString("location") != null && "1".equals(jsonObject.getString("location")) ? "sfm" : "slam";
-        String unicode = jsonObject.getString("creator") + "_" + jsonObject.getString("uuidtime");
-
-        ScenePlusVO scenePlusVO = this.createScenePlus(sceneNum, camera.getId(), camera.getChildName(), jsonObject.getString("creator"),
-                jsonObject.getString("pwd"), unicode, cameraType,jsonObject.getJSONObject("cam").getIntValue("type"), dataSource, icon, user.getId() , null, algorithm, jsonObject.getInteger("location"),
-                jsonObject.getJSONArray("points").size(), jsonObject.getString("name"), jsonObject.getString("info"),
-                jsonObject.getInteger("scenetype"), jsonObject.getString("gps"), rebuild,
-                jsonObject.getInteger("resolution"), firmwareVersion.toString(), sceneUrl, buildType, cameraDetail.getCooperationUser());
-
-        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(sceneNum);
-        scenePlus.setTaskId(jsonObject.getString("taskId"));
-        scenePlus.setKNo(jsonObject.getString("kNo"));
-        scenePlusService.updateById(scenePlus);
-        ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
-        boolean isObj = jsonObject.containsKey("exportMeshObj") && jsonObject.getIntValue("exportMeshObj") == 1;
-        scenePlusExt.setIsObj(isObj ? CommonStatus.YES.code() : CommonStatus.NO.code());
-        scenePlusExtService.updateById(scenePlusExt);
-
-        BuildSceneCallMessage mqMessage = getBuildSceneMqMessage(sceneNum, cameraType, algorithm, jsonObject, buildType, scenePlusVO.getDataSource());
-
-        if (cameraDetail.getCompanyId() != null) {
-            Company company = companyService.getById(cameraDetail.getCompanyId());
-            if (company != null && !ObjectUtils.isEmpty(company.getCalculateFlexibility()) && !company.getCalculateFlexibility()) {
-                mqMessage.setFlexibility(-1);
-            }
-        }
-
-        mqMessage.getExt().put("deleteExtras", true);
-        mqMessage.getExt().put("gps", jsonObject.getString("gps"));
-        mqMessage.getExt().put("threeCamType", scenePlusVO.getThreeCamType());
-
-        rabbitMqProducer.sendByWorkQueue(queueModelingPre, mqMessage);
-
-        return scenePlusVO;
-    }
+//        }
+//
+//        mqMessage.getExt().put("deleteExtras", true);
+//        mqMessage.getExt().put("gps", jsonObject.getString("gps"));
+//        mqMessage.getExt().put("threeCamType", scenePlusVO.getThreeCamType());
+//
+//        rabbitMqProducer.sendByWorkQueue(queueModelingPre, mqMessage);
+//
+//        return scenePlusVO;
+//    }
 
 
     private void buildV3Scene2(String dataSource,JSONObject jsonObject,long cameraType,String sceneNum,Camera cameraEntity,CameraDetail detailEntity,String icon) throws Exception {

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

@@ -145,24 +145,6 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     }
 
     @Override
-    public JyUser getJyUserByNum(String num) {
-        ScenePlus scenePlus = this.getScenePlusByNum(num);
-        Long userId = scenePlus.getUserId();
-        JyUser jyUser = jyUserService.getByUserId(userId);
-        return jyUser;
-    }
-
-    @Override
-    public ScenePlus getByUuid(String uuid) {
-        ScenePlusExt scenePlusExt = scenePlusExtService.getOne(new LambdaQueryWrapper<ScenePlusExt>().like(ScenePlusExt::getDataSource, uuid));
-        if(Objects.isNull(scenePlusExt)){
-            return null;
-        }
-        ScenePlus scenePlus = scenePlusService.getById(scenePlusExt.getPlusId());
-        return scenePlus;
-    }
-
-    @Override
     public ScenePlus getByTaskId(String taskId) {
         return this.getOne(new LambdaQueryWrapper<ScenePlus>().eq(ScenePlus::getTaskId, taskId));
     }