|
@@ -3,10 +3,12 @@ package com.bowintek.practice.services.impl;
|
|
|
import com.bowintek.practice.enums.DataRangeEnum;
|
|
|
import com.bowintek.practice.mapper.*;
|
|
|
import com.bowintek.practice.mapper.cquery.SubjectCQuery;
|
|
|
+import com.bowintek.practice.mapper.cquery.TempCQuery;
|
|
|
import com.bowintek.practice.model.*;
|
|
|
import com.bowintek.practice.services.service.TempService;
|
|
|
import com.bowintek.practice.services.service.UserService;
|
|
|
import com.bowintek.practice.util.DateUtils;
|
|
|
+import com.bowintek.practice.vo.temp.TempObjectModel;
|
|
|
import com.bowintek.practice.vo.user.DataRange;
|
|
|
import com.bowintek.practice.vo.user.UserInfoModel;
|
|
|
import com.github.pagehelper.PageHelper;
|
|
@@ -21,6 +23,52 @@ import java.util.stream.Collectors;
|
|
|
public class TempServiceImpl implements TempService {
|
|
|
@Autowired
|
|
|
SubjectCQuery subjectCQuery;
|
|
|
+ @Autowired
|
|
|
+ TempCQuery tempCQuery;
|
|
|
+ @Autowired
|
|
|
+ SrSaerchtempMapper srSaerchtempMapper;
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public int saveTemp(TempObjectModel data, String userID){
|
|
|
+ int result = 0;
|
|
|
+ //保存模板主表
|
|
|
+ if(data.temp.getTempId().isEmpty()){
|
|
|
+ data.temp.setTempId(UUID.randomUUID().toString());
|
|
|
+ data.temp.setCreateTime(new Date());
|
|
|
+ data.temp.setCreatedBy(userID);
|
|
|
+ data.temp.setStatus(0);
|
|
|
+ result += srSaerchtempMapper.insert(data.temp);
|
|
|
+
|
|
|
+ data.bases.forEach(row->{
|
|
|
+ row.setTempFeildId(UUID.randomUUID().toString());
|
|
|
+ row.setTempId(data.temp.getTempId());
|
|
|
+ });
|
|
|
+ data.wheres.forEach(row->{
|
|
|
+ row.setTempFeildId(UUID.randomUUID().toString());
|
|
|
+ row.setTempId(data.temp.getTempId());
|
|
|
+ });
|
|
|
+ data.measures.forEach(row->{
|
|
|
+ row.setTempFeildId(UUID.randomUUID().toString());
|
|
|
+ row.setTempId(data.temp.getTempId());
|
|
|
+ });
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ data.temp.setModifyTime(new Date());
|
|
|
+ data.temp.setModifyBy(userID);
|
|
|
+ result += srSaerchtempMapper.updateByPrimaryKey(data.temp);
|
|
|
+
|
|
|
+ tempCQuery.deletesDimensionByTempId(Arrays.asList(data.temp.getTempId()));
|
|
|
+ tempCQuery.deletesFieldByTempId(Arrays.asList(data.temp.getTempId()));
|
|
|
+ tempCQuery.deletesMeasureByTempId(Arrays.asList(data.temp.getTempId()));
|
|
|
+ }
|
|
|
+
|
|
|
+ //保存模板 维度、度量、查询信息
|
|
|
+ result += tempCQuery.batchInsertDimension(data.bases);
|
|
|
+ result += tempCQuery.batchInsertField(data.wheres);
|
|
|
+ result += tempCQuery.batchInsertMeasure(data.measures);
|
|
|
+
|
|
|
+ return result;
|
|
|
+ }
|
|
|
|
|
|
@Override
|
|
|
public List<HashMap<String, Object>> getSubjectTree(String likeName) {
|
|
@@ -57,6 +105,7 @@ public class TempServiceImpl implements TempService {
|
|
|
|
|
|
return subjectTrees;
|
|
|
}
|
|
|
+
|
|
|
public List<HashMap<String, Object>> findSubjectFields(List<HashMap<String, Object>> subFields,
|
|
|
String subId,
|
|
|
List<Integer> queryTypeIds,
|
|
@@ -73,7 +122,7 @@ public class TempServiceImpl implements TempService {
|
|
|
field.put("key", field.get("fieldId").toString());
|
|
|
field.put("subjectName", subjectName);
|
|
|
|
|
|
- field.put("subId", subId+"-"+groupName);
|
|
|
+ //field.put("subId", subId+"-"+groupName);
|
|
|
});
|
|
|
return fields;
|
|
|
}
|