3.0.0

src/main/java/com/fdkankan/scene/service/impl/SceneAsynOperLogServiceImpl.java

@@ -155,8 +155,13 @@ public class SceneAsynOperLogServiceImpl extends ServiceImpl<ISceneAsynOperLogMa
     public void cleanLog(String num, String moduleType, String funcType, String... operTypes) {
         LambdaQueryWrapper<SceneAsynOperLog> wrapper = new LambdaQueryWrapper<SceneAsynOperLog>()
                 .eq(SceneAsynOperLog::getNum, num)
-                .eq(SceneAsynOperLog::getModule, moduleType)
                 .eq(SceneAsynOperLog::getFunc, funcType);
+        if(StrUtil.isNotEmpty(funcType)){
+            wrapper.eq(SceneAsynOperLog::getFunc, funcType);
+        }
+        if(StrUtil.isNotEmpty(moduleType)){
+            wrapper.eq(SceneAsynOperLog::getModule, moduleType);
+        }
         if(ArrayUtil.isNotEmpty(operTypes)){
             wrapper.in(SceneAsynOperLog::getOperType, operTypes);
         }

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

@@ -110,6 +110,8 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     private FloorplanAiService floorplanAiService;
     @Autowired
     private IAiService aiService;
+    @Autowired
+    private ISceneAsynOperLogService sceneAsynOperLogService;
 
     @Override
     public ScenePlus getScenePlusByNum(String num) {
@@ -314,7 +316,6 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         scenePlus.setPayStatus(PayStatus.PAY.code());
         scenePlus.setSceneType(SceneType.OTHER.code());
         scenePlus.setTitle(title);
-//        scenePlus.setDescription("<p>" + fdageData.getString("info") + "</p>");
         scenePlus.setLastEditTime(new Date());
         scenePlus.setUpdateTime(new Date());
         this.saveOrUpdate(scenePlus);
@@ -334,7 +335,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         scenePlusExt.setYunFileBucket(bucket);
         scenePlusExt.setAlgorithmTime(Calendar.getInstance().getTime());
         scenePlusExt.setVideos(this.getVideosJson(dataSource, videoVersion, num, cameraType).toJSONString());
-         scenePlusExt.setAlgorithmTime(algorithmTime);
+        scenePlusExt.setAlgorithmTime(algorithmTime);
         scenePlusExt.setOrientation(orientation);
         scenePlusExtService.saveOrUpdate(scenePlusExt);
         if(StrUtil.isEmpty(orientation)){
@@ -359,7 +360,6 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         }
         sceneEditInfo.setScenePlusId(scenePlus.getId());
         sceneEditInfo.setTitle(title);
-//        sceneEditInfo.setDescription("<p>" + fdageData.getString("info") + "</p>");
         if(StrUtil.isEmpty(sceneEditInfo.getScenePassword())){
             sceneEditInfo.setScenePassword(fdageData.getString("pwd"));
         }
@@ -405,6 +405,9 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
         sceneEditInfoExt = sceneEditInfoExtService.getByEditInfoId(sceneEditInfo.getId());
 
+        //清除异步操作记录
+        sceneAsynOperLogService.cleanLog(num, SceneAsynModuleType.UPLOAD_DOWNLOAD.code(), null, null);
+
         //生成sceneJson
         String sceneJsonPath = String.format(UploadFilePath.DATA_VIEW_PATH+"scene.json", num);
         String oldSceneJson = ossUtil.getFileContent(bucket, sceneJsonPath);