1

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

@@ -1,10 +1,8 @@
 package com.fdkankan.manage_jp.httpClient.service;
-import cn.hutool.core.bean.BeanUtil;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.manage_jp.httpClient.param.LaserSceneMoveParam;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
-import com.google.common.collect.Lists;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -28,7 +26,6 @@ import com.fdkankan.manage_jp.service.IUserService;
 import com.fdkankan.manage_jp.vo.request.SceneParam;
 import com.fdkankan.manage_jp.vo.response.SceneVo;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -324,7 +321,7 @@ public class LaserService {
         return null;
     }
 
-    public void move(String num, String snCode, String toSnCode,Long userId,String newDataSource) {
+    public FdkkResponse move(String num, String snCode, String toSnCode, Long userId, String newDataSource) {
         LaserSceneMoveParam param = new LaserSceneMoveParam();
         param.setSceneCode(num);
         param.setSnCode(snCode);
@@ -337,7 +334,7 @@ public class LaserService {
                 param.setPhone(user.getUserName());
             }
         }
-        laserClient.migrate(param);
+        return laserClient.migrate(param);
     }
 
 

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

@@ -8,6 +8,7 @@ import com.fdkankan.manage_jp.common.ResultCode;
 import com.fdkankan.manage_jp.entity.*;
 import com.fdkankan.manage_jp.exception.BusinessException;
 import com.fdkankan.manage_jp.httpClient.service.LaserService;
+import com.fdkankan.manage_jp.httpClient.vo.FdkkResponse;
 import com.fdkankan.manage_jp.mapper.ITmColdStorageMapper;
 import com.fdkankan.manage_jp.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -173,7 +174,10 @@ public class TmColdStorageServiceImpl extends ServiceImpl<ITmColdStorageMapper,
             this.removeByIds(tmColdStorages);
             if(sceneSource == 4 || sceneSource == 5){
                 String dataSource = scenePro == null ? scenePlusExtService.getByPlusId(scenePlus.getId()).getDataSource() : scenePro.getDataSource();
-                laserService.move(num,oldCamera.getSnCode(),camera.getSnCode(),user.getId(),dataSource);
+                FdkkResponse response = laserService.move(num, oldCamera.getSnCode(), camera.getSnCode(), user.getId(), dataSource);
+                if(response.getCode() != 0){
+                    throw new BusinessException(ResultCode.SYSTEM_ERROR);
+                }
             }
         }