Merge remote-tracking branch 'origin/laser-delnum' into test

# Conflicts:
#	src/main/java/com/fdkankan/ucenter/vo/response/SceneProEntityVo.java

src/main/java/com/fdkankan/ucenter/controller/DeviceSceneController.java

@@ -55,7 +55,7 @@ public class DeviceSceneController extends BaseController {
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     public Result deleteScene(@RequestBody AppSceneParam param) throws Exception {
         param.setCameraType(null);
-        sceneProService.delete(param.getSceneNum(),getUserId());
+        sceneProService.delete(param.getSceneNum(),getUserId(),null);
         return Result.success();
     }
 

src/main/java/com/fdkankan/ucenter/controller/SceneController.java

@@ -117,7 +117,7 @@ public class SceneController extends BaseController {
     }
     @PostMapping("/delete")
     public Result delete(@RequestBody SceneParam param) throws Exception {
-        sceneProService.delete(param.getSceneNum(),getUserId());
+        sceneProService.delete(param.getSceneNum(),getUserId(),param.getPlatform());
         return Result.success();
     }
 

src/main/java/com/fdkankan/ucenter/service/ISceneProService.java

@@ -61,11 +61,11 @@ public interface ISceneProService extends IService<ScenePro> {
     Long copyV3Scene(ScenePro scenePro, String newNum, CameraDetail cameraDetail, CameraType cameraType) throws Exception;
 
 
-    void delete(String sceneNum,Long userId);
+    void delete(String sceneNum,Long userId,String platform);
 
     ScenePro getByUnicode(String unicode);
 
-    void deleteByList(List<ScenePro> proList, List<ScenePlus> plusList,Long userId);
+    void deleteByList(List<ScenePro> proList, List<ScenePlus> plusList,Long userId,String platform);
 
     SceneInfoVo getInfo(String num);
 

src/main/java/com/fdkankan/ucenter/service/impl/AppSceneService.java

@@ -19,6 +19,7 @@ import com.fdkankan.ucenter.service.*;
 import com.fdkankan.ucenter.vo.request.AppSceneParam;
 import com.fdkankan.ucenter.vo.response.AppSceneVo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.language.Nysiis;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -319,7 +320,7 @@ public class AppSceneService {
             plusList.add(scenePlus);
             sceneSource = scenePlus.getSceneSource();
         }
-        sceneProService.deleteByList(proList,plusList,userId);
+        sceneProService.deleteByList(proList,plusList,userId, null);
 
         if(sceneSource != null && (sceneSource == 4 || sceneSource == 5)){
             laserService.delete(sceneNum);

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

@@ -457,7 +457,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             plusWr.in(ScenePlus::getId,sceneIds);
             List<ScenePlus> plusList = scenePlusService.list(plusWr);
 
-            this.deleteByList(proList,plusList,userId);
+            this.deleteByList(proList,plusList,userId,null);
         }
 
     }
@@ -858,7 +858,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
 
     @Override
-    public void delete(String sceneNum,Long userId) {
+    public void delete(String sceneNum,Long userId,String platform) {
         if(StringUtils.isEmpty(sceneNum)){
             throw  new BusinessException(LoginConstant.FAILURE_CODE_3001,LoginConstant.FAILURE_MSG_3001);
         }
@@ -866,17 +866,17 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         List<String> numList = Arrays.asList(nums);
         List<ScenePro> proList = this.getListByNums(numList);
         List<ScenePlus> plusList = scenePlusService.getListByNums(numList);
-        this.deleteByList(proList,plusList,userId);
+        this.deleteByList(proList,plusList,userId,platform);
     }
 
     @Override
-    public void deleteByList(List<ScenePro> proList,List<ScenePlus> plusList,Long userId) {
+    public void deleteByList(List<ScenePro> proList,List<ScenePlus> plusList,Long userId,String platform) {
         HashMap<Long ,Long >cameraMap = new HashMap<>();
         if(proList.size() >0){
             for (ScenePro scenePro : proList) {
                 cameraMap.merge(scenePro.getCameraId(), scenePro.getSpace(), Long::sum);
                 sceneDelLogService.saveLog(scenePro.getNum(),userId);
-                if(scenePro.getSceneSource() == 4 || scenePro.getSceneSource() == 5){
+                if(StringUtils.isBlank(platform)  && (scenePro.getSceneSource() == 4 || scenePro.getSceneSource() == 5 || scenePro.getSceneSource() == 57)){
                     laserService.delete(scenePro.getNum());
                 }
             }
@@ -895,7 +895,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
                 }
                 sceneDelLogService.saveLog(scenePlus.getNum(),userId);
-                if(scenePlus.getSceneSource() == 4 || scenePlus.getSceneSource() == 5){
+                if(StringUtils.isBlank(platform) && ( scenePlus.getSceneSource() == 4 || scenePlus.getSceneSource() == 5|| scenePlus.getSceneSource() == 57)){
                     laserService.delete(scenePlus.getNum());
                 }
             }

src/main/java/com/fdkankan/ucenter/vo/request/SceneParam.java

@@ -37,4 +37,5 @@ public class SceneParam extends RequestBase {
     private String searchKey;
     private Integer cameraId;
     private Integer location;
+    private String platform;
 }

src/main/java/com/fdkankan/ucenter/vo/response/SceneProEntityVo.java

@@ -1,7 +1,6 @@
 package com.fdkankan.ucenter.vo.response;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -83,12 +82,10 @@ public class SceneProEntityVo  implements Serializable {
     /**
      * 模型方向（只有激光场景才有）
      */
-    @TableField("orientation")
     private String orientation;
 
     /**
      * laser推送经纬度信息
      */
-    @TableField("rtk_location")
     private String rtkLocation;
 }