删除场景校验场景计算状态

src/main/java/com/fdkankan/manage_jp/httpClient/service/LaserService.java

@@ -93,18 +93,21 @@ public class LaserService {
         return null ;
     }
 
-    public Result updateStatus(String num,Integer status) {
+    public void updateStatus(String num,Integer status) {
         Map<String,Object> params = new HashMap<>();
         params.put("sceneCodes", Arrays.asList(num));
         params.put("status", status);
-        return laserClient.updateStatus( params);
+        //return laserClient.updateStatus( params);
+        rabbitMqProducer.sendByWorkQueue("update-build-status",params);
     }
-    public Result updateBuildObjStatus(String num,Integer status) {
+    public void updateBuildObjStatus(String num,Integer status) {
         //生成OBJ状态,0，未生成 1完成，2计算中
         Map<String,Object> params = new HashMap<>();
-        params.put("sceneCode", num);
+        params.put("sceneCodes",  Arrays.asList(num));
         params.put("buildObjStatus", status);
-        return laserClient.updateStatus( params);
+        //return laserClient.updateStatus( params);
+        rabbitMqProducer.sendByWorkQueue("update-build-status",params);
+
     }
     public void toBind(List<String> snCodes,Boolean bind,String phone) {
         try {

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

@@ -187,10 +187,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         }
 
         if(sceneSource == 4 || sceneSource == 5){
-            Result result = laserService.updateStatus(num, payStatus == 1 ? 2 : 3);
-            if(result.getCode() != 200){
-                throw new BusinessException(ResultCode.LASER_ERROR);
-            }
+             laserService.updateStatus(num, payStatus == 1 ? 2 : 3);
         }
 
 

src/main/java/com/fdkankan/manage_jp/service/impl/SceneProServiceImpl.java

@@ -367,6 +367,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         String path = null;
         ScenePlusExt scenePlusExt = null;
         if(scenePlusEntity != null){
+            if(scenePlusEntity.getSceneStatus() !=-2){
+                throw new BusinessException(ResultCode.SCENE_ERROR);
+            }
              scenePlusExt = scenePlusExtService.getByPlusId(scenePlusEntity.getId());
             if(scenePlusExt == null){
                 throw new BusinessException(ResultCode.SCENE_ERROR);
@@ -374,6 +377,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             path = scenePlusExt.getDataSource();
         }else {
             path = sceneProEntity.getDataSource();
+            if(sceneProEntity.getStatus() !=-2){
+                throw new BusinessException(ResultCode.SCENE_ERROR);
+            }
         }
 
         Integer sceneSource = sceneProEntity == null ? scenePlusEntity.getSceneSource() : sceneProEntity.getSceneSource();