瀏覽代碼

如果请求数据中台接口手动添加了projectid,就不再从poemscontext中获取

lixing 3 年之前
父節點
當前提交
fd68d946a5
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      src/main/java/com/persagy/apm/alarmservice/common/aspect/AlarmDataAspect.java

+ 3 - 2
src/main/java/com/persagy/apm/alarmservice/common/aspect/AlarmDataAspect.java

@@ -1,7 +1,6 @@
 package com.persagy.apm.alarmservice.common.aspect;
 package com.persagy.apm.alarmservice.common.aspect;
 
 
 import com.persagy.apm.common.context.poems.PoemsContext;
 import com.persagy.apm.common.context.poems.PoemsContext;
-import com.persagy.apm.energyalarmstarter.alarmdata.feign.AlarmUrlParam;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common.UrlParamDTO;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common.UrlParamDTO;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.JoinPoint;
@@ -39,7 +38,9 @@ public class AlarmDataAspect {
             }
             }
             // 通用参数配置
             // 通用参数配置
             UrlParamDTO argParam = (UrlParamDTO) arg;
             UrlParamDTO argParam = (UrlParamDTO) arg;
-            argParam.setProjectId(PoemsContext.getContext().getProjectId());
+            if (StringUtils.isBlank(argParam.fetchParams().getProjectId())) {
+                argParam.setProjectId(PoemsContext.getContext().getProjectId());
+            }
             argParam.setUserId(PoemsContext.getContext().getUserId());
             argParam.setUserId(PoemsContext.getContext().getUserId());
             argParam.setGroupCode(PoemsContext.getContext().getGroupCode());
             argParam.setGroupCode(PoemsContext.getContext().getGroupCode());
             argParam.setAppId("energy-alarm-service");
             argParam.setAppId("energy-alarm-service");