版本管理,事务控制bug优化

pull/195/head
Mlin 2 years ago
parent 0a809a29c9
commit 775405741a

@ -401,8 +401,9 @@ public class ChartServiceImpl extends Service implements ChartService {
@Override @Override
public Map<String, Object> versionRecord(Map<String, Object> params, User user) { public Map<String, Object> versionRecord(Map<String, Object> params, User user) {
RecordSetTrans recordSetTrans = new RecordSetTrans();
recordSetTrans.setAutoCommit(false);//关闭自动提交
RecordSet rs = new RecordSet(); RecordSet rs = new RecordSet();
@ -425,12 +426,22 @@ public class ChartServiceImpl extends Service implements ChartService {
if (rs.next()) { if (rs.next()) {
versionId = Util.null2String(rs.getString("id")); versionId = Util.null2String(rs.getString("id"));
} }
if ("0".equals(dimension)) {
//实体维度 RecordSetTrans recordSetTrans = new RecordSetTrans();
trueDimension(recordSetTrans,versionId,currentUser,currentDate); try {
} else { recordSetTrans.setAutoCommit(false);
virtualDimension(recordSetTrans,versionId,currentUser,currentDate,dimension); if ("0".equals(dimension)) {
//实体维度
trueDimension(recordSetTrans,versionId,currentUser,currentDate);
} else {
virtualDimension(recordSetTrans,versionId,currentUser,currentDate,dimension);
}
recordSetTrans.commit();
} catch (Exception e) {
recordSetTrans.rollback();
e.printStackTrace();
} }
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
result.put("api_status", true); result.put("api_status", true);
return result; return result;
@ -824,7 +835,6 @@ public class ChartServiceImpl extends Service implements ChartService {
private void insertData(RecordSetTrans recordSetTrans,String insertSql,List<List<Object>> insertParamList) { private void insertData(RecordSetTrans recordSetTrans,String insertSql,List<List<Object>> insertParamList) {
try { try {
recordSetTrans.executeBatchSql(insertSql,insertParamList); recordSetTrans.executeBatchSql(insertSql,insertParamList);
recordSetTrans.commit();
} catch (Exception e) { } catch (Exception e) {
recordSetTrans.rollback(); recordSetTrans.rollback();
e.printStackTrace(); e.printStackTrace();

Loading…
Cancel
Save