111

src/main/java/com/fdkankan/fusion/AppListener.java

@@ -40,12 +40,12 @@ public class AppListener implements ApplicationRunner {
             while (true) {
                 try {
                     if (!isProcessAlive(CacheUtil.settingEntity.getPid())) {
-                        System.out.println("目标 PID 不存在，准备退出 SpringBoot 服务...");
+                        log.info("目标 PID 不存在，准备退出 SpringBoot 服务...");
                         shutdownApplication();
                         break;
                     }
                     if (redisUtil.hasKey("QUIT_JOB_FUSION")) {
-                        System.out.println("收到推出通知，准备退出 SpringBoot 服务...");
+                        log.info("收到推出通知，准备退出 SpringBoot 服务...");
                         redisUtil.del("QUIT_JOB_FUSION");
                         shutdownApplication();
                         break;

src/main/java/com/fdkankan/fusion/httpClient/LaserService.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dtflys.forest.annotation.Var;
 import com.fdkankan.fusion.httpClient.client.LaserClient;
 import com.fdkankan.fusion.httpClient.request.SSDownSceneParam;
 import com.fdkankan.fusion.httpClient.request.SSDownSceneParamLocal;
@@ -120,9 +121,9 @@ public class LaserService {
         return  null;
     }
 
-    public FdkkResponse addNotifications(Integer type) {
+    public FdkkResponse addNotifications(Integer type,  String uniId,  String bizType) {
         try {
-            return laserClient.addNotifications(type);
+            return laserClient.addNotifications(type,uniId,bizType);
 
         }catch (Exception e){
             log.info("获取激光场景信息失败addNotifications-error",e);

src/main/java/com/fdkankan/fusion/httpClient/client/LaserClient.java

@@ -72,6 +72,6 @@ public interface LaserClient {
     @Post(value = "/laser/loc/downOfflineScene")
     FdkkResponse downOfflineSceneNew(@JSONBody SSDownSceneParamLocal param) ;
 
-    @Post("/laser/loc/addNotifications/{type}")
-    FdkkResponse addNotifications(@Var("type") Integer type);
+    @Post("/laser/loc/addNotifications/{type}/f{uniId}/{bizType}")
+    FdkkResponse addNotifications(@Var("type") Integer type,@Var("uniId") String uniId,@Var("bizType") String bizType);
 }

src/main/java/com/fdkankan/fusion/service/impl/CaseFusionServiceImpl.java

@@ -178,10 +178,10 @@ public class CaseFusionServiceImpl extends ServiceImpl<ICaseFusionMapper, CaseFu
             sceneFileBuildService.updateTimeAndStatus(fusionId.toString(),2, new Date(), null, BuildType.BUILD_FUSION_OFFLINE,zipPath);
         }
         if(status == 2){ //成功
-            laserService.addNotifications(2);
+            laserService.addNotifications(2,String.valueOf(fusionId),BuildType.BUILD_FUSION_OFFLINE);
             sceneFileBuildService.updateTimeAndStatus(fusionId.toString(),4,null,  new Date(),  BuildType.BUILD_FUSION_OFFLINE,zipPath);
         }else if(status != 1){ //失败
-            laserService.addNotifications(3);
+            laserService.addNotifications(3,String.valueOf(fusionId),BuildType.BUILD_FUSION_OFFLINE);
             sceneFileBuildService.updateTimeAndStatus(fusionId.toString(),-1,null,  null,  BuildType.BUILD_FUSION_OFFLINE,zipPath);
 
         }