Commit a4ea3320 by zhangkb

修改返回值

parent a4a4817a
...@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.PostMapping; ...@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -33,6 +34,7 @@ public class IndCatalogCtrl { ...@@ -33,6 +34,7 @@ public class IndCatalogCtrl {
@ApiOperation(value = "新建基础指标目录", notes = "新建基础指标目录") @ApiOperation(value = "新建基础指标目录", notes = "新建基础指标目录")
@PostMapping(value = "/createBaseIndCatalog") @PostMapping(value = "/createBaseIndCatalog")
@ResponseBody
public Integer createBaseIndCatalog(@RequestBody IndCatalog indCatalog) throws ApiException{ public Integer createBaseIndCatalog(@RequestBody IndCatalog indCatalog) throws ApiException{
String message = null; String message = null;
if(indCatalog.getId()==null) { if(indCatalog.getId()==null) {
...@@ -40,14 +42,7 @@ public class IndCatalogCtrl { ...@@ -40,14 +42,7 @@ public class IndCatalogCtrl {
}else { }else {
message = "修改基础项目录:{}"; message = "修改基础项目录:{}";
} }
// try { indCatalog = indCatalogService.saveOrUpdate(indCatalog);
// indCatalog = indCatalogService.saveOrUpdate(indCatalog);
// } catch (Exception e) {
if(1==1) {
throw new ApiException();
}
// }
LogManager.logInfo(Constants.LOG_INDICATOR_BASE_INDI_API,message,indCatalog.getCatalogName()); LogManager.logInfo(Constants.LOG_INDICATOR_BASE_INDI_API,message,indCatalog.getCatalogName());
return indCatalog.getId(); return indCatalog.getId();
} }
......
...@@ -5,4 +5,7 @@ import org.springframework.web.bind.annotation.ResponseStatus; ...@@ -5,4 +5,7 @@ import org.springframework.web.bind.annotation.ResponseStatus;
@ResponseStatus(code = HttpStatus.INTERNAL_SERVER_ERROR,reason="server error") @ResponseStatus(code = HttpStatus.INTERNAL_SERVER_ERROR,reason="server error")
public class ApiException extends Exception{ public class ApiException extends Exception{
public ApiException(String msg) {
super(msg);
}
} }
...@@ -25,11 +25,11 @@ public class IndCatalogService { ...@@ -25,11 +25,11 @@ public class IndCatalogService {
@Autowired @Autowired
private BaseIndDefMapper baseIndDefMapper; private BaseIndDefMapper baseIndDefMapper;
public IndCatalog saveOrUpdate(IndCatalog indCatalog) throws Exception{ public IndCatalog saveOrUpdate(IndCatalog indCatalog) throws ApiException{
if(indCatalog.getId()==null) {//新增 if(indCatalog.getId()==null) {//新增
if(!indCatalogMapper.findIsExist(indCatalog.getCatalogName(), indCatalog.getParentId(), if(!indCatalogMapper.findIsExist(indCatalog.getCatalogName(), indCatalog.getParentId(),
indCatalog.getCode()).isEmpty()) { indCatalog.getCode()).isEmpty()) {
throw new Exception("存在同名目录"); throw new ApiException("存在同名目录");
} }
//保存 //保存
indCatalogMapper.insert(indCatalog); indCatalogMapper.insert(indCatalog);
...@@ -37,7 +37,7 @@ public class IndCatalogService { ...@@ -37,7 +37,7 @@ public class IndCatalogService {
List<IndCatalog> dbList = indCatalogMapper.findIsExist(indCatalog.getCatalogName(), indCatalog.getParentId(), List<IndCatalog> dbList = indCatalogMapper.findIsExist(indCatalog.getCatalogName(), indCatalog.getParentId(),
indCatalog.getCode()); indCatalog.getCode());
if(!dbList.isEmpty() && !dbList.get(0).getId().equals(indCatalog.getId())) { if(!dbList.isEmpty() && !dbList.get(0).getId().equals(indCatalog.getId())) {
throw new Exception("存在同名目录"); throw new ApiException("存在同名目录");
} }
} }
//获取parentId拼接idPath //获取parentId拼接idPath
...@@ -47,7 +47,7 @@ public class IndCatalogService { ...@@ -47,7 +47,7 @@ public class IndCatalogService {
}else { }else {
IndCatalog parentIndCatalog = indCatalogMapper.selectByPrimaryKey(indCatalog.getParentId()); IndCatalog parentIndCatalog = indCatalogMapper.selectByPrimaryKey(indCatalog.getParentId());
if(parentIndCatalog==null) { if(parentIndCatalog==null) {
throw new Exception("父节点不存在:parent catalog is not exist"); throw new ApiException("父节点不存在:parent catalog is not exist");
}else { }else {
indCatalog.setIdPath(parentIndCatalog.getIdPath()+indCatalog.getId()+";"); indCatalog.setIdPath(parentIndCatalog.getIdPath()+indCatalog.getId()+";");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment