|
@ -82,8 +82,16 @@ public class CubeController extends BaseController {
|
|
rowKeyFieldInfo.setDataType("String");
|
|
rowKeyFieldInfo.setDataType("String");
|
|
fieldInfoList.add(rowKeyFieldInfo);
|
|
fieldInfoList.add(rowKeyFieldInfo);
|
|
for(CubeMappingModel cubeMappingModel : cubeMappingModels){
|
|
for(CubeMappingModel cubeMappingModel : cubeMappingModels){
|
|
FieldInfo fieldInfo = new FieldInfo();
|
|
|
|
String fieldCode = cubeMappingModel.getDimensionCode();
|
|
String fieldCode = cubeMappingModel.getDimensionCode();
|
|
|
|
//数据字典名称作为一个属性 扩展
|
|
|
|
if(StringUtils.isNotEmpty(cubeMappingModel.getDict())){
|
|
|
|
FieldInfo dictFieldName = new FieldInfo();
|
|
|
|
dictFieldName.setField(fieldCode + "Name");
|
|
|
|
dictFieldName.setDataType("String");
|
|
|
|
fieldInfoList.add(dictFieldName);
|
|
|
|
}
|
|
|
|
|
|
|
|
FieldInfo fieldInfo = new FieldInfo();
|
|
fieldInfo.setField(fieldCode);
|
|
fieldInfo.setField(fieldCode);
|
|
// 子成员 扩展
|
|
// 子成员 扩展
|
|
List<CubeMemberMappingModel> cubeMemberMappingModels = cubeMemberMappingService.findCubeMemberMappingModelsById(cubeMappingModel.getId());
|
|
List<CubeMemberMappingModel> cubeMemberMappingModels = cubeMemberMappingService.findCubeMemberMappingModelsById(cubeMappingModel.getId());
|
|
@ -106,15 +114,11 @@ public class CubeController extends BaseController {
|
|
childFieldInfo.setField(cubeMemberMappingModel.getDimensionCode());
|
|
childFieldInfo.setField(cubeMemberMappingModel.getDimensionCode());
|
|
childFieldInfo.setDataType(cubeMemberMappingModel.getDataType());
|
|
childFieldInfo.setDataType(cubeMemberMappingModel.getDataType());
|
|
childFieldiList.add(childFieldInfo);
|
|
childFieldiList.add(childFieldInfo);
|
|
|
|
//数据字典名称作为一个子属性 扩展
|
|
if(StringUtils.isNotEmpty(cubeMemberMappingModel.getDict())){
|
|
if(StringUtils.isNotEmpty(cubeMemberMappingModel.getDict())){
|
|
//子集 的 数据字典 扩展
|
|
|
|
FieldInfo dictFieldCode = new FieldInfo();
|
|
|
|
dictFieldCode.setField(fieldCode + "Name");
|
|
|
|
dictFieldCode.setDataType("String");
|
|
|
|
FieldInfo dictFieldName = new FieldInfo();
|
|
FieldInfo dictFieldName = new FieldInfo();
|
|
dictFieldName.setField(fieldCode + "Code");
|
|
|
|
|
|
dictFieldName.setField(fieldCode + "Name");
|
|
dictFieldName.setDataType("String");
|
|
dictFieldName.setDataType("String");
|
|
childFieldiList.add(dictFieldCode);
|
|
|
|
childFieldiList.add(dictFieldName);
|
|
childFieldiList.add(dictFieldName);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@ -123,17 +127,6 @@ public class CubeController extends BaseController {
|
|
fieldInfo.setDataType(cubeMappingModel.getDataType());
|
|
fieldInfo.setDataType(cubeMappingModel.getDataType());
|
|
}
|
|
}
|
|
fieldInfoList.add(fieldInfo);
|
|
fieldInfoList.add(fieldInfo);
|
|
if(StringUtils.isNotEmpty(cubeMappingModel.getDict())){
|
|
|
|
//数据字典 扩展
|
|
|
|
FieldInfo dictFieldCode = new FieldInfo();
|
|
|
|
dictFieldCode.setField(fieldCode + "Name");
|
|
|
|
dictFieldCode.setDataType("String");
|
|
|
|
FieldInfo dictFieldName = new FieldInfo();
|
|
|
|
dictFieldName.setField(fieldCode + "Code");
|
|
|
|
dictFieldName.setDataType("String");
|
|
|
|
fieldInfoList.add(dictFieldCode);
|
|
|
|
fieldInfoList.add(dictFieldName);
|
|
|
|
}
|
|
|
|
}
|
|
}
|
|
esHandler.createIndexAndCreateMapping(index, type, fieldInfoList, esHandler.getTransportClient());
|
|
esHandler.createIndexAndCreateMapping(index, type, fieldInfoList, esHandler.getTransportClient());
|
|
envelop.setSuccessFlg(true);
|
|
envelop.setSuccessFlg(true);
|
|
@ -153,7 +146,7 @@ public class CubeController extends BaseController {
|
|
@ApiOperation(value = "测试保存mapping 数据 ")
|
|
@ApiOperation(value = "测试保存mapping 数据 ")
|
|
@RequestMapping(value = "/saveElasticSearchMappingData", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/saveElasticSearchMappingData", method = RequestMethod.GET)
|
|
public Envelop saveElasticSearchMappingData(
|
|
public Envelop saveElasticSearchMappingData(
|
|
@ApiParam(name = "table", value = "表", required = true)
|
|
|
|
|
|
@ApiParam(name = "table", value = "表 Healtharchive / HealtharchiveSub", required = true)
|
|
@RequestParam(value = "table", required = true) String table,
|
|
@RequestParam(value = "table", required = true) String table,
|
|
@ApiParam(name = "rowkey", value = "行数据唯一键值", required = true)
|
|
@ApiParam(name = "rowkey", value = "行数据唯一键值", required = true)
|
|
@RequestParam(value = "rowkey", required = true) String rowkey,
|
|
@RequestParam(value = "rowkey", required = true) String rowkey,
|
|
@ -162,7 +155,7 @@ public class CubeController extends BaseController {
|
|
@ApiParam(name = "cloumnValue", value = "列值", required = true)
|
|
@ApiParam(name = "cloumnValue", value = "列值", required = true)
|
|
@RequestParam(value = "cloumnValue", required = true) Object cloumnValue,
|
|
@RequestParam(value = "cloumnValue", required = true) Object cloumnValue,
|
|
@ApiParam(name = "action", value = "执行动作 1:put 添加修改数据 2:del 删除单个字段值 3:delAll 删除整行", required = true)
|
|
@ApiParam(name = "action", value = "执行动作 1:put 添加修改数据 2:del 删除单个字段值 3:delAll 删除整行", required = true)
|
|
@RequestParam(value = "action", required = true) Object action
|
|
|
|
|
|
@RequestParam(value = "action", required = true) int action
|
|
|
|
|
|
){
|
|
){
|
|
Envelop envelop = new Envelop();
|
|
Envelop envelop = new Envelop();
|
|
@ -173,7 +166,15 @@ public class CubeController extends BaseController {
|
|
source.put("dataSource","hbase");
|
|
source.put("dataSource","hbase");
|
|
source.put("table",table);
|
|
source.put("table",table);
|
|
source.put("rowkey",rowkey);
|
|
source.put("rowkey",rowkey);
|
|
source.put("action",action);
|
|
|
|
|
|
String actionStr = "Put";
|
|
|
|
if(action == 1){
|
|
|
|
actionStr = "Put";
|
|
|
|
}else if(action == 2){
|
|
|
|
actionStr = "DeleteColumn";
|
|
|
|
}else if(action == 3){
|
|
|
|
actionStr = "DeleteFamily";
|
|
|
|
}
|
|
|
|
source.put("action",actionStr);
|
|
source.put(cloumn,cloumnValue);
|
|
source.put(cloumn,cloumnValue);
|
|
String jsonData = gson.toJson(source);
|
|
String jsonData = gson.toJson(source);
|
|
elasticSearchDataProcessService.saveData(jsonData);
|
|
elasticSearchDataProcessService.saveData(jsonData);
|