lyhzzz 7 months ago
parent
commit
95533c594d

+ 13 - 0
src/main/java/com/fdkankan/ucenter/entity/ScenePlusExt.java

@@ -170,4 +170,17 @@ public class ScenePlusExt implements Serializable {
 
 
     @TableField("algorithm_time")
     @TableField("algorithm_time")
     private String algorithmTime;
     private String algorithmTime;
+
+    /**
+     * 模型方向(只有激光场景才有)
+     */
+    @TableField("orientation")
+    private String orientation;
+
+    /**
+     * laser推送经纬度信息
+     */
+    @TableField("rtk_location")
+    private String rtkLocation;
 }
 }
+

+ 10 - 1
src/main/java/com/fdkankan/ucenter/service/impl/ScenePlusServiceImpl.java

@@ -15,6 +15,7 @@ import com.fdkankan.common.constant.SceneVersionType;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
+import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.ucenter.common.OssPath;
 import com.fdkankan.ucenter.common.OssPath;
 import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.common.Result;
@@ -264,7 +265,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                 scenePlus.setSceneStatus(-2);
                 scenePlus.setSceneStatus(-2);
                 this.updateById(scenePlus);
                 this.updateById(scenePlus);
                 sceneCopyLogService.saveByNum(oldNum,newNum,scenePlus.getUserId());
                 sceneCopyLogService.saveByNum(oldNum,newNum,scenePlus.getUserId());
-
+                sendMqForAiPano(newNum);
 //                Boolean checkSpace = cameraDetailService.checkSpace(cameraDetail.getCameraId(), plusExt.getSpace());
 //                Boolean checkSpace = cameraDetailService.checkSpace(cameraDetail.getCameraId(), plusExt.getSpace());
 //                if(!checkSpace){
 //                if(!checkSpace){
 //                    sceneProService.lockOrUnLockScenes(Arrays.asList(scenePlus.getId()),-2);
 //                    sceneProService.lockOrUnLockScenes(Arrays.asList(scenePlus.getId()),-2);
@@ -285,6 +286,14 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         return scenePlus.getId();
         return scenePlus.getId();
     }
     }
 
 
+    @Autowired
+    RabbitMqProducer rabbitMqProducer;
+    private void sendMqForAiPano(String num){
+        Map<String, String> map = new HashMap<>();
+        map.put("num", num);
+        rabbitMqProducer.sendByWorkQueue("detect-queue-pano", map);
+    }
+
     private  void copyOssAndNas(String oldNum,String newNum){
     private  void copyOssAndNas(String oldNum,String newNum){
         // 拷贝场景编辑资源
         // 拷贝场景编辑资源
         String oldEditPath = String.format(SceneResourcePath.EDIT_PATH_v4, oldNum);
         String oldEditPath = String.format(SceneResourcePath.EDIT_PATH_v4, oldNum);

+ 2 - 0
src/main/java/com/fdkankan/ucenter/vo/response/SceneProEntityVo.java

@@ -75,5 +75,7 @@ public class SceneProEntityVo  implements Serializable {
     private String recStatus;
     private String recStatus;
 
 
     private String phone;
     private String phone;
+    private String orientation;
 
 
+    private String rtkLocation;
 }
 }