|
@@ -7,10 +7,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
|
|
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
|
import com.persagy.dmp.basic.model.QueryCriteria;
|
|
|
+import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
|
|
|
import com.persagy.dmp.common.context.AppContext;
|
|
|
import com.persagy.dmp.digital.entity.ObjectDigital;
|
|
|
import com.persagy.dmp.mybatis.utils.ConditionUtil;
|
|
|
-import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
|
|
|
import com.persagy.dmp.rwd.basic.constant.IotUrlConstant;
|
|
|
import com.persagy.dmp.rwd.basic.utils.MeterUtils;
|
|
|
import com.persagy.dmp.rwd.digital.service.IObjectDigitalService;
|
|
@@ -18,13 +18,13 @@ import com.persagy.dmp.rwd.iot.model.CurrentDataModel;
|
|
|
import com.persagy.dmp.rwd.iot.service.CurrentIotService;
|
|
|
import lombok.Getter;
|
|
|
import lombok.Setter;
|
|
|
-
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.util.StringUtils;
|
|
|
|
|
|
-import java.util.*;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.LinkedList;
|
|
|
+import java.util.List;
|
|
|
|
|
|
|
|
|
/**
|
|
@@ -64,6 +64,10 @@ public class CurrentIotServiceImpl implements CurrentIotService {
|
|
|
requestBody.put("building", AppContext.getContext().getProjectId().substring(2));
|
|
|
requestBody.put("points", parameters);
|
|
|
String response = HttpUtil.post(url, requestBody.toString(), 3000);
|
|
|
+ //处理iot-collect 未部署情况
|
|
|
+ if(response.contains("<head><title>503 Service Temporarily Unavailable</title></head>")){
|
|
|
+ return param;
|
|
|
+ }
|
|
|
JSONObject result = JSONObject.parseObject(response);
|
|
|
if(result == null){
|
|
|
return param;
|