1

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

@@ -234,10 +234,25 @@ public class LaserService {
     }
 
     public void updateStatus(String num,Integer status) {
+        this.updateStatus(num,status,null);
+    }
+    public void updateStatus(String num,Integer status,CameraDetail cameraDetail) {
         try {
             Map<String,Object> params = new HashMap<>();
+            if(cameraDetail != null){
+                Camera camera = cameraService.getById(cameraDetail.getCameraId());
+                if(camera != null){
+                    params.put("snCode", camera.getSnCode());
+                }
+                User user = userService.getById(cameraDetail.getUserId());
+                if(user != null){
+                    params.put("phone", user.getUserName());
+                    params.put("userId", user.getId());
+                }
+            }
             params.put("sceneCode", num);
             params.put("status", status);
+
             Result result = laserClient.saveOrEdit(num, params);
             if(result.getCode() != HttpStatus.OK.value()){
                 log.error("激光场景状态同步失败!");

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

@@ -1,5 +1,6 @@
 package com.fdkankan.manage_jp.service;
 
+import com.fdkankan.manage_jp.entity.CameraDetail;
 import com.fdkankan.manage_jp.entity.ScenePlus;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -19,5 +20,5 @@ public interface IScenePlusService extends IService<ScenePlus> {
 
     ScenePlus copyScene(ScenePlus scenePlus);
 
-    void updatePayStatus(String num,String version,Integer sceneSource,Integer payStatus,Long cameraId,Long userId);
+    void updatePayStatus(String num, String version, Integer sceneSource, Integer payStatus, CameraDetail cameraDetail);
 }

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

@@ -117,16 +117,16 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     }
 
     @Override
-    public void updatePayStatus(String num,String version,Integer sceneSource,Integer payStatus,Long cameraId,Long userId) {
+    public void updatePayStatus(String num,String version,Integer sceneSource,Integer payStatus,CameraDetail cameraDetail) {
         if(version.equals("v3")){
             LambdaUpdateWrapper<ScenePro> wrapper2 = new LambdaUpdateWrapper<>();
             wrapper2.set(ScenePro::getPayStatus,payStatus);
             wrapper2.eq(ScenePro::getNum,num);
-            if(cameraId != null){
-                wrapper2.set(ScenePro::getCameraId,cameraId);
+            if(cameraDetail != null){
+                wrapper2.set(ScenePro::getCameraId,cameraDetail.getCameraId());
             }
-            if(userId != null){
-                wrapper2.set(ScenePro::getUserId,userId);
+            if(cameraDetail != null){
+                wrapper2.set(ScenePro::getUserId,cameraDetail.getUserId());
             }
             sceneProService.update(wrapper2);
             updateOssPayStatus(String.format(OssPath.v3_statusPath,num),payStatus);
@@ -134,18 +134,18 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
             LambdaUpdateWrapper<ScenePlus> wrapper = new LambdaUpdateWrapper<>();
             wrapper.set(ScenePlus::getPayStatus,payStatus);
             wrapper.eq(ScenePlus::getNum,num);
-            if(cameraId != null){
-                wrapper.set(ScenePlus::getCameraId,cameraId);
+            if(cameraDetail != null){
+                wrapper.set(ScenePlus::getCameraId,cameraDetail.getCameraId());
             }
-            if(userId != null){
-                wrapper.set(ScenePlus::getUserId,userId);
+            if(cameraDetail != null){
+                wrapper.set(ScenePlus::getUserId,cameraDetail.getUserId());
             }
             this.update(wrapper);
             updateOssPayStatus(String.format(OssPath.v4_statusPath,num),payStatus);
         }
 
         if(sceneSource == 4 || sceneSource == 5){
-            laserService.updateStatus(num,3);
+            laserService.updateStatus(num,payStatus==1?2:3,cameraDetail);
         }
 
 

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

@@ -121,7 +121,7 @@ public class TmColdStorageServiceImpl extends ServiceImpl<ITmColdStorageMapper,
             coldStorage.setSceneVersion(scenePro == null?"v3":"v4");
             coldStorage.setIsObj(scenePro == null?scenePlusExt.getIsObj():scenePro.getIsObj());
             this.save(coldStorage);
-            scenePlusService.updatePayStatus(num,scenePro == null ?"v4":"v3",scenePro == null?scenePlus.getSceneSource():scenePro.getSceneSource(),-2,null,null);
+            scenePlusService.updatePayStatus(num,scenePro == null ?"v4":"v3",scenePro == null?scenePlus.getSceneSource():scenePro.getSceneSource(),-2,null);
 
         }
 
@@ -150,7 +150,7 @@ public class TmColdStorageServiceImpl extends ServiceImpl<ITmColdStorageMapper,
             if(!oldCameraDetail.getType().equals(cameraDetail.getType())){
                 throw new BusinessException(ResultCode.RESTORE_ERROR);
             }
-            scenePlusService.updatePayStatus(num,scenePro == null ?"v4":"v3",scenePro == null?scenePlus.getSceneSource():scenePro.getSceneSource(),1,cameraDetail.getCameraId(),cameraDetail.getUserId());
+            scenePlusService.updatePayStatus(num,scenePro == null ?"v4":"v3",scenePro == null?scenePlus.getSceneSource():scenePro.getSceneSource(),1,cameraDetail);
             this.removeByIds(tmColdStorages);
         }