|
|
|
@ -104,6 +104,8 @@ public class InformationCollector implements XMLReadable, XMLWriter { |
|
|
|
private static final String ATTR_TITLE = "title"; |
|
|
|
private static final String ATTR_TITLE = "title"; |
|
|
|
private static final String ATTR_USER_NAME = "username"; |
|
|
|
private static final String ATTR_USER_NAME = "username"; |
|
|
|
private static final String ATTR_UUID = "uuid"; |
|
|
|
private static final String ATTR_UUID = "uuid"; |
|
|
|
|
|
|
|
private static final String ATTR_FUNCTION_ARRAY = "functionArray"; |
|
|
|
|
|
|
|
private static final int MAX_EACH_REQUEST_RECORD_COUNT = 200; |
|
|
|
|
|
|
|
|
|
|
|
private static InformationCollector collector; |
|
|
|
private static InformationCollector collector; |
|
|
|
|
|
|
|
|
|
|
|
@ -232,21 +234,31 @@ public class InformationCollector implements XMLReadable, XMLWriter { |
|
|
|
if (currentTime - lastTime <= DELTA) { |
|
|
|
if (currentTime - lastTime <= DELTA) { |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
ArrayList<Map<String, Object>> content = null; |
|
|
|
JSONArray content = null; |
|
|
|
content = getFunctionsContent(current, new Date(lastTime)); |
|
|
|
try { |
|
|
|
|
|
|
|
content = getFunctionsContent(current, new Date(lastTime)); |
|
|
|
|
|
|
|
} catch (JSONException e) { |
|
|
|
|
|
|
|
FineLoggerFactory.getLogger().error(e.getMessage(), e); |
|
|
|
|
|
|
|
} |
|
|
|
boolean success = false; |
|
|
|
boolean success = false; |
|
|
|
FineLoggerFactory.getLogger().info("Start sent function records to the cloud center..."); |
|
|
|
FineLoggerFactory.getLogger().info("Start sent function records to the cloud center..."); |
|
|
|
String url = CloudCenter.getInstance().acquireUrlByKind(TABLE_FUNCTION_RECORD); |
|
|
|
String url = CloudCenter.getInstance().acquireUrlByKind(TABLE_FUNCTION_RECORD); |
|
|
|
if(content.size() > 0){ |
|
|
|
try { |
|
|
|
for(int i=0; i<content.size(); i++){ |
|
|
|
for(int i=0;i<content.length();i++){ |
|
|
|
success = sendFunctionRecord(url, content.get(i)); |
|
|
|
JSONArray functionArray = content.getJSONArray(i); |
|
|
|
|
|
|
|
if(functionArray.length() > 0){ |
|
|
|
|
|
|
|
success = sendFunctionRecord(url, functionArray); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
//服务器返回true, 说明已经获取成功, 更新最后一次发送时间
|
|
|
|
//服务器返回true, 说明已经获取成功, 更新最后一次发送时间
|
|
|
|
if (success) { |
|
|
|
if (success) { |
|
|
|
this.lastTime = dateToString(); |
|
|
|
this.lastTime = dateToString(); |
|
|
|
|
|
|
|
FineLoggerFactory.getLogger().info("Function records successfully sent to the cloud center."); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
}catch (Exception e) { |
|
|
|
|
|
|
|
FineLoggerFactory.getLogger().error(e.getMessage(), e); |
|
|
|
} |
|
|
|
} |
|
|
|
FineLoggerFactory.getLogger().info("Function records successfully sent to the cloud center."); |
|
|
|
|
|
|
|
// //先将发送压缩文件这段代码注释，之后提任务
|
|
|
|
// //先将发送压缩文件这段代码注释，之后提任务
|
|
|
|
//大数据量下发送压缩zip数据不容易丢失
|
|
|
|
//大数据量下发送压缩zip数据不容易丢失
|
|
|
|
// try {
|
|
|
|
// try {
|
|
|
|
@ -265,12 +277,14 @@ public class InformationCollector implements XMLReadable, XMLWriter { |
|
|
|
// }
|
|
|
|
// }
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private boolean sendFunctionRecord(String url, Map<String,Object> record) { |
|
|
|
private boolean sendFunctionRecord(String url, JSONArray record) { |
|
|
|
boolean success = false; |
|
|
|
boolean success = false; |
|
|
|
try { |
|
|
|
try { |
|
|
|
String recordUrl = url+"?token=" + SiteCenterToken.generateToken() + "&content="+URLEncoder.encode(new JSONObject(record).toString(), EncodeConstants.ENCODING_UTF_8); |
|
|
|
HashMap<String, Object> para = new HashMap<>(); |
|
|
|
String res = HttpToolbox.get(recordUrl); |
|
|
|
para.put("token", SiteCenterToken.generateToken()); |
|
|
|
success = ComparatorUtils.equals(new JSONObject(res).get("status"), "success"); |
|
|
|
para.put("content", record); |
|
|
|
|
|
|
|
String res = HttpToolbox.post(url, para); |
|
|
|
|
|
|
|
success = ComparatorUtils.equals(new JSONObject(res).get("status"), "success"); |
|
|
|
} catch (Exception e) { |
|
|
|
} catch (Exception e) { |
|
|
|
FineLoggerFactory.getLogger().error(e.getMessage(), e); |
|
|
|
FineLoggerFactory.getLogger().error(e.getMessage(), e); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -437,33 +451,51 @@ public class InformationCollector implements XMLReadable, XMLWriter { |
|
|
|
}); |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public static ArrayList getFunctionsContent(Date current, Date last){ |
|
|
|
public static JSONArray getFunctionsContent(Date current, Date last) throws JSONException{ |
|
|
|
ArrayList<Map<String,Object>> records = new ArrayList<Map<String,Object>>(); |
|
|
|
//记录当前条数，达到200条合并成一个请求
|
|
|
|
|
|
|
|
int count = 0; |
|
|
|
|
|
|
|
JSONArray functionArray = new JSONArray(); |
|
|
|
QueryCondition condition = QueryFactory.create() |
|
|
|
QueryCondition condition = QueryFactory.create() |
|
|
|
.addRestriction(RestrictionFactory.lte(COLUMN_TIME, current)) |
|
|
|
.addRestriction(RestrictionFactory.lte(COLUMN_TIME, current)) |
|
|
|
.addRestriction(RestrictionFactory.gte(COLUMN_TIME, last)); |
|
|
|
.addRestriction(RestrictionFactory.gte(COLUMN_TIME, last)); |
|
|
|
try { |
|
|
|
try { |
|
|
|
DataList<FocusPoint> focusPoints = MetricRegistry.getMetric().find(FocusPoint.class,condition); |
|
|
|
DataList<FocusPoint> focusPoints = MetricRegistry.getMetric().find(FocusPoint.class,condition); |
|
|
|
DesignerEnvManager envManager = DesignerEnvManager.getEnvManager(); |
|
|
|
JSONArray temp = new JSONArray(); |
|
|
|
String bbsUserName = MarketConfig.getInstance().getBbsUsername(); |
|
|
|
|
|
|
|
String uuid = envManager.getUUID(); |
|
|
|
|
|
|
|
if(!focusPoints.isEmpty()){ |
|
|
|
if(!focusPoints.isEmpty()){ |
|
|
|
for(FocusPoint focusPoint : focusPoints.getList()){ |
|
|
|
for(int i=0;i< focusPoints.getList().size();i++){ |
|
|
|
Map<String,Object> record = new HashMap<>(); |
|
|
|
FocusPoint focusPoint = focusPoints.getList().get(i); |
|
|
|
record.put(ATTR_ID, focusPoint.getId()); |
|
|
|
if(focusPoint != null){ |
|
|
|
record.put(ATTR_TEXT, focusPoint.getText()); |
|
|
|
if((++count <= MAX_EACH_REQUEST_RECORD_COUNT)){ |
|
|
|
record.put(ATTR_SOURCE, focusPoint.getSource()); |
|
|
|
temp.put(getOneRecord(focusPoint)); |
|
|
|
record.put(ATTR_TIME, focusPoint.getTime().getTime()); |
|
|
|
} else { |
|
|
|
record.put(ATTR_TITLE, focusPoint.getTitle()); |
|
|
|
count = 0; |
|
|
|
record.put(ATTR_USER_NAME, bbsUserName); |
|
|
|
functionArray.put(temp); |
|
|
|
record.put(ATTR_UUID, uuid); |
|
|
|
temp = new JSONArray(); |
|
|
|
records.add(record); |
|
|
|
temp.put(getOneRecord(focusPoint)); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if(i == (focusPoints.getList().size() -1)){ |
|
|
|
|
|
|
|
functionArray.put(temp); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} catch (MetricException e) { |
|
|
|
|
|
|
|
|
|
|
|
} catch (Exception e) { |
|
|
|
FineLoggerFactory.getLogger().error(e.getMessage(), e); |
|
|
|
FineLoggerFactory.getLogger().error(e.getMessage(), e); |
|
|
|
} |
|
|
|
} |
|
|
|
return records; |
|
|
|
return functionArray; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private static JSONObject getOneRecord(FocusPoint focusPoint) throws JSONException{ |
|
|
|
|
|
|
|
com.fr.json.JSONObject record = new com.fr.json.JSONObject(); |
|
|
|
|
|
|
|
record.put(ATTR_ID, focusPoint.getId()); |
|
|
|
|
|
|
|
record.put(ATTR_TEXT, focusPoint.getText()); |
|
|
|
|
|
|
|
record.put(ATTR_SOURCE, focusPoint.getSource()); |
|
|
|
|
|
|
|
record.put(ATTR_TIME, focusPoint.getTime().getTime()); |
|
|
|
|
|
|
|
record.put(ATTR_TITLE, focusPoint.getTitle()); |
|
|
|
|
|
|
|
record.put(ATTR_USER_NAME, MarketConfig.getInstance().getBbsUsername()); |
|
|
|
|
|
|
|
record.put(ATTR_UUID, DesignerEnvManager.getEnvManager().getUUID()); |
|
|
|
|
|
|
|
return record; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private class StartStopTime implements XMLReadable, XMLWriter { |
|
|
|
private class StartStopTime implements XMLReadable, XMLWriter { |
|
|
|
|
plough
6 years ago