Browse Source

Merge pull request #591 in DESIGN/design from ~ALEX.SUNG/design:feature/10.0 to feature/10.0

REPORT-12520 @Alex.Sung:上传设计器功能点后不应该删除swift表数据

* commit '95798bb8eed0a55b05c633380d8ea85c188d744b':
  REPORT-12520 @Alex.Sung:上传设计器功能点后不应该删除swift表数据 去掉删除逻辑,改为根据最后发送时间发送给云中心
research/10.0
Alex.Sung 6 years ago
parent
commit
3c16fc1f69
  1. 96
      designer-realize/src/main/java/com/fr/design/mainframe/InformationCollector.java

96
designer-realize/src/main/java/com/fr/design/mainframe/InformationCollector.java

@ -226,20 +226,27 @@ public class InformationCollector implements XMLReadable, XMLWriter {
} }
private void sendFunctionsInfo(){ private void sendFunctionsInfo(){
long currentTime = new Date().getTime(); Date current = new Date();
ArrayList<Map<String, Object>> content = null; long lastTime = getLastTimeMillis();
content = getFunctionsContentAsByte(currentTime); long currentTime = current.getTime();
boolean success = false; if (currentTime - lastTime <= DELTA) {
String url = CloudCenter.getInstance().acquireUrlByKind(TABLE_FUNCTION_RECORD); return;
if(content.size() > 0){
for(int i=0; i<content.size(); i++){
success = sendFunctionRecord(url, content.get(i));
}
//服务器返回true, 说明已经获取成功, 清空当前记录的信息
if (success) {
deleteFunctionRecords(currentTime);
}
} }
ArrayList<Map<String, Object>> content = null;
content = getFunctionsContent(current, new Date(lastTime));
boolean success = false;
FineLoggerFactory.getLogger().info("Start sent function records to the cloud center...");
String url = CloudCenter.getInstance().acquireUrlByKind(TABLE_FUNCTION_RECORD);
if(content.size() > 0){
for(int i=0; i<content.size(); i++){
success = sendFunctionRecord(url, content.get(i));
}
//服务器返回true, 说明已经获取成功, 更新最后一次发送时间
if (success) {
this.lastTime = dateToString();
}
}
FineLoggerFactory.getLogger().info("Function records successfully sent to the cloud center.");
// //先将发送压缩文件这段代码注释,之后提任务 // //先将发送压缩文件这段代码注释,之后提任务
//大数据量下发送压缩zip数据不容易丢失 //大数据量下发送压缩zip数据不容易丢失
// try { // try {
@ -294,8 +301,8 @@ public class InformationCollector implements XMLReadable, XMLWriter {
} catch (InterruptedException e) { } catch (InterruptedException e) {
FRContext.getLogger().error(e.getMessage(), e); FRContext.getLogger().error(e.getMessage(), e);
} }
sendFunctionsInfo();
sendUserInfo(); sendUserInfo();
sendFunctionsInfo();
TemplateInfoCollector.getInstance().sendTemplateInfo(); TemplateInfoCollector.getInstance().sendTemplateInfo();
ErrorInfoUploader.getInstance().sendErrorInfo(); ErrorInfoUploader.getInstance().sendErrorInfo();
} }
@ -430,44 +437,33 @@ public class InformationCollector implements XMLReadable, XMLWriter {
}); });
} }
public static ArrayList getFunctionsContentAsByte(long currentTime){ public static ArrayList getFunctionsContent(Date current, Date last){
ArrayList<Map<String,Object>> records = new ArrayList<Map<String,Object>>(); ArrayList<Map<String,Object>> records = new ArrayList<Map<String,Object>>();
QueryCondition condition = QueryFactory.create().addRestriction( QueryCondition condition = QueryFactory.create()
RestrictionFactory.lte(COLUMN_TIME, currentTime) .addRestriction(RestrictionFactory.lte(COLUMN_TIME, current))
); .addRestriction(RestrictionFactory.gte(COLUMN_TIME, last));
try {
DataList<FocusPoint> focusPoints = MetricRegistry.getMetric().find(FocusPoint.class,condition);
DesignerEnvManager envManager = DesignerEnvManager.getEnvManager();
String bbsUserName = MarketConfig.getInstance().getBbsUsername();
String uuid = envManager.getUUID();
if(!focusPoints.isEmpty()){
for(FocusPoint focusPoint : focusPoints.getList()){
Map<String,Object> record = new HashMap<>();
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, bbsUserName);
record.put(ATTR_UUID, uuid);
records.add(record);
}
}
} catch (MetricException e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
return records;
}
private void deleteFunctionRecords(long currentTime) {
QueryCondition condition = QueryFactory.create().addRestriction(
RestrictionFactory.lte(COLUMN_TIME, currentTime)
);
try { try {
MetricRegistry.getMetric().clean(condition); DataList<FocusPoint> focusPoints = MetricRegistry.getMetric().find(FocusPoint.class,condition);
}catch (Exception e){ DesignerEnvManager envManager = DesignerEnvManager.getEnvManager();
FineLoggerFactory.getLogger().error(e.getMessage(), e); String bbsUserName = MarketConfig.getInstance().getBbsUsername();
String uuid = envManager.getUUID();
if(!focusPoints.isEmpty()){
for(FocusPoint focusPoint : focusPoints.getList()){
Map<String,Object> record = new HashMap<>();
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, bbsUserName);
record.put(ATTR_UUID, uuid);
records.add(record);
}
}
} catch (MetricException e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
} }
return records;
} }
private class StartStopTime implements XMLReadable, XMLWriter { private class StartStopTime implements XMLReadable, XMLWriter {

Loading…
Cancel
Save