|
@@ -6,6 +6,7 @@ import com.persagy.apm.report.common.utils.DataUtils;
|
|
|
import com.persagy.apm.report.common.utils.DateUtils;
|
|
|
import com.persagy.apm.report.common.utils.HttpUtils;
|
|
|
import com.persagy.apm.report.dependencies.iotdataanalysis.service.IDataAnalysisWebService;
|
|
|
+import com.persagy.framework.tenant.mybatis.datasource.db.holder.SaasContext;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
|
import org.assertj.core.util.Lists;
|
|
@@ -22,8 +23,6 @@ public class IDataAnalysisWebServiceImpl implements IDataAnalysisWebService {
|
|
|
|
|
|
@Value("${iot.data.analysis.url}")
|
|
|
private String iotDataAnalysisUrl;
|
|
|
- @Value("${group.code}")
|
|
|
- private String groupCode;
|
|
|
|
|
|
@Override
|
|
|
public Double getTargetValue(String projectId, Date date, String targetCode) {
|
|
@@ -32,7 +31,7 @@ public class IDataAnalysisWebServiceImpl implements IDataAnalysisWebService {
|
|
|
paramObject.put("userId", DataConstants.USER_ID);
|
|
|
// paramObject.put("groupCode", "BL");
|
|
|
// projectId = "Pj1101080259";
|
|
|
- paramObject.put("groupCode", groupCode);
|
|
|
+ paramObject.put("groupCode", SaasContext.getContextGroupCode());
|
|
|
paramObject.put("projectIdList", Lists.newArrayList(projectId));
|
|
|
// 加入分页条件,接口要求分页条件必传
|
|
|
paramObject.put("pageIndex", 1);
|
|
@@ -42,7 +41,7 @@ public class IDataAnalysisWebServiceImpl implements IDataAnalysisWebService {
|
|
|
paramObject.put("alarmStartTime", startTime);
|
|
|
paramObject.put("alarmEndTime", endTime);
|
|
|
String url = iotDataAnalysisUrl + "/alarm/show/view/queryList";
|
|
|
- String response = HttpUtils.postJson(url, paramObject.toString(), groupCode);
|
|
|
+ String response = HttpUtils.postJson(url, paramObject.toString());
|
|
|
JSONObject responseObject = JSONObject.parseObject(response);
|
|
|
if (DataConstants.SUCCESS.equals(responseObject.getString("respMsg"))) {
|
|
|
List<Map> content = (List<Map>) responseObject.get("content");
|