mengff
/
jihe-dc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

一类交调小时数据优化

develop
lau572 3 months ago
parent
f32b8eb2a9
commit
f60de37e3b
1 changed files with 35 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 43
      zc-business/src/main/java/com/zc/business/controller/DcTrafficSurveyDataController.java

43
zc-business/src/main/java/com/zc/business/controller/DcTrafficSurveyDataController.java
View File

@ -103,9 +103,22 @@ public class DcTrafficSurveyDataController extends BaseController
Object data = null; Object data = null;
AjaxResult ajaxResult = dcDeviceController.queryDeviceProperties(dcDevice.getIotDeviceId(), propertyId, props); AjaxResult ajaxResult = dcDeviceController.queryDeviceProperties(dcDevice.getIotDeviceId(), propertyId, props);
if (ajaxResult.get("code").equals(UniversalEnum.TWO_HUNDRED.getNumber()) && ajaxResult.containsKey("data") && ajaxResult.get("data") != null) { try {
data = JSON.parseObject(ajaxResult.get("data").toString()).get("data"); if (ajaxResult.get("code").equals(UniversalEnum.TWO_HUNDRED.getNumber()) && ajaxResult.containsKey("data") && ajaxResult.get("data") != null) {
} else { data = JSON.parseObject(ajaxResult.get("data").toString()).get("data");
} else {
//超时、错误等异常状态，放入缓存下次定时执行时再次请求一遍
Map<String,Object> cacheMap = new HashMap<>();
cacheMap.put("iotDeviceId",dcDevice.getIotDeviceId());
cacheMap.put("stakeMark",dcDevice.getStakeMark());
cacheMap.put("startTime",startTime);
cacheMap.put("endTime",endTime);
cacheMap.put("count",3); //剩余请求次数
redisCache.setCacheMapValue(RedisKeyConstants.TRAFFIC_SURVEY_HOURS_DATA,dcDevice.getIotDeviceId()+startTime,cacheMap);
break;
}
} catch (Exception e){
e.printStackTrace();
//超时、错误等异常状态，放入缓存下次定时执行时再次请求一遍 //超时、错误等异常状态，放入缓存下次定时执行时再次请求一遍
Map<String,Object> cacheMap = new HashMap<>(); Map<String,Object> cacheMap = new HashMap<>();
cacheMap.put("iotDeviceId",dcDevice.getIotDeviceId()); cacheMap.put("iotDeviceId",dcDevice.getIotDeviceId());
@ -116,6 +129,7 @@ public class DcTrafficSurveyDataController extends BaseController
redisCache.setCacheMapValue(RedisKeyConstants.TRAFFIC_SURVEY_HOURS_DATA,dcDevice.getIotDeviceId()+startTime,cacheMap); redisCache.setCacheMapValue(RedisKeyConstants.TRAFFIC_SURVEY_HOURS_DATA,dcDevice.getIotDeviceId()+startTime,cacheMap);
break; break;
} }
JSONArray dataArray = JSON.parseArray(data.toString()); JSONArray dataArray = JSON.parseArray(data.toString());
if (dataArray == null || dataArray.size() < 1){ if (dataArray == null || dataArray.size() < 1){
break; break;
@ -220,11 +234,23 @@ public class DcTrafficSurveyDataController extends BaseController
props.put("sorts[0].name", "timestamp"); props.put("sorts[0].name", "timestamp");
Object data = null; Object data = null;
AjaxResult ajaxResult = dcDeviceController.queryDeviceProperties(iotDeviceId, "01", props); try {
if (ajaxResult.get("code").equals(UniversalEnum.TWO_HUNDRED.getNumber()) && ajaxResult.containsKey("data") && ajaxResult.get("data") != null) { AjaxResult ajaxResult = dcDeviceController.queryDeviceProperties(iotDeviceId, "01", props);
data = JSON.parseObject(ajaxResult.get("data").toString()).get("data"); if (ajaxResult.get("code").equals(UniversalEnum.TWO_HUNDRED.getNumber()) && ajaxResult.containsKey("data") && ajaxResult.get("data") != null) {
redisCache.delCacheMapValue(RedisKeyConstants.TRAFFIC_SURVEY_HOURS_DATA,iotDeviceId+startTime); data = JSON.parseObject(ajaxResult.get("data").toString()).get("data");
} else { redisCache.delCacheMapValue(RedisKeyConstants.TRAFFIC_SURVEY_HOURS_DATA,iotDeviceId+startTime);
} else {
count--;
if (count < 1){
redisCache.delCacheMapValue(RedisKeyConstants.TRAFFIC_SURVEY_HOURS_DATA,iotDeviceId+startTime);
} else {
value.put("count",count);
redisCache.setCacheMapValue(RedisKeyConstants.TRAFFIC_SURVEY_HOURS_DATA,iotDeviceId+startTime,value);
}
break;
}
} catch (Exception e){
e.printStackTrace();
count--; count--;
if (count < 1){ if (count < 1){
redisCache.delCacheMapValue(RedisKeyConstants.TRAFFIC_SURVEY_HOURS_DATA,iotDeviceId+startTime); redisCache.delCacheMapValue(RedisKeyConstants.TRAFFIC_SURVEY_HOURS_DATA,iotDeviceId+startTime);
@ -234,6 +260,7 @@ public class DcTrafficSurveyDataController extends BaseController
} }
break; break;
} }
JSONArray dataArray = JSON.parseArray(data.toString()); JSONArray dataArray = JSON.parseArray(data.toString());
if (dataArray == null || dataArray.size() < 1){ if (dataArray == null || dataArray.size() < 1){
break; break;

Write Preview
Loading…
Cancel
Save