文化中心

src/main/java/com/fdkankan/external/service/impl/SceneOfflinePackagePushServiceImpl.java

@@ -29,6 +29,7 @@ import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.web.response.Result;
+import com.fdkankan.web.response.ResultData;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
@@ -368,6 +369,10 @@ public class SceneOfflinePackagePushServiceImpl extends ServiceImpl<SceneOffline
             params.put("file", FileUtil.file(zipDir.concat(file)));
             log.info("开发发送第{}个压缩包", index);
             String post = HttpUtil.post(scenePushBean.getDestUrl() + "/historyrical/scene/deploy", params, 60 * 60 * 1000);
+            ResultData deployResult = JSON.parseObject(post,ResultData.class);
+            if(deployResult.getCode() != 0){
+                throw new RuntimeException("部署端接收文件失败");
+            }
             log.info("第{}个场景推送成功，接收端返回结果：{}", index, post);
             ++index;
         }
@@ -386,6 +391,10 @@ public class SceneOfflinePackagePushServiceImpl extends ServiceImpl<SceneOffline
         params.put("version", scenePushBean.getVersion());
         params.put("calcTime", DateExtUtil.format(scenePlusExt.getAlgorithmTime(), DateExtUtil.dateStyle8));
         String post = HttpUtil.post(scenePushBean.getDestUrl() + "/historyrical/scene/deploy", params, 60 * 60 * 1000);
+        ResultData deployResult = JSON.parseObject(post,ResultData.class);
+        if(deployResult.getCode() != 0){
+            throw new RuntimeException("部署端接收部署指令失败");
+        }
         log.info("场景推送成功，接收端返回结果：{}", post);
     }
 

src/main/java/com/fdkankan/external/service/impl/XinxizhongxinServiceImpl.java

@@ -143,7 +143,7 @@ public class XinxizhongxinServiceImpl implements XinxizhongxinService {
         }
         Department zgwwxxzx = departmentService.getByCode("zgwwxxzx");
         for (ZgxxzxPushLog zgxxzxPushLog : list) {
-            ResultData<Integer> resultData = xxzxClient.getDeployStatus(zgwwxxzx.getDestUrl() + "/historyrical/scene/getDeployStatus");
+            ResultData<Integer> resultData = xxzxClient.getDeployStatus(zgwwxxzx.getDestUrl() + "/historyrical/scene/getDeployStatus?taskId=" + zgxxzxPushLog.getTaskId());
             Integer status = resultData.getData();
             if(status == CommonSuccessStatus.WAITING.code()){
                 DateTime dateTime = DateExtUtil.offsetDay(new Date(), -7);