|
@ -35,9 +35,9 @@ public class DimensionController extends BaseController {
|
|
|
@Autowired
|
|
|
private DimensionMemberService dimensionMemberService;
|
|
|
|
|
|
@RequestMapping(value = "/olap/searchOlapDimension", method = RequestMethod.GET)
|
|
|
@RequestMapping(value = "/olap/searchDimension", method = RequestMethod.GET)
|
|
|
@ApiOperation(value = "根据查询条件查询,具有分页功能;filters='id=1'")
|
|
|
public Envelop searchOlapDimension(
|
|
|
public Envelop searchDimension(
|
|
|
@ApiParam(name = "fields", value = "返回的字段,为空返回全部字段", defaultValue = "")
|
|
|
@RequestParam(value = "fields", required = false) String fields,
|
|
|
@ApiParam(name = "filters", value = "过滤器,为空检索所有条件")
|
|
@ -63,16 +63,16 @@ public class DimensionController extends BaseController {
|
|
|
return envelop;
|
|
|
}
|
|
|
|
|
|
@RequestMapping(value = "/olap/saveOrUpdateOlapDimension", method = RequestMethod.POST)
|
|
|
@RequestMapping(value = "/olap/saveOrUpdateDimension", method = RequestMethod.POST)
|
|
|
@ApiOperation(value = "添加或修改操作")
|
|
|
public Envelop saveOlapDimension(
|
|
|
public Envelop saveOrUpdateDimension(
|
|
|
@ApiParam(name = "model", value = "json数据模型", defaultValue = "")
|
|
|
@RequestParam String model) throws Exception {
|
|
|
Envelop envelop = new Envelop();
|
|
|
Dimension dimension = objectMapper.readValue(URLDecoder.decode(model, "UTF-8"), Dimension.class);
|
|
|
if (null == dimension.getId()) {
|
|
|
// 新增
|
|
|
Integer id = dimensionService.saveOlapDimension(dimension);
|
|
|
Integer id = dimensionService.saveDimension(dimension);
|
|
|
if (null != id) {
|
|
|
envelop.setSuccessFlg(true);
|
|
|
}
|
|
@ -84,13 +84,13 @@ public class DimensionController extends BaseController {
|
|
|
return envelop;
|
|
|
}
|
|
|
|
|
|
@RequestMapping(value = "/olap/deleteOlapDimensionById", method = RequestMethod.DELETE)
|
|
|
@RequestMapping(value = "/olap/deleteDimensionById", method = RequestMethod.DELETE)
|
|
|
@ApiOperation(value = "根据id删除")
|
|
|
public Envelop deleteOlapDimensionById(
|
|
|
public Envelop deleteDimensionById(
|
|
|
@ApiParam(name = "id", value = "编号", defaultValue = "")
|
|
|
@RequestParam(value = "id") Integer id) throws Exception {
|
|
|
Envelop envelop = new Envelop();
|
|
|
dimensionService.deleteOlapDimension(id);
|
|
|
dimensionService.deleteDimension(id);
|
|
|
envelop.setSuccessFlg(true);
|
|
|
return envelop;
|
|
|
}
|