修改返回值

src/main/java/com/keymobile/indicators/api/hytobacco/IndCatalogCtrl.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 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.RestController;
 
@@ -33,6 +34,7 @@ public class IndCatalogCtrl {
 	
 	@ApiOperation(value = "新建基础指标目录", notes = "新建基础指标目录")
 	@PostMapping(value = "/createBaseIndCatalog")
+	@ResponseBody
 	public Integer createBaseIndCatalog(@RequestBody IndCatalog indCatalog) throws ApiException{
 		String message = null;
 		if(indCatalog.getId()==null) {
@@ -40,14 +42,7 @@ public class IndCatalogCtrl {
 		}else {
 			message = "修改基础项目录:{}";
 		}
-//		try {
-//			indCatalog = indCatalogService.saveOrUpdate(indCatalog);
-//		} catch (Exception e) {
-		if(1==1) {
-			throw new ApiException();
-		}
-			
-//		}
+		indCatalog = indCatalogService.saveOrUpdate(indCatalog);
 		LogManager.logInfo(Constants.LOG_INDICATOR_BASE_INDI_API,message,indCatalog.getCatalogName());
 		return indCatalog.getId();
 	}

src/main/java/com/keymobile/indicators/exception/ApiException.java

@@ -5,4 +5,7 @@ import org.springframework.web.bind.annotation.ResponseStatus;
 
 @ResponseStatus(code = HttpStatus.INTERNAL_SERVER_ERROR,reason="server error")
 public class ApiException extends Exception{
+	public ApiException(String msg) {
+		super(msg);
+	}
 }

src/main/java/com/keymobile/indicators/service/hytobacco/IndCatalogService.java

@@ -25,11 +25,11 @@ public class IndCatalogService {
 	@Autowired
 	private BaseIndDefMapper baseIndDefMapper;
 	
-	public IndCatalog saveOrUpdate(IndCatalog indCatalog) throws Exception{
+	public IndCatalog saveOrUpdate(IndCatalog indCatalog) throws ApiException{
 		if(indCatalog.getId()==null) {//新增
 			if(!indCatalogMapper.findIsExist(indCatalog.getCatalogName(), indCatalog.getParentId(), 
 					indCatalog.getCode()).isEmpty()) {
-				throw new Exception("存在同名目录");
+				throw new ApiException("存在同名目录");
 			}
 			//保存
 			indCatalogMapper.insert(indCatalog);
@@ -37,7 +37,7 @@ public class IndCatalogService {
 			List<IndCatalog> dbList = indCatalogMapper.findIsExist(indCatalog.getCatalogName(), indCatalog.getParentId(), 
 					indCatalog.getCode());
 			if(!dbList.isEmpty() && !dbList.get(0).getId().equals(indCatalog.getId())) {
-				throw new Exception("存在同名目录");
+				throw new ApiException("存在同名目录");
 			}
 		}
 		//获取parentId拼接idPath
@@ -47,7 +47,7 @@ public class IndCatalogService {
 		}else {
 			IndCatalog parentIndCatalog = indCatalogMapper.selectByPrimaryKey(indCatalog.getParentId());
 			if(parentIndCatalog==null) {
-				throw new Exception("父节点不存在:parent catalog is not exist");
+				throw new ApiException("父节点不存在:parent catalog is not exist");
 			}else {
 				indCatalog.setIdPath(parentIndCatalog.getIdPath()+indCatalog.getId()+";");
 			}