diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateController.java index 601db850..118ef641 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateController.java @@ -107,7 +107,7 @@ public class XmBranchStateController { public Result loadProjectStateToXmBranchState(@RequestBody XmBranchState xmBranchState){ if(StringUtils.isEmpty(xmBranchState.getBranchId())) { - tips.setFailureMsg("机构编号branchId必填"); + return Result.error("机构编号branchId必填"); }else { xmBranchStateService.loadProjectStateToXmBranchState(xmBranchState.getBranchId()); @@ -131,7 +131,7 @@ public class XmBranchStateController { }else{ XmBranchState xmBranchStateQuery = new XmBranchState(xmBranchState.getId()); if(xmBranchStateService.countByWhere(xmBranchStateQuery)>0){ - tips.setFailureMsg("编号重复，请修改编号再提交"); + return Result.error("编号重复，请修改编号再提交"); m.put("tips", tips); return m; } @@ -142,7 +142,7 @@ public class XmBranchStateController { tips=e.getTips(); logger.error("",e); }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); + return Result.error(e.getMessage()); logger.error("",e); } m.put("tips", tips); @@ -165,7 +165,7 @@ public class XmBranchStateController { tips=e.getTips(); logger.error("",e); }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); + return Result.error(e.getMessage()); logger.error("",e); } m.put("tips", tips); @@ -189,7 +189,7 @@ public class XmBranchStateController { tips=e.getTips(); logger.error("",e); }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); + return Result.error(e.getMessage()); logger.error("",e); } m.put("tips", tips); @@ -214,7 +214,7 @@ public class XmBranchStateController { tips=e.getTips(); logger.error("",e); }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); + return Result.error(e.getMessage()); logger.error("",e); } m.put("tips", tips); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateHisController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateHisController.java index 4564c23f..2da55353 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateHisController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateHisController.java @@ -103,7 +103,7 @@ public class XmBranchStateHisController { } if(createPk==false){ if(xmBranchStateHisService.selectOneObject(xmBranchStateHis) !=null ){ - return failed("pk-exists","编号重复，请修改编号再提交"); + return Result.error("pk-exists","编号重复，请修改编号再提交"); } } xmBranchStateHisService.insert(xmBranchStateHis); @@ -120,14 +120,14 @@ public class XmBranchStateHisController { public Result delXmBranchStateHis(@RequestBody XmBranchStateHis xmBranchStateHis){ if(!StringUtils.hasText(xmBranchStateHis.getBizDate())) { - return failed("pk-not-exists","请上送主键参数bizDate"); + return Result.error("pk-not-exists","请上送主键参数bizDate"); } if(!StringUtils.hasText(xmBranchStateHis.getBranchId())) { - return failed("pk-not-exists","请上送主键参数branchId"); + return Result.error("pk-not-exists","请上送主键参数branchId"); } XmBranchStateHis xmBranchStateHisDb = xmBranchStateHisService.selectOneObject(xmBranchStateHis); if( xmBranchStateHisDb == null ){ - return failed("data-not-exists","数据不存在，无法删除"); + return Result.error("data-not-exists","数据不存在，无法删除"); } xmBranchStateHisService.deleteByPk(xmBranchStateHis); return Result.ok(); @@ -144,14 +144,14 @@ public class XmBranchStateHisController { public Result editXmBranchStateHis(@RequestBody XmBranchStateHis xmBranchStateHis) { if(!StringUtils.hasText(xmBranchStateHis.getBizDate())) { - return failed("pk-not-exists","请上送主键参数bizDate"); + return Result.error("pk-not-exists","请上送主键参数bizDate"); } if(!StringUtils.hasText(xmBranchStateHis.getBranchId())) { - return failed("pk-not-exists","请上送主键参数branchId"); + return Result.error("pk-not-exists","请上送主键参数branchId"); } XmBranchStateHis xmBranchStateHisDb = xmBranchStateHisService.selectOneObject(xmBranchStateHis); if( xmBranchStateHisDb == null ){ - return failed("data-not-exists","数据不存在，无法修改"); + return Result.error("data-not-exists","数据不存在，无法修改"); } xmBranchStateHisService.updateSomeFieldByPk(xmBranchStateHis); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmBranchTaskTypeStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmBranchTaskTypeStateController.java index 22ac5d94..c10e8195 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmBranchTaskTypeStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmBranchTaskTypeStateController.java @@ -78,7 +78,7 @@ public class XmBranchTaskTypeStateController { public Result loadProjectTaskTypeStateToXmBranchTaskTypeState(@RequestBody XmBranchState xmBranchState){ if(StringUtils.isEmpty(xmBranchState.getBranchId())) { - tips.setFailureMsg("机构编号branchId必填"); + return Result.error("机构编号branchId必填"); }else { xmBranchTaskTypeStateService.loadProjectTaskTypeStateToXmBranchTaskTypeState(xmBranchState.getBranchId()); @@ -99,7 +99,7 @@ public class XmBranchTaskTypeStateController { }else{ XmBranchTaskTypeState xmBranchTaskTypeStateQuery = new XmBranchTaskTypeState(xmBranchTaskTypeState.getId()); if(xmBranchTaskTypeStateService.countByWhere(xmBranchTaskTypeStateQuery)>0){ - tips.setFailureMsg("编号重复，请修改编号再提交"); + return Result.error("编号重复，请修改编号再提交"); m.put("tips", tips); return m; } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmBudgetLaborController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmBudgetLaborController.java index 2d28aec9..e563abb1 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmBudgetLaborController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmBudgetLaborController.java @@ -99,7 +99,7 @@ public class XmBudgetLaborController { } if(createPk==false){ if(xmBudgetLaborService.selectOneObject(xmBudgetLabor) !=null ){ - return failed("pk-exists","编号重复，请修改编号再提交"); + return Result.error("pk-exists","编号重复，请修改编号再提交"); } } xmBudgetLaborService.insert(xmBudgetLabor); @@ -116,11 +116,11 @@ public class XmBudgetLaborController { public Result delXmBudgetLabor(@RequestBody XmBudgetLabor xmBudgetLabor){ if(!StringUtils.hasText(xmBudgetLabor.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmBudgetLabor xmBudgetLaborDb = xmBudgetLaborService.selectOneObject(xmBudgetLabor); if( xmBudgetLaborDb == null ){ - return failed("data-not-exists","数据不存在，无法删除"); + return Result.error("data-not-exists","数据不存在，无法删除"); } xmBudgetLaborService.deleteByPk(xmBudgetLabor); return Result.ok(); @@ -135,11 +135,11 @@ public class XmBudgetLaborController { public Result editXmBudgetLabor(@RequestBody XmBudgetLabor xmBudgetLabor) { if(!StringUtils.hasText(xmBudgetLabor.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmBudgetLabor xmBudgetLaborDb = xmBudgetLaborService.selectOneObject(xmBudgetLabor); if( xmBudgetLaborDb == null ){ - return failed("data-not-exists","数据不存在，无法修改"); + return Result.error("data-not-exists","数据不存在，无法修改"); } xmBudgetLaborService.updateSomeFieldByPk(xmBudgetLabor); @@ -155,26 +155,26 @@ public class XmBudgetLaborController { List ids= (List) xmBudgetLaborMap.get("ids"); if(ids==null || ids.size()==0){ - return failed("ids-0","ids不能为空"); + return Result.error("ids-0","ids不能为空"); } Set fields=new HashSet<>(); fields.add("id"); for (String fieldName : xmBudgetLaborMap.keySet()) { if(fields.contains(fieldName)){ - return failed(fieldName+"-no-edit",fieldName+"不允许修改"); + return Result.error(fieldName+"-no-edit",fieldName+"不允许修改"); } } Set fieldKey=xmBudgetLaborMap.keySet().stream().filter(i-> fieldsMap.containsKey(i)).collect(Collectors.toSet()); fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmBudgetLaborMap.get(i) )).collect(Collectors.toSet()); if(fieldKey.size()<=0) { - return failed("fieldKey-0","没有需要更新的字段"); + return Result.error("fieldKey-0","没有需要更新的字段"); } XmBudgetLabor xmBudgetLabor = fromMap(xmBudgetLaborMap,XmBudgetLabor.class); List xmBudgetLaborsDb=xmBudgetLaborService.selectListByIds(ids); if(xmBudgetLaborsDb==null ||xmBudgetLaborsDb.size()==0){ - return failed("data-0","记录已不存在"); + return Result.error("data-0","记录已不存在"); } List can=new ArrayList<>(); List no=new ArrayList<>(); @@ -199,9 +199,9 @@ public class XmBudgetLaborController { msgs.add(String.format("以下%s个数据无权限更新",no.size())); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } // return Result.ok(); @@ -217,7 +217,7 @@ public class XmBudgetLaborController { public Result batchAddXmBudgetLabor(@RequestBody List xmBudgetLabors) { if(xmBudgetLabors.size()<=0){ - return failed("data-0","请上送待新增数据列表"); + return Result.error("data-0","请上送待新增数据列表"); } List datasDb=xmBudgetLabors; List can=new ArrayList<>(); @@ -240,9 +240,9 @@ public class XmBudgetLaborController { msgs.add(String.format("以下%s条数据不能新增.【%s】",no.size(),no.stream().map(i-> i.getId() ).collect(Collectors.joining(",")))); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } return Result.ok(); @@ -258,7 +258,7 @@ public class XmBudgetLaborController { if(xmBudgetLabors.size()<=0){ - return failed("data-0","请上送待删除数据列表"); + return Result.error("data-0","请上送待删除数据列表"); } List datasDb=xmBudgetLaborService.selectListByIds(xmBudgetLabors.stream().map(i-> i.getId() ).collect(Collectors.toList())); @@ -281,19 +281,12 @@ public class XmBudgetLaborController { msgs.add(String.format("以下%s条数据不能删除.【%s】",no.size(),no.stream().map(i-> i.getId() ).collect(Collectors.joining(",")))); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } - }catch (BizException e) { - tips=e.getTips(); - logger.error("",e); - }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); - logger.error("",e); - } - m.put("tips", tips); - return m; + return Result.ok(); + } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmBudgetNlaborController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmBudgetNlaborController.java index 394b4be5..0fb4becb 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmBudgetNlaborController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmBudgetNlaborController.java @@ -98,7 +98,7 @@ public class XmBudgetNlaborController { } if(createPk==false){ if(xmBudgetNlaborService.selectOneObject(xmBudgetNlabor) !=null ){ - return failed("pk-exists","编号重复，请修改编号再提交"); + return Result.error("pk-exists","编号重复，请修改编号再提交"); } } xmBudgetNlaborService.insert(xmBudgetNlabor); @@ -115,11 +115,11 @@ public class XmBudgetNlaborController { public Result delXmBudgetNlabor(@RequestBody XmBudgetNlabor xmBudgetNlabor){ if(!StringUtils.hasText(xmBudgetNlabor.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmBudgetNlabor xmBudgetNlaborDb = xmBudgetNlaborService.selectOneObject(xmBudgetNlabor); if( xmBudgetNlaborDb == null ){ - return failed("data-not-exists","数据不存在，无法删除"); + return Result.error("data-not-exists","数据不存在，无法删除"); } xmBudgetNlaborService.deleteByPk(xmBudgetNlabor); return Result.ok(); @@ -134,11 +134,11 @@ public class XmBudgetNlaborController { public Result editXmBudgetNlabor(@RequestBody XmBudgetNlabor xmBudgetNlabor) { if(!StringUtils.hasText(xmBudgetNlabor.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmBudgetNlabor xmBudgetNlaborDb = xmBudgetNlaborService.selectOneObject(xmBudgetNlabor); if( xmBudgetNlaborDb == null ){ - return failed("data-not-exists","数据不存在，无法修改"); + return Result.error("data-not-exists","数据不存在，无法修改"); } xmBudgetNlaborService.updateSomeFieldByPk(xmBudgetNlabor); @@ -154,26 +154,26 @@ public class XmBudgetNlaborController { List ids= (List) xmBudgetNlaborMap.get("ids"); if(ids==null || ids.size()==0){ - return failed("ids-0","ids不能为空"); + return Result.error("ids-0","ids不能为空"); } Set fields=new HashSet<>(); fields.add("id"); for (String fieldName : xmBudgetNlaborMap.keySet()) { if(fields.contains(fieldName)){ - return failed(fieldName+"-no-edit",fieldName+"不允许修改"); + return Result.error(fieldName+"-no-edit",fieldName+"不允许修改"); } } Set fieldKey=xmBudgetNlaborMap.keySet().stream().filter(i-> fieldsMap.containsKey(i)).collect(Collectors.toSet()); fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmBudgetNlaborMap.get(i) )).collect(Collectors.toSet()); if(fieldKey.size()<=0) { - return failed("fieldKey-0","没有需要更新的字段"); + return Result.error("fieldKey-0","没有需要更新的字段"); } XmBudgetNlabor xmBudgetNlabor = BaseUtils.fromMap(xmBudgetNlaborMap,XmBudgetNlabor.class); List xmBudgetNlaborsDb=xmBudgetNlaborService.selectListByIds(ids); if(xmBudgetNlaborsDb==null ||xmBudgetNlaborsDb.size()==0){ - return failed("data-0","记录已不存在"); + return Result.error("data-0","记录已不存在"); } List can=new ArrayList<>(); List no=new ArrayList<>(); @@ -198,9 +198,9 @@ public class XmBudgetNlaborController { msgs.add(String.format("以下%s个数据无权限更新",no.size())); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } // return Result.ok(); @@ -215,7 +215,7 @@ public class XmBudgetNlaborController { public Result batchAddXmBudgetNlabor(@RequestBody List xmBudgetNlabors) { if(xmBudgetNlabors.size()<=0){ - return failed("data-0","请上送待新增数据列表"); + return Result.error("data-0","请上送待新增数据列表"); } List datasDb=xmBudgetNlabors; List can=new ArrayList<>(); @@ -238,9 +238,9 @@ public class XmBudgetNlaborController { msgs.add(String.format("以下%s条数据不能新增.【%s】",no.size(),no.stream().map(i-> i.getId() ).collect(Collectors.joining(",")))); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } return Result.ok(); @@ -256,7 +256,7 @@ public class XmBudgetNlaborController { if(xmBudgetNlabors.size()<=0){ - return failed("data-0","请上送待删除数据列表"); + return Result.error("data-0","请上送待删除数据列表"); } List datasDb=xmBudgetNlaborService.selectListByIds(xmBudgetNlabors.stream().map(i-> i.getId() ).collect(Collectors.toList())); @@ -279,19 +279,12 @@ public class XmBudgetNlaborController { msgs.add(String.format("以下%s条数据不能删除.【%s】",no.size(),no.stream().map(i-> i.getId() ).collect(Collectors.joining(",")))); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } - }catch (BizException e) { - tips=e.getTips(); - logger.error("",e); - }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); - logger.error("",e); - } - m.put("tips", tips); - return m; + return Result.ok(); + } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmCostNlaborController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmCostNlaborController.java index 5ba72eec..b4c762b9 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmCostNlaborController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmCostNlaborController.java @@ -99,7 +99,7 @@ public class XmCostNlaborController { } if(createPk==false){ if(xmCostNlaborService.selectOneObject(xmCostNlabor) !=null ){ - return failed("pk-exists","编号重复，请修改编号再提交"); + return Result.error("pk-exists","编号重复，请修改编号再提交"); } } xmCostNlaborService.insert(xmCostNlabor); @@ -116,14 +116,14 @@ public class XmCostNlaborController { public Result delXmCostNlabor(@RequestBody XmCostNlabor xmCostNlabor){ if(!StringUtils.hasText(xmCostNlabor.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmCostNlabor xmCostNlaborDb = xmCostNlaborService.selectOneObject(xmCostNlabor); if( xmCostNlaborDb == null ){ - return failed("data-not-exists","数据不存在，无法删除"); + return Result.error("data-not-exists","数据不存在，无法删除"); } xmCostNlaborService.deleteByPk(xmCostNlabor); - return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); + return Result.ok(); } @@ -135,14 +135,14 @@ public class XmCostNlaborController { public Result editXmCostNlabor(@RequestBody XmCostNlabor xmCostNlabor) { if(!StringUtils.hasText(xmCostNlabor.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmCostNlabor xmCostNlaborDb = xmCostNlaborService.selectOneObject(xmCostNlabor); if( xmCostNlaborDb == null ){ - return failed("data-not-exists","数据不存在，无法修改"); + return Result.error("data-not-exists","数据不存在，无法修改"); } xmCostNlaborService.updateSomeFieldByPk(xmCostNlabor); - + return Result.ok(); } @ApiOperation( value = "批量修改某些字段",notes="") @@ -155,26 +155,26 @@ public class XmCostNlaborController { List ids= (List) xmCostNlaborMap.get("ids"); if(ids==null || ids.size()==0){ - return failed("ids-0","ids不能为空"); + return Result.error("ids-0","ids不能为空"); } Set fields=new HashSet<>(); fields.add("id"); for (String fieldName : xmCostNlaborMap.keySet()) { if(fields.contains(fieldName)){ - return failed(fieldName+"-no-edit",fieldName+"不允许修改"); + return Result.error(fieldName+"-no-edit",fieldName+"不允许修改"); } } Set fieldKey=xmCostNlaborMap.keySet().stream().filter(i-> fieldsMap.containsKey(i)).collect(Collectors.toSet()); fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmCostNlaborMap.get(i) )).collect(Collectors.toSet()); if(fieldKey.size()<=0) { - return failed("fieldKey-0","没有需要更新的字段"); + return Result.error("fieldKey-0","没有需要更新的字段"); } XmCostNlabor xmCostNlabor = fromMap(xmCostNlaborMap,XmCostNlabor.class); List xmCostNlaborsDb=xmCostNlaborService.selectListByIds(ids); if(xmCostNlaborsDb==null ||xmCostNlaborsDb.size()==0){ - return failed("data-0","记录已不存在"); + return Result.error("data-0","记录已不存在"); } List can=new ArrayList<>(); List no=new ArrayList<>(); @@ -199,12 +199,10 @@ public class XmCostNlaborController { msgs.add(String.format("以下%s个数据无权限更新",no.size())); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } - // - return Result.ok(); } @@ -218,7 +216,7 @@ public class XmCostNlaborController { if(xmCostNlabors.size()<=0){ - return failed("data-0","请上送待删除数据列表"); + return Result.error("data-0","请上送待删除数据列表"); } List datasDb=xmCostNlaborService.selectListByIds(xmCostNlabors.stream().map(i-> i.getId() ).collect(Collectors.toList())); @@ -241,19 +239,11 @@ public class XmCostNlaborController { msgs.add(String.format("以下%s条数据不能删除.【%s】",no.size(),no.stream().map(i-> i.getId() ).collect(Collectors.joining(",")))); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } - }catch (BizException e) { - tips=e.getTips(); - logger.error("",e); - }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); - logger.error("",e); - } - m.put("tips", tips); - return m; + } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmEnvListController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmEnvListController.java index 0388edfc..46b688ae 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmEnvListController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmEnvListController.java @@ -235,7 +235,7 @@ public class XmEnvListController { tips=e.getTips(); logger.error("执行异常",e); }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); + return Result.error(e.getMessage()); logger.error("执行异常",e); } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmFuncController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmFuncController.java index 7a0eb794..e4b1afc8 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmFuncController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmFuncController.java @@ -99,21 +99,21 @@ public class XmFuncController { } if(createPk==false){ if(xmFuncService.selectOneObject(xmFunc) !=null ){ - return failed("pk-exists","编号重复，请修改编号再提交"); + return Result.error("pk-exists","编号重复，请修改编号再提交"); } } Set words=sensitiveWordService.getSensitiveWord(xmFunc.getName()); if(words!=null && words.size()>0){ - return failed("name-sensitive-word","名字有敏感词"+words+",请修改后再提交"); + return Result.error("name-sensitive-word","名字有敏感词"+words+",请修改后再提交"); } if(!StringUtils.hasText(xmFunc.getProductId())){ - return failed("productId-0","产品编号不能为空"); + return Result.error("productId-0","产品编号不能为空"); } User user=LoginUtils.getCurrentUserInfo(); XmProduct xmProduct=xmProductService.getProductFromCache(xmFunc.getProductId()); tips=productQxService.checkProductQx(xmProduct,2,user); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } xmFunc.setPbranchId(xmProduct.getBranchId()); xmFuncService.parentIdPathsCalcBeforeSave(xmFunc); @@ -129,15 +129,15 @@ public class XmFuncController { public Result delXmFunc(@RequestBody XmFunc xmFunc){ if(!StringUtils.hasText(xmFunc.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmFunc xmFuncDb = xmFuncService.selectOneObject(xmFunc); if( xmFuncDb == null ){ - return failed("data-not-exists","数据不存在，无法删除"); + return Result.error("data-not-exists","数据不存在，无法删除"); } Long childcnt=xmFuncService.countByWhere(map("pid",xmFuncDb.getId())); if(childcnt>0){ - return failed("childcnt-not-0","至少还有"+childcnt+"个子节点,请先删除子节点，再删除父节点"); + return Result.error("childcnt-not-0","至少还有"+childcnt+"个子节点,请先删除子节点，再删除父节点"); } xmFuncService.deleteByPk(xmFunc); return Result.ok(); @@ -152,11 +152,11 @@ public class XmFuncController { public Result editXmFunc(@RequestBody XmFunc xmFunc) { if(!StringUtils.hasText(xmFunc.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmFunc xmFuncDb = xmFuncService.selectOneObject(xmFunc); if( xmFuncDb == null ){ - return failed("data-not-exists","数据不存在，无法修改"); + return Result.error("data-not-exists","数据不存在，无法修改"); } xmFuncService.updateSomeFieldByPk(xmFunc); @@ -172,7 +172,7 @@ public class XmFuncController { List ids= (List) xmFuncMap.get("ids"); if(ids==null || ids.size()==0){ - return failed("ids-0","ids不能为空"); + return Result.error("ids-0","ids不能为空"); } Set fields=new HashSet<>(); @@ -180,19 +180,19 @@ public class XmFuncController { fields.add("pidPaths"); for (String fieldName : xmFuncMap.keySet()) { if(fields.contains(fieldName)){ - return failed(fieldName+"-no-edit",fieldName+"不允许修改"); + return Result.error(fieldName+"-no-edit",fieldName+"不允许修改"); } } Set fieldKey=xmFuncMap.keySet().stream().filter(i-> fieldsMap.containsKey(i)).collect(Collectors.toSet()); fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmFuncMap.get(i) )).collect(Collectors.toSet()); if(fieldKey.size()<=0) { - return failed("fieldKey-0","没有需要更新的字段"); + return Result.error("fieldKey-0","没有需要更新的字段"); } XmFunc xmFunc = fromMap(xmFuncMap,XmFunc.class); List xmFuncsDb=xmFuncService.selectListByIds(ids); if(xmFuncsDb==null ||xmFuncsDb.size()==0){ - return failed("data-0","记录已不存在"); + return Result.error("data-0","记录已不存在"); } List can=new ArrayList<>(); List no=new ArrayList<>(); @@ -208,7 +208,7 @@ public class XmFuncController { if(can.size()>0){ if(xmFuncMap.containsKey("pid")){ if(can.size()>1){ - return failed("pid-1","修改上级归属只能一个个节点修改，不能批量修改"); + return Result.error("pid-1","修改上级归属只能一个个节点修改，不能批量修改"); } xmFuncService.parentIdPathsCalcBeforeSave(can.get(0)); xmFuncMap.put("pidPaths",can.get(0).getPidPaths()); @@ -224,9 +224,9 @@ public class XmFuncController { msgs.add(String.format("以下%s个数据无权限更新",no.size())); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } // return Result.ok(); @@ -243,7 +243,7 @@ public class XmFuncController { if(xmFuncs.size()<=0){ - return failed("data-0","请上送待删除数据列表"); + return Result.error("data-0","请上送待删除数据列表"); } List datasDb=xmFuncService.selectListByIds(xmFuncs.stream().map(i-> i.getId() ).collect(Collectors.toList())); @@ -266,19 +266,12 @@ public class XmFuncController { msgs.add(String.format("以下%s条数据不能删除.【%s】",no.size(),no.stream().map(i-> i.getId() ).collect(Collectors.joining(",")))); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } - }catch (BizException e) { - tips=e.getTips(); - logger.error("",e); - }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); - logger.error("",e); - } - m.put("tips", tips); - return m; + return Result.ok(); + } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmGroupController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupController.java index 2a333278..f2f72ea9 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmGroupController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupController.java @@ -92,7 +92,7 @@ public class XmGroupController { if(group==null){ - tips.setFailureMsg("小组信息不能为空"); + return Result.error("小组信息不能为空"); m.put("tips", tips); return m; } @@ -306,7 +306,7 @@ public class XmGroupController { } else { XmGroup xmGroupQuery = new XmGroup(xmGroup.getId()); if (xmGroupService.countByWhere(xmGroupQuery) > 0) { - tips.setFailureMsg("编号重复，请修改编号再提交"); + return Result.error("编号重复，请修改编号再提交"); m.put("tips", tips); return m; } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmGroupStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupStateController.java index 0a4d40d6..1f474117 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmGroupStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupStateController.java @@ -93,7 +93,7 @@ public class XmGroupStateController { }else{ XmProjectGroupState xmGroupStateQuery = new XmProjectGroupState(xmGroupState.getId()); if(xmGroupStateService.countByWhere(xmGroupStateQuery)>0){ - tips.setFailureMsg("编号重复，请修改编号再提交"); + return Result.error("编号重复，请修改编号再提交"); m.put("tips", tips); return m; } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java index 0a777df5..eb3df4fa 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java @@ -160,7 +160,7 @@ public class XmGroupUserController { } if(xmGroupUserService.countByWhere(gu)>0){ - tips.setFailureMsg("该用户已在小组中"); + return Result.error("该用户已在小组中"); m.put("tips", tips); return m; } @@ -456,9 +456,9 @@ public class XmGroupUserController { msg.add("以下"+gusDb.size()+"个小组用户已在组里，无需再添加。【"+gusDb.stream().map(i->i.getUsername()).collect(Collectors.joining(","))+"】"); } if(canAddUsers.size()!=0){ - tips.setOkMsg(msg.stream().collect(Collectors.joining(" "))); + return Result.ok(msg.stream().collect(Collectors.joining(" "))); }else{ - tips.setFailureMsg(msg.stream().collect(Collectors.joining(" "))); + return Result.error(msg.stream().collect(Collectors.joining(" "))); } groupUsersMap.forEach((groupId,groupUsers)->{ @@ -573,9 +573,9 @@ public class XmGroupUserController { msg.add("以下"+noDelUsers.size()+"个小组用户无权限删除。【"+noDelUsers.stream().collect(Collectors.toSet()).stream().collect(Collectors.joining(","))+"】"); } if(canDelUsers.size()!=0){ - tips.setOkMsg(msg.stream().collect(Collectors.joining(" "))); + return Result.ok(msg.stream().collect(Collectors.joining(" "))); }else{ - tips.setFailureMsg(msg.stream().collect(Collectors.joining(" "))); + return Result.error(msg.stream().collect(Collectors.joining(" "))); } groupUsersMap.forEach((groupId,groupUsers)->{ diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java index d8f8eebe..8bbf3c14 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java @@ -187,11 +187,11 @@ public class XmIterationController { Set words=sensitiveWordService.getSensitiveWord(xmIteration.getIterationName()); if(words!=null && words.size()>0){ - return failed("name-sensitive-word","名字有敏感词"+words+",请修改后再提交"); + return Result.error("name-sensitive-word","名字有敏感词"+words+",请修改后再提交"); } words=sensitiveWordService.getSensitiveWord(xmIteration.getRemark()); if(words!=null && words.size()>0){ - return failed("remark-sensitive-word","备注中有敏感词"+words+",请修改后再提交"); + return Result.error("remark-sensitive-word","备注中有敏感词"+words+",请修改后再提交"); } q.setBranchId(user.getBranchId()); Long count=this.xmIterationService.countByWhere(q); @@ -205,7 +205,7 @@ public class XmIterationController { XmProduct xmProductDb=xmProductService.getProductFromCache(xmIteration.getProductId()); tips=productQxService.checkProductQx(xmProductDb,3,user); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } xmIteration.setBranchId(xmProductDb.getBranchId()); @@ -218,7 +218,7 @@ public class XmIterationController { if( !isPm ){ tips = productQxService.checkProductQx(xmProductDb,3,user,xmIteration.getAdminUserid(),xmIteration.getAdminUsername(),null); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } } } @@ -243,11 +243,11 @@ public class XmIterationController { public Result delXmIteration(@RequestBody XmIteration xmIteration){ if(!StringUtils.hasText(xmIteration.getId())){ - return failed("id-0","请上送迭代编号"); + return Result.error("id-0","请上送迭代编号"); } XmIteration iterationDb=this.xmIterationService.selectOneById(xmIteration.getId()); if(iterationDb==null){ - return failed("data-0","迭代不存在"); + return Result.error("data-0","迭代不存在"); } User user=LoginUtils.getCurrentUserInfo(); XmProduct xmProductDb=xmProductService.getProductFromCache(iterationDb.getProductId()); @@ -255,7 +255,7 @@ public class XmIterationController { if( !isPm ){ tips = productQxService.checkProductQx(xmProductDb,3,user,iterationDb.getAdminUserid(),iterationDb.getAdminUsername(),null); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } } @@ -278,11 +278,11 @@ public class XmIterationController { public Result editXmIteration(@RequestBody XmIteration xmIteration) { if(!StringUtils.hasText(xmIteration.getId())){ - return failed("id-0","请上送迭代编号"); + return Result.error("id-0","请上送迭代编号"); } XmIteration iterationDb=this.xmIterationService.selectOneById(xmIteration.getId()); if(iterationDb==null){ - return failed("data-0","迭代不存在"); + return Result.error("data-0","迭代不存在"); } User user=LoginUtils.getCurrentUserInfo(); XmProduct xmProductDb=xmProductService.getProductFromCache(iterationDb.getProductId()); @@ -290,7 +290,7 @@ public class XmIterationController { if( !isPm ){ tips = productQxService.checkProductQx(xmProductDb,3,user,iterationDb.getAdminUserid(),iterationDb.getAdminUsername(),null); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } } xmIteration.setAdminUserid(null);//不允许更改负责人 @@ -310,26 +310,26 @@ public class XmIterationController { List ids= (List) xmIterationMap.get("ids"); if(ids==null || ids.size()==0){ - return failed("ids-0","ids不能为空"); + return Result.error("ids-0","ids不能为空"); } Set fields=new HashSet<>(); fields.add("id"); for (String fieldName : xmIterationMap.keySet()) { if(fields.contains(fieldName)){ - return failed(fieldName+"-no-edit",fieldName+"不允许修改"); + return Result.error(fieldName+"-no-edit",fieldName+"不允许修改"); } } Set fieldKey=xmIterationMap.keySet().stream().filter(i-> fieldsMap.containsKey(i)).collect(Collectors.toSet()); fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmIterationMap.get(i) )).collect(Collectors.toSet()); if(fieldKey.size()<=0) { - return failed("fieldKey-0","没有需要更新的字段"); + return Result.error("fieldKey-0","没有需要更新的字段"); } XmIteration xmIteration = fromMap(xmIterationMap,XmIteration.class); List xmIterationsDb=xmIterationService.selectListByIds(ids); if(xmIterationsDb==null ||xmIterationsDb.size()==0){ - return failed("data-0","记录已不存在"); + return Result.error("data-0","记录已不存在"); } @@ -339,7 +339,7 @@ public class XmIterationController { User user = LoginUtils.getCurrentUserInfo(); XmIteration iterationDb=xmIterationsDb.get(0); if(xmIterationsDb.stream().filter(k->!k.getProductId().equals(iterationDb.getProductId())).findAny().isPresent()){ - return failed("data-0","批量修改只能修改同一个产品下的迭代记录"); + return Result.error("data-0","批量修改只能修改同一个产品下的迭代记录"); } XmProduct xmProductDb=xmProductService.getProductFromCache(iterationDb.getProductId()); @@ -350,7 +350,7 @@ public class XmIterationController { if(StringUtils.hasText(adminUserid)){ tips=productQxService.checkProductQx(xmProductDb,3,user,adminUserid,adminUsername,null); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } } } @@ -391,9 +391,9 @@ public class XmIterationController { msgs.add(String.format("以下%s个数据无权限更新，原因【%s】",no.size(),noTipsMap.keySet().stream().collect(Collectors.joining(";")))); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } // return Result.ok(); @@ -405,14 +405,14 @@ public class XmIterationController { public Result loadTasksToXmIterationState(@RequestBody XmIteration xmIteration) { if(!StringUtils.hasText(xmIteration.getId())){ - return failed("id-0","请上送迭代编号"); + return Result.error("id-0","请上送迭代编号"); } if(xmIteration==null || StringUtils.isEmpty(xmIteration.getId())) { - tips.setFailureMsg("请输入迭代编号id"); + return Result.error("请输入迭代编号id"); }else { XmIteration iterationDb=this.xmIterationService.selectOneObject(xmIteration); if(iterationDb==null){ - return failed("data-0","迭代不存在"); + return Result.error("data-0","迭代不存在"); } xmIterationService.loadTasksToXmIterationState(xmIteration.getId()); xmRecordService.addXmIterationRecord(xmIteration.getId(),"迭代-汇总","汇总计算迭代数据"+iterationDb.getIterationName()); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java index 369cf0b4..1001f370 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java @@ -142,9 +142,9 @@ public class XmIterationMenuController { msgs.add("有"+notJoins.size()+"个用户故事未加入迭代，无需移出。【"+notJoins.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】"); } if(canDels.size()==0){ - tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" "))); + return Result.error(msgs.stream().collect(Collectors.joining(" "))); }else { - tips.setOkMsg(msgs.stream().collect(Collectors.joining(" "))); + return Result.ok(msgs.stream().collect(Collectors.joining(" "))); } return Result.ok(); @@ -214,9 +214,9 @@ public class XmIterationMenuController { msgs.add("有"+ntype1.size()+"个为史诗/特性，不用加入迭代。【"+ntype1.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】"); } if(canAdds.size()==0){ - tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" "))); + return Result.error(msgs.stream().collect(Collectors.joining(" "))); }else { - tips.setOkMsg(msgs.stream().collect(Collectors.joining(" "))); + return Result.ok(msgs.stream().collect(Collectors.joining(" "))); } return Result.ok(); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationStateController.java index 02f17d53..d1f266e4 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationStateController.java @@ -120,7 +120,7 @@ public class XmIterationStateController { }else{ XmIterationState xmIterationStateQuery = new XmIterationState(xmIterationState.getId()); if(xmIterationStateService.countByWhere(xmIterationStateQuery)>0){ - tips.setFailureMsg("编号重复，请修改编号再提交"); + return Result.error("编号重复，请修改编号再提交"); m.put("tips", tips); return m; } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationStateHisController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationStateHisController.java index 76777d60..3c3fb5c0 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationStateHisController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationStateHisController.java @@ -84,7 +84,7 @@ public class XmIterationStateHisController { } if(createPk==false){ if(xmIterationStateHisService.selectOneObject(xmIterationStateHis) !=null ){ - return failed("pk-exists","编号重复，请修改编号再提交"); + return Result.error("pk-exists","编号重复，请修改编号再提交"); } } xmIterationStateHisService.insert(xmIterationStateHis); @@ -101,14 +101,14 @@ public class XmIterationStateHisController { public Result delXmIterationStateHis(@RequestBody XmIterationStateHis xmIterationStateHis){ if(!StringUtils.hasText(xmIterationStateHis.getIterationId())) { - return failed("pk-not-exists","请上送主键参数iterationId"); + return Result.error("pk-not-exists","请上送主键参数iterationId"); } if(!StringUtils.hasText(xmIterationStateHis.getBizDate())) { - return failed("pk-not-exists","请上送主键参数bizDate"); + return Result.error("pk-not-exists","请上送主键参数bizDate"); } XmIterationStateHis xmIterationStateHisDb = xmIterationStateHisService.selectOneObject(xmIterationStateHis); if( xmIterationStateHisDb == null ){ - return failed("data-not-exists","数据不存在，无法删除"); + return Result.error("data-not-exists","数据不存在，无法删除"); } xmIterationStateHisService.deleteByPk(xmIterationStateHis); return Result.ok(); @@ -125,14 +125,14 @@ public class XmIterationStateHisController { public Result editXmIterationStateHis(@RequestBody XmIterationStateHis xmIterationStateHis) { if(!StringUtils.hasText(xmIterationStateHis.getIterationId())) { - return failed("pk-not-exists","请上送主键参数iterationId"); + return Result.error("pk-not-exists","请上送主键参数iterationId"); } if(!StringUtils.hasText(xmIterationStateHis.getBizDate())) { - return failed("pk-not-exists","请上送主键参数bizDate"); + return Result.error("pk-not-exists","请上送主键参数bizDate"); } XmIterationStateHis xmIterationStateHisDb = xmIterationStateHisService.selectOneObject(xmIterationStateHis); if( xmIterationStateHisDb == null ){ - return failed("data-not-exists","数据不存在，无法修改"); + return Result.error("data-not-exists","数据不存在，无法修改"); } xmIterationStateHisService.updateSomeFieldByPk(xmIterationStateHis); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuCommentController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuCommentController.java index 3ec8fdf7..d044aa5c 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuCommentController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuCommentController.java @@ -128,7 +128,7 @@ public class XmMenuCommentController { tips=e.getTips(); logger.error("执行异常",e); }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); + return Result.error(e.getMessage()); logger.error("执行异常",e); } @@ -162,7 +162,7 @@ public class XmMenuCommentController { tips=e.getTips(); logger.error("执行异常",e); }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); + return Result.error(e.getMessage()); logger.error("执行异常",e); } @@ -183,7 +183,7 @@ public class XmMenuCommentController { tips=e.getTips(); logger.error("执行异常",e); }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); + return Result.error(e.getMessage()); logger.error("执行异常",e); } @@ -216,7 +216,7 @@ public class XmMenuCommentController { tips=e.getTips(); logger.error("执行异常",e); }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); + return Result.error(e.getMessage()); logger.error("执行异常",e); } @@ -249,7 +249,7 @@ public class XmMenuCommentController { tips=e.getTips(); logger.error("执行异常",e); }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); + return Result.error(e.getMessage()); logger.error("执行异常",e); } @@ -270,7 +270,7 @@ public class XmMenuCommentController { } if(createPk==false){ if(xmMenuCommentService.selectOneObject(xmMenuComment) !=null ){ - return failed("pk-exists","编号重复，请修改编号再提交"); + return Result.error("pk-exists","编号重复，请修改编号再提交"); } } xmMenuCommentService.insert(xmMenuComment); @@ -287,11 +287,11 @@ public class XmMenuCommentController { public Result delXmMenuComment(@RequestBody XmMenuComment xmMenuComment){ if(!StringUtils.hasText(xmMenuComment.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmMenuComment xmMenuCommentDb = xmMenuCommentService.selectOneObject(xmMenuComment); if( xmMenuCommentDb == null ){ - return failed("data-not-exists","数据不存在，无法删除"); + return Result.error("data-not-exists","数据不存在，无法删除"); } xmMenuCommentService.deleteByPk(xmMenuComment); return Result.ok(); @@ -308,11 +308,11 @@ public class XmMenuCommentController { public Result editXmMenuComment(@RequestBody XmMenuComment xmMenuComment) { if(!StringUtils.hasText(xmMenuComment.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmMenuComment xmMenuCommentDb = xmMenuCommentService.selectOneObject(xmMenuComment); if( xmMenuCommentDb == null ){ - return failed("data-not-exists","数据不存在，无法修改"); + return Result.error("data-not-exists","数据不存在，无法修改"); } xmMenuCommentService.updateSomeFieldByPk(xmMenuComment); @@ -330,26 +330,26 @@ public class XmMenuCommentController { List ids= (List) xmMenuCommentMap.get("ids"); if(ids==null || ids.size()==0){ - return failed("ids-0","ids不能为空"); + return Result.error("ids-0","ids不能为空"); } Set fields=new HashSet<>(); fields.add("id"); for (String fieldName : xmMenuCommentMap.keySet()) { if(fields.contains(fieldName)){ - return failed(fieldName+"-no-edit",fieldName+"不允许修改"); + return Result.error(fieldName+"-no-edit",fieldName+"不允许修改"); } } Set fieldKey=xmMenuCommentMap.keySet().stream().filter(i-> fieldsMap.containsKey(i)).collect(Collectors.toSet()); fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmMenuCommentMap.get(i) )).collect(Collectors.toSet()); if(fieldKey.size()<=0) { - return failed("fieldKey-0","没有需要更新的字段"); + return Result.error("fieldKey-0","没有需要更新的字段"); } XmMenuComment xmMenuComment = fromMap(xmMenuCommentMap,XmMenuComment.class); List xmMenuCommentsDb=xmMenuCommentService.selectListByIds(ids); if(xmMenuCommentsDb==null ||xmMenuCommentsDb.size()==0){ - return failed("data-0","记录已不存在"); + return Result.error("data-0","记录已不存在"); } List can=new ArrayList<>(); List no=new ArrayList<>(); @@ -374,9 +374,9 @@ public class XmMenuCommentController { msgs.add(String.format("以下%s个数据无权限更新",no.size())); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } // return Result.ok(); @@ -395,7 +395,7 @@ public class XmMenuCommentController { if(xmMenuComments.size()<=0){ - return failed("data-0","请上送待删除数据列表"); + return Result.error("data-0","请上送待删除数据列表"); } List datasDb=xmMenuCommentService.selectListByIds(xmMenuComments.stream().map(i-> i.getId() ).collect(Collectors.toList())); @@ -418,19 +418,12 @@ public class XmMenuCommentController { msgs.add(String.format("以下%s条数据不能删除.【%s】",no.size(),no.stream().map(i-> i.getId() ).collect(Collectors.joining(",")))); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } - }catch (BizException e) { - tips=e.getTips(); - logger.error("",e); - }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); - logger.error("",e); - } - m.put("tips", tips); - return m; + return Result.ok(); + } */ } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java index a56e18c0..e35e613f 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java @@ -239,25 +239,25 @@ public class XmMenuController { }else{ XmMenu xmMenuQuery = new XmMenu(xmMenu.getMenuId()); if(xmMenuService.countByWhere(xmMenuQuery)>0){ - tips.setFailureMsg("编号重复，请修改编号再提交"); + return Result.error("编号重复，请修改编号再提交"); m.put("tips", tips); return m; } } Set words=sensitiveWordService.getSensitiveWord(xmMenu.getMenuName()); if(words!=null && words.size()>0){ - return failed("name-sensitive-word","名字有敏感词"+words+",请修改后再提交"); + return Result.error("name-sensitive-word","名字有敏感词"+words+",请修改后再提交"); } words=sensitiveWordService.getSensitiveWord(xmMenu.getRemark()); if(words!=null && words.size()>0){ - return failed("remark-sensitive-word","备注中有敏感词"+words+",请修改后再提交"); + return Result.error("remark-sensitive-word","备注中有敏感词"+words+",请修改后再提交"); } if(!StringUtils.hasText(xmMenu.getMenuName())){ - return failed("menuName-0","需求名称不能为空"); + return Result.error("menuName-0","需求名称不能为空"); } if(!StringUtils.hasText(xmMenu.getProductId())){ - return failed("productId-0","需求归属产品不能为空"); + return Result.error("productId-0","需求归属产品不能为空"); } User user= LoginUtils.getCurrentUserInfo(); if(StringUtils.isEmpty(xmMenu.getMmUserid())) { @@ -276,12 +276,12 @@ public class XmMenuController { } tips=productQxService.checkProductQx(xmProduct,2,user); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } if(StringUtils.hasText(xmMenu.getMmUserid()) && !xmMenu.getMmUserid().equals(user.getUserid())){ tips=productQxService.checkProductQx(xmProduct,2,user,xmMenu.getMmUserid(),xmMenu.getMmUsername(),null); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } } @@ -328,7 +328,7 @@ public class XmMenuController { xmTask.setMenuId(xmMenu.getMenuId()); long taskCount=xmTaskService.countByWhere(xmTask); if(taskCount>0) { - tips.setFailureMsg("存在"+taskCount+"个任务关联该需求，不允许删除"); + return Result.error("存在"+taskCount+"个任务关联该需求，不允许删除"); return ResponseHelper.failed(tips); }else { XmMenu xmMenuDb=this.xmMenuService.selectOneById(xmMenu.getMenuId()); @@ -348,7 +348,7 @@ public class XmMenuController { if(!groupService.checkUserIsProductAdm(xmProduct, user.getUserid())){ tips=productQxService.checkProductQx(xmProduct,2,user,xmMenuDb.getMmUserid(),xmMenuDb.getMmUsername(),null); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } } @@ -381,7 +381,7 @@ public class XmMenuController { } tips=productQxService.checkProductQx(xmProduct,2,user,xmMenuDb.getMmUserid(),xmMenuDb.getMmUsername(),null); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } if("1".equals(xmMenuDb.getNtype())){ @@ -451,7 +451,7 @@ public class XmMenuController { tips=productQxService.checkProductQx(xmProduct,2,user); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } if(xmMenuMap.containsKey("mmUserid")){ String mmUserid= (String) xmMenuMap.get("mmUserid"); @@ -459,7 +459,7 @@ public class XmMenuController { if(!user.getUserid().equals(mmUserid)){ tips=productQxService.checkProductQx(xmProduct,2,user,mmUserid,mmUsername,null); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } } } @@ -514,9 +514,9 @@ public class XmMenuController { msgs.add(String.format("其中%s个需求，无权限修改。原因【%s】",noOper.size(),noOperTips.keySet().stream().collect(Collectors.joining(";")))); } if(canOper.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else{ - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } // return Result.ok(); @@ -601,9 +601,9 @@ public class XmMenuController { msgs.add(String.format("其中%s个需求，存在子需求，不能删除。分别是【%s】",hasChildMenus.size(),hasChildMenus.stream().collect(Collectors.joining(",")))); } if(canDelList.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else{ - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); @@ -624,12 +624,12 @@ public class XmMenuController { this.xmMenuService.doBatchInsert(canEdit); xmRecordService.addXmMenuRecord(canEdit,"批量新增产品需求","批量新增产品需求"); }else{ - tips.setFailureMsg("您无权限新增需求。"); + return Result.error("您无权限新增需求。"); } }else { - tips.setFailureMsg("没有数据可以新增，请上送数据"); + return Result.error("没有数据可以新增，请上送数据"); } } @@ -647,7 +647,7 @@ public class XmMenuController { User user=LoginUtils.getCurrentUserInfo(); if(parentMenuVo.getMenuIds()==null || parentMenuVo.getMenuIds().size()==0){ - tips.setFailureMsg("需求列表不能为空"); + return Result.error("需求列表不能为空"); m.put("tips", tips); ResponseHelper.failed("menuIds-0", "需求列表编号不能为空"); } @@ -751,9 +751,9 @@ public class XmMenuController { msgs.add("以下"+sameParentMenus.size()+"个需求已属于【"+parentDb.getMenuName()+"】之下，无需变更，【"+sameParentMenus.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】"); } if(allowMenusDbMap3.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining(" "))); + return Result.ok(msgs.stream().collect(Collectors.joining(" "))); }else{ - tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" "))); + return Result.error(msgs.stream().collect(Collectors.joining(" "))); } return Result.ok(); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java index ecc1becc..d4003e67 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java @@ -125,7 +125,7 @@ public class XmMenuPlanController { public Result addXmMenuPlan(@RequestBody XmMenuPlan xmMenuPlan) { if(xmMenuPlanService.countByWhere(xmMenuPlan)>0){ - tips.setFailureMsg("编号重复，请修改编号再提交"); + return Result.error("编号重复，请修改编号再提交"); m.put("tips", tips); return m; } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuStateController.java index c7a8fba7..b06e1d14 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuStateController.java @@ -121,7 +121,7 @@ public class XmMenuStateController { public Result addXmMenuState(@RequestBody XmMenuState xmMenuState) { if(xmMenuStateService.countByWhere(xmMenuState)>0){ - tips.setFailureMsg("编号重复，请修改编号再提交"); + return Result.error("编号重复，请修改编号再提交"); m.put("tips", tips); return m; } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMyFocusController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMyFocusController.java index ec7058b6..43f9f719 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmMyFocusController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMyFocusController.java @@ -104,19 +104,19 @@ public class XmMyFocusController { User user = LoginUtils.getCurrentUserInfo(); if(!StringUtils.hasText(xmMyFocus.getBizId())) { - return failed("bizId","业务编号不能为空"); + return Result.error("bizId","业务编号不能为空"); } if(!StringUtils.hasText(xmMyFocus.getPbizId())) { - return failed("pbizId","上级编号不能为空"); + return Result.error("pbizId","上级编号不能为空"); } if(!StringUtils.hasText(xmMyFocus.getFocusType())) { - return failed("focusType","关注类型不能为空"); + return Result.error("focusType","关注类型不能为空"); } xmMyFocus.setUserid(user.getUserid()); xmMyFocus.setUsername(user.getUsername()); xmMyFocus.setUbranchId(user.getBranchId()); if(xmMyFocusService.selectOneObject(xmMyFocus) !=null ){ - return failed("pk-exists","已关注"); + return Result.error("pk-exists","已关注"); } xmMyFocusService.focus(xmMyFocus); @@ -133,15 +133,15 @@ public class XmMyFocusController { User user = LoginUtils.getCurrentUserInfo(); if(!StringUtils.hasText(xmMyFocus.getBizId())) { - return failed("pk-not-exists","请上送主键参数bizId"); + return Result.error("pk-not-exists","请上送主键参数bizId"); } if(!StringUtils.hasText(xmMyFocus.getPbizId())) { - return failed("pk-not-exists","请上送主键参数pbizId"); + return Result.error("pk-not-exists","请上送主键参数pbizId"); } xmMyFocus.setUserid(user.getUserid()); XmMyFocus xmMyFocusDb = xmMyFocusService.selectOneObject(xmMyFocus); if( xmMyFocusDb == null ){ - return failed("data-not-exists","数据不存在，无法删除"); + return Result.error("data-not-exists","数据不存在，无法删除"); } xmMyFocusService.unfocus(xmMyFocusDb); return Result.ok(); @@ -157,17 +157,17 @@ public class XmMyFocusController { public Result editXmMyFocus(@RequestBody XmMyFocus xmMyFocus) { if(!StringUtils.hasText(xmMyFocus.getUserid())) { - return failed("pk-not-exists","请上送主键参数userid"); + return Result.error("pk-not-exists","请上送主键参数userid"); } if(!StringUtils.hasText(xmMyFocus.getBizId())) { - return failed("pk-not-exists","请上送主键参数bizId"); + return Result.error("pk-not-exists","请上送主键参数bizId"); } if(!StringUtils.hasText(xmMyFocus.getPbizId())) { - return failed("pk-not-exists","请上送主键参数pbizId"); + return Result.error("pk-not-exists","请上送主键参数pbizId"); } XmMyFocus xmMyFocusDb = xmMyFocusService.selectOneObject(xmMyFocus); if( xmMyFocusDb == null ){ - return failed("data-not-exists","数据不存在，无法修改"); + return Result.error("data-not-exists","数据不存在，无法修改"); } xmMyFocusService.updateSomeFieldByPk(xmMyFocus); @@ -185,7 +185,7 @@ public class XmMyFocusController { List> pkList= (List>) xmMyFocusMap.get("pkList"); if(pkList==null || pkList.size()==0){ - return failed("pkList-0","pkList不能为空"); + return Result.error("pkList-0","pkList不能为空"); } Set fields=new HashSet<>(); @@ -194,19 +194,19 @@ public class XmMyFocusController { fields.add("pbizId"); for (String fieldName : xmMyFocusMap.keySet()) { if(fields.contains(fieldName)){ - return failed(fieldName+"-no-edit",fieldName+"不允许修改"); + return Result.error(fieldName+"-no-edit",fieldName+"不允许修改"); } } Set fieldKey=xmMyFocusMap.keySet().stream().filter(i-> fieldsMap.containsKey(i)).collect(Collectors.toSet()); fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmMyFocusMap.get(i) )).collect(Collectors.toSet()); if(fieldKey.size()<=0) { - return failed("fieldKey-0","没有需要更新的字段"); + return Result.error("fieldKey-0","没有需要更新的字段"); } XmMyFocus xmMyFocus = fromMap(xmMyFocusMap,XmMyFocus.class); List xmMyFocussDb=xmMyFocusService.selectListByIds(pkList); if(xmMyFocussDb==null ||xmMyFocussDb.size()==0){ - return failed("data-0","记录已不存在"); + return Result.error("data-0","记录已不存在"); } List can=new ArrayList<>(); List no=new ArrayList<>(); @@ -231,9 +231,9 @@ public class XmMyFocusController { msgs.add(String.format("以下%s个数据无权限更新",no.size())); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } // return Result.ok(); @@ -251,7 +251,7 @@ public class XmMyFocusController { if(xmMyFocuss.size()<=0){ - return failed("data-0","请上送待删除数据列表"); + return Result.error("data-0","请上送待删除数据列表"); } List datasDb=xmMyFocusService.selectListByIds(xmMyFocuss.stream().map(i->map( "userid",i.getUserid() , "bizId",i.getBizId() , "pbizId",i.getPbizId() )).collect(Collectors.toList())); @@ -274,18 +274,11 @@ public class XmMyFocusController { msgs.add(String.format("以下%s条数据不能删除.【%s】",no.size(),no.stream().map(i-> i.getUserid() +" "+ i.getBizId() +" "+ i.getPbizId() ).collect(Collectors.joining(",")))); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } - }catch (BizException e) { - tips=e.getTips(); - logger.error("",e); - }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); - logger.error("",e); - } - m.put("tips", tips); - return m; + return Result.ok(); + } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java index 8eacf6d0..c46b1eec 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java @@ -111,7 +111,7 @@ public class XmProductController { params.put("compete",user.getUserid()); }else if("productId".equals(queryScope)){ if(!StringUtils.hasText(id)){ - tips.setFailureMsg("产品编号id必输"); + return Result.error("产品编号id必输"); m.put("tips", tips); return m; } @@ -165,7 +165,7 @@ public class XmProductController { params.put("compete",user.getUserid()); }else if("productId".equals(queryScope)){ if(!StringUtils.hasText(id)){ - tips.setFailureMsg("产品编号id必输"); + return Result.error("产品编号id必输"); m.put("tips", tips); return m; } @@ -195,10 +195,10 @@ public class XmProductController { User user= LoginUtils.getCurrentUserInfo(); if( !StringUtils.hasText(xmProduct.getId())){ - return failed("id-0","请上送原产品编号参数id"); + return Result.error("id-0","请上送原产品编号参数id"); } if( !StringUtils.hasText(xmProduct.getProductName())){ - return failed("productName-0","请上送新产品名称"); + return Result.error("productName-0","请上送新产品名称"); } if(StringUtils.hasText(xmProduct.getCode())){ XmProduct pq=new XmProduct(); @@ -206,7 +206,7 @@ public class XmProductController { pq.setCode(xmProduct.getCode()); List xmProductList=this.xmProductService.selectListByWhere(pq); if(xmProductList!=null && xmProductList.size()>0){ - return failed("code-exists","产品编码【"+xmProduct.getCode()+"】已存在，，请重新输入新的产品编码，如果为空，后台自动生成"); + return Result.error("code-exists","产品编码【"+xmProduct.getCode()+"】已存在，，请重新输入新的产品编码，如果为空，后台自动生成"); } } @@ -229,13 +229,13 @@ public class XmProductController { User user=LoginUtils.getCurrentUserInfo(); if(StringUtils.isEmpty(xmProduct.getCode())) { - return failed("code-0","","产品代号不能为空"); + return Result.error("code-0","","产品代号不能为空"); }else{ XmProduct xmProductQuery = new XmProduct(); xmProductQuery.setBranchId(user.getBranchId()); xmProductQuery.setCode(xmProduct.getCode()); if(xmProductService.countByWhere(xmProductQuery)>0){ - tips.setFailureMsg("产品代号已存在，请修改再提交"); + return Result.error("产品代号已存在，请修改再提交"); m.put("tips", tips); return m; } @@ -243,21 +243,21 @@ public class XmProductController { if(xmProduct.getLinks()!=null && xmProduct.getLinks().size()>0){ for (XmProductProjectLink link : xmProduct.getLinks()) { if(!StringUtils.hasText(link.getProjectId())) { - return failed("projectId-0", "", "关联产品编号不能为空"); + return Result.error("projectId-0", "", "关联产品编号不能为空"); } } } if(!StringUtils.hasText(xmProduct.getProductName())){ - return failed("productName-0","","产品名称不能为空"); + return Result.error("productName-0","","产品名称不能为空"); } Set words=sensitiveWordService.getSensitiveWord(xmProduct.getProductName()); if(words!=null && words.size()>0){ - return failed("name-sensitive-word","名字有敏感词"+words+",请修改后再提交"); + return Result.error("name-sensitive-word","名字有敏感词"+words+",请修改后再提交"); } words=sensitiveWordService.getSensitiveWord(xmProduct.getRemark()); if(words!=null && words.size()>0){ - return failed("remark-sensitive-word","备注中有敏感词"+words+",请修改后再提交"); + return Result.error("remark-sensitive-word","备注中有敏感词"+words+",请修改后再提交"); } xmProduct.setPmUserid(user.getUserid()); xmProduct.setPmUsername(user.getUsername()); @@ -303,22 +303,22 @@ public class XmProductController { public Result unDelXmProduct(@RequestBody XmProduct xmProduct){ if(!StringUtils.hasText(xmProduct.getId())){ - return failed("id-0","","产品编号不能为空"); + return Result.error("id-0","","产品编号不能为空"); } User user=LoginUtils.getCurrentUserInfo(); XmProduct xmProductDb=xmProductService.getProductFromCache(xmProduct.getId()); if(xmProductDb==null){ - return failed("data-0","产品已不存在"); + return Result.error("data-0","产品已不存在"); } if(!"1".equals(xmProductDb.getDel())){ - return failed("del-not-1","该产品不是已删除状态"); + return Result.error("del-not-1","该产品不是已删除状态"); } if(!user.getBranchId().equals(xmProductDb.getBranchId())){ - return failed("branchId-not-right","该产品不属于您所在的机构，不允许操作"); + return Result.error("branchId-not-right","该产品不属于您所在的机构，不允许操作"); } if(!groupService.checkUserIsProductAdm(xmProductDb,user.getUserid())){ if(!LoginUtils.isBranchAdmin(xmProductDb.getBranchId())){ - return failed("pmUserid-not-right","您不是该产品产品管理人员，不允许操作"); + return Result.error("pmUserid-not-right","您不是该产品产品管理人员，不允许操作"); } } /** @@ -352,22 +352,22 @@ public class XmProductController { public Result delXmProduct(@RequestBody XmProduct xmProduct){ if(!StringUtils.hasText(xmProduct.getId())){ - return failed("id-0","","产品编号不能为空"); + return Result.error("id-0","","产品编号不能为空"); } User user=LoginUtils.getCurrentUserInfo(); XmProduct xmProductDb=xmProductService.getProductFromCache(xmProduct.getId()); if(xmProductDb==null){ - return failed("data-0","产品已不存在"); + return Result.error("data-0","产品已不存在"); } if(!"0".equals(xmProductDb.getPstatus())&&!"3".equals(xmProductDb.getPstatus())){ - return failed("pstatus-not-0-3","该产品不是初始、已关闭状态，不允许删除"); + return Result.error("pstatus-not-0-3","该产品不是初始、已关闭状态，不允许删除"); } if(!user.getBranchId().equals(xmProductDb.getBranchId())){ - return failed("branchId-not-right","该产品不属于您所在的机构，不允许删除"); + return Result.error("branchId-not-right","该产品不属于您所在的机构，不允许删除"); } if(!groupService.checkUserIsProductAdm(xmProductDb,user.getUserid())){ if(!LoginUtils.isBranchAdmin(xmProductDb.getBranchId())){ - return failed("pmUserid-not-right","您不是该产品管理人员，不允许删除.若要强制删除，请联系产品管理人员或者机构管理员。"); + return Result.error("pmUserid-not-right","您不是该产品管理人员，不允许删除.若要强制删除，请联系产品管理人员或者机构管理员。"); } } /** @@ -400,41 +400,41 @@ public class XmProductController { List ids= (List) xmProductMap.get("ids"); if(ids==null || ids.size()==0){ - return failed("ids-0","ids不能为空"); + return Result.error("ids-0","ids不能为空"); } if( ids.size()>1){ - return failed("ids-1","一次只能修改一个产品"); + return Result.error("ids-1","一次只能修改一个产品"); } Set fields=new HashSet<>(); fields.add("id"); for (String fieldName : xmProductMap.keySet()) { if(fields.contains(fieldName)){ - return failed(fieldName+"-no-edit",fieldName+"不允许修改"); + return Result.error(fieldName+"-no-edit",fieldName+"不允许修改"); } } Set fieldKey=xmProductMap.keySet().stream().filter(i-> fieldsMap.containsKey(i)).collect(Collectors.toSet()); fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmProductMap.get(i) )).collect(Collectors.toSet()); if(fieldKey.size()<=0) { - return failed("fieldKey-0","没有需要更新的字段"); + return Result.error("fieldKey-0","没有需要更新的字段"); } XmProduct xmProduct = fromMap(xmProductMap,XmProduct.class); List xmProductsDb=xmProductService.selectListByIds(ids); if(xmProductsDb==null ||xmProductsDb.size()==0){ - return failed("data-0","记录已不存在"); + return Result.error("data-0","记录已不存在"); } User user = LoginUtils.getCurrentUserInfo(); XmProduct xmProductDb=xmProductsDb.get(0); if(!LoginUtils.isBranchAdmin(xmProductDb.getBranchId()) && !groupService.checkUserIsProductAdm(xmProductDb,user.getUserid())){ - return failed("noqx-all","无权限操作。产品管理人员、机构管理员有权限更新产品基础信息。"); + return Result.error("noqx-all","无权限操作。产品管理人员、机构管理员有权限更新产品基础信息。"); } if(xmProductMap.containsKey("assUserid")){ String assUserid= (String) xmProductMap.get("assUserid"); String assUsername= (String) xmProductMap.get("assUsername"); if(StringUtils.hasText(assUserid)){ if(!user.getUserid().equals(xmProductDb.getPmUserid()) && !user.getUserid().equals(xmProductDb.getAdmUserid())){ - return failed("noqx-pm","您无权限操作,产品经理、总监可以委任产品副经理。"); + return Result.error("noqx-pm","您无权限操作,产品经理、总监可以委任产品副经理。"); } } } @@ -443,7 +443,7 @@ public class XmProductController { String pmUsername= (String) xmProductMap.get("pmUsername"); if(StringUtils.hasText(pmUserid)){ if(!user.getUserid().equals(xmProductDb.getAdmUserid())){ - return failed("noqx-adm","您无权限操作,产品总监可以委任产品经理。"); + return Result.error("noqx-adm","您无权限操作,产品总监可以委任产品经理。"); } } } @@ -452,7 +452,7 @@ public class XmProductController { String admUsername= (String) xmProductMap.get("admUsername"); if(StringUtils.hasText(admUserid)){ if(!LoginUtils.isBranchAdmin(xmProductDb.getBranchId()) && !user.getUserid().equals(xmProductDb.getAdmUserid())){ - return failed("noqx-adm","您无权限操作，产品总监、机构管理员可以委任产品总监。"); + return Result.error("noqx-adm","您无权限操作，产品总监、机构管理员可以委任产品总监。"); } } } @@ -501,16 +501,16 @@ public class XmProductController { if(!StringUtils.hasText(xmProduct.getId())){ - return failed("id-0","","产品编号不能为空"); + return Result.error("id-0","","产品编号不能为空"); } XmProduct xmProductDb=xmProductService.getProductFromCache(xmProduct.getId()); if(xmProductDb==null){ - return failed("data-0","产品已不存在"); + return Result.error("data-0","产品已不存在"); } User user=LoginUtils.getCurrentUserInfo(); if(!LoginUtils.isBranchAdmin(xmProductDb.getBranchId())){ if(!groupService.checkUserIsProductAdm(xmProductDb,user.getUserid())){ - return failed("no-qx-0","您无权修改该产品。"); + return Result.error("no-qx-0","您无权修改该产品。"); } } @@ -551,25 +551,25 @@ public class XmProductController { for (XmProduct xmProduct : xmProducts) { Tips otips=new Tips(); if(!StringUtils.hasText(xmProduct.getId())){ - otips.setFailureMsg("id-0","","产品编号不能为空"); + oreturn Result.error("id-0","","产品编号不能为空"); errTips.add(otips); continue; } XmProduct xmProductDb=xmProductService.getProductFromCache(xmProduct.getId()); if(xmProductDb==null){ - otips.setFailureMsg("data-0","","产品【"+xmProductDb.getProductName()+"】已不存在"); + oreturn Result.error("data-0","","产品【"+xmProductDb.getProductName()+"】已不存在"); }else if(!"0".equals(xmProductDb.getPstatus())&&!"3".equals(xmProductDb.getPstatus())){ - otips.setFailureMsg("pstatus-not-0-3","产品【"+xmProductDb.getProductName()+"】不是初始、已关闭状态，不允许删除"); + oreturn Result.error("pstatus-not-0-3","产品【"+xmProductDb.getProductName()+"】不是初始、已关闭状态，不允许删除"); }else if(!user.getBranchId().equals(xmProductDb.getBranchId())){ - otips.setFailureMsg("branchId-not-right","产品【"+xmProductDb.getProductName()+"】不属于您所在的机构，不允许删除"); + oreturn Result.error("branchId-not-right","产品【"+xmProductDb.getProductName()+"】不属于您所在的机构，不允许删除"); }else if(!groupService.checkUserIsProductAdm(xmProductDb,user.getUserid())){ - otips.setFailureMsg("pmUserid-not-right","您不是产品【"+xmProductDb.getProductName()+"】负责人,也不是产品助理，不允许删除"); + oreturn Result.error("pmUserid-not-right","您不是产品【"+xmProductDb.getProductName()+"】负责人,也不是产品助理，不允许删除"); }else{ if(!"1".equals(xmProductDb.getIsTpl())){ long menus=xmProductService.checkExistsMenu(xmProduct.getId()); if(menus>0) { - otips.setFailureMsg("had-menus","产品【"+xmProductDb.getProductName()+"】有"+menus+"个需求关联，不允许删除，请先解绑需求"); + oreturn Result.error("had-menus","产品【"+xmProductDb.getProductName()+"】有"+menus+"个需求关联，不允许删除，请先解绑需求"); } } } @@ -592,13 +592,13 @@ public class XmProductController { } String msg="成功删除"+canDelList.size()+"条产品信息"; if(canDelList.size()==xmProducts.size()){ - tips.setOkMsg(msg); + return Result.ok(msg); }else{ if(errTips.size()>0 && canDelList.size()>0){ String errmsg=errTips.stream().map(i->i.getMsg()).collect(Collectors.joining(" ")); - tips.setOkMsg(msg+"\n"+errmsg); + return Result.ok(msg+"\n"+errmsg); }else{ - tips.setFailureMsg(errTips.stream().map(i->i.getMsg()).collect(Collectors.joining(" "))); + return Result.error(errTips.stream().map(i->i.getMsg()).collect(Collectors.joining(" "))); } } return tips; diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductProjectLinkController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductProjectLinkController.java index 6e33075f..1251edb7 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductProjectLinkController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductProjectLinkController.java @@ -91,7 +91,7 @@ public class XmProductProjectLinkController { return ResponseHelper.failed("projectId-0","项目编号不能为空"); } if(xmProductProjectLinkService.selectOneObject(xmProductProjectLink) !=null ){ - tips.setFailureMsg("已加入，无需再添加"); + return Result.error("已加入，无需再添加"); m.put("tips", tips); return m; } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductStateController.java index 7ad9bc97..7c51e1a3 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductStateController.java @@ -132,7 +132,7 @@ public class XmProductStateController { }else{ XmProductState xmProductStateQuery = new XmProductState(xmProductState.getId()); if(xmProductStateService.countByWhere(xmProductStateQuery)>0){ - tips.setFailureMsg("编号重复，请修改编号再提交"); + return Result.error("编号重复，请修改编号再提交"); m.put("tips", tips); return m; } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductStateHisController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductStateHisController.java index 2a7ac289..b7984354 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductStateHisController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductStateHisController.java @@ -86,7 +86,7 @@ public class XmProductStateHisController { } if(createPk==false){ if(xmProductStateHisService.selectOneObject(xmProductStateHis) !=null ){ - return failed("pk-exists","编号重复，请修改编号再提交"); + return Result.error("pk-exists","编号重复，请修改编号再提交"); } } xmProductStateHisService.insert(xmProductStateHis); @@ -103,14 +103,14 @@ public class XmProductStateHisController { public Result delXmProductStateHis(@RequestBody XmProductStateHis xmProductStateHis){ if(!StringUtils.hasText(xmProductStateHis.getProductId())) { - return failed("pk-not-exists","请上送主键参数productId"); + return Result.error("pk-not-exists","请上送主键参数productId"); } if(!StringUtils.hasText(xmProductStateHis.getBizDate())) { - return failed("pk-not-exists","请上送主键参数bizDate"); + return Result.error("pk-not-exists","请上送主键参数bizDate"); } XmProductStateHis xmProductStateHisDb = xmProductStateHisService.selectOneObject(xmProductStateHis); if( xmProductStateHisDb == null ){ - return failed("data-not-exists","数据不存在，无法删除"); + return Result.error("data-not-exists","数据不存在，无法删除"); } xmProductStateHisService.deleteByPk(xmProductStateHis); return Result.ok(); @@ -127,14 +127,14 @@ public class XmProductStateHisController { public Result editXmProductStateHis(@RequestBody XmProductStateHis xmProductStateHis) { if(!StringUtils.hasText(xmProductStateHis.getProductId())) { - return failed("pk-not-exists","请上送主键参数productId"); + return Result.error("pk-not-exists","请上送主键参数productId"); } if(!StringUtils.hasText(xmProductStateHis.getBizDate())) { - return failed("pk-not-exists","请上送主键参数bizDate"); + return Result.error("pk-not-exists","请上送主键参数bizDate"); } XmProductStateHis xmProductStateHisDb = xmProductStateHisService.selectOneObject(xmProductStateHis); if( xmProductStateHisDb == null ){ - return failed("data-not-exists","数据不存在，无法修改"); + return Result.error("data-not-exists","数据不存在，无法修改"); } xmProductStateHisService.updateSomeFieldByPk(xmProductStateHis); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectContractController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectContractController.java index 1dbfbdf4..ff8522c5 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectContractController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectContractController.java @@ -77,7 +77,7 @@ public class XmProjectContractController { }else{ XmProjectContract xmProjectContractQuery = new XmProjectContract(xmProjectContract.getHtId()); if(xmProjectContractService.countByWhere(xmProjectContractQuery)>0){ - tips.setFailureMsg("编号重复，请修改编号再提交"); + return Result.error("编号重复，请修改编号再提交"); m.put("tips", tips); return m; } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java index 123b714b..a886e21d 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java @@ -138,11 +138,11 @@ public class XmProjectController { List ids= (List) xmProjectMap.get("ids"); if(ids==null || ids.size()==0){ - return failed("ids-0","ids不能为空"); + return Result.error("ids-0","ids不能为空"); } if(ids.size()>1){ - return failed("ids-1","一次只能更新一个项目"); + return Result.error("ids-1","一次只能更新一个项目"); } Set fields=new HashSet<>(); fields.add("id"); @@ -150,31 +150,31 @@ public class XmProjectController { fields.add("bizFlowState"); for (String fieldName : xmProjectMap.keySet()) { if(fields.contains(fieldName)){ - return failed(fieldName+"-no-edit",fieldName+"不允许修改"); + return Result.error(fieldName+"-no-edit",fieldName+"不允许修改"); } } Set fieldKey=xmProjectMap.keySet().stream().filter(i-> fieldsMap.containsKey(i)).collect(Collectors.toSet()); fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmProjectMap.get(i) )).collect(Collectors.toSet()); if(fieldKey.size()<=0) { - return failed("fieldKey-0","没有需要更新的字段"); + return Result.error("fieldKey-0","没有需要更新的字段"); } User user=LoginUtils.getCurrentUserInfo(); List xmProjectsDb=xmProjectService.selectListByIds(ids); if(xmProjectsDb==null ||xmProjectsDb.size()==0){ - return failed("data-0","记录已不存在"); + return Result.error("data-0","记录已不存在"); } XmProject xmProject=BaseUtils.fromMap(xmProjectMap,XmProject.class); XmProject xmProjectDb=xmProjectsDb.get(0); if(!LoginUtils.isBranchAdmin(xmProjectDb.getBranchId()) && !groupService.checkUserIsProjectAdm(xmProjectDb,user.getUserid())){ - return failed("noqx-all","您无权限操作，产品管理人员、机构管理员有权限更新项目基础信息。"); + return Result.error("noqx-all","您无权限操作，产品管理人员、机构管理员有权限更新项目基础信息。"); } if(xmProjectMap.containsKey("assUserid")){ String assUserid= (String) xmProjectMap.get("assUserid"); String assUsername= (String) xmProjectMap.get("assUsername"); if(StringUtils.hasText(assUserid)){ if(!user.getUserid().equals(xmProjectDb.getPmUserid()) && !user.getUserid().equals(xmProjectDb.getAdmUserid())){ - return failed("noqx-pm","您无权限操作。项目经理、总监可以委任项目副经理。"); + return Result.error("noqx-pm","您无权限操作。项目经理、总监可以委任项目副经理。"); } } } @@ -183,7 +183,7 @@ public class XmProjectController { String pmUsername= (String) xmProjectMap.get("pmUsername"); if(StringUtils.hasText(pmUserid)){ if(!user.getUserid().equals(xmProjectDb.getAdmUserid())){ - return failed("noqx-adm","您无权限操作，项目总监可以委任项目经理。"); + return Result.error("noqx-adm","您无权限操作，项目总监可以委任项目经理。"); } } } @@ -192,7 +192,7 @@ public class XmProjectController { String admUsername= (String) xmProjectMap.get("admUsername"); if(StringUtils.hasText(admUserid)){ if(!LoginUtils.isBranchAdmin(xmProjectDb.getBranchId()) && !user.getUserid().equals(xmProjectDb.getAdmUserid())){ - return failed("noqx-adm","您无权限操作，项目总监、机构管理员可以委任项目总监。"); + return Result.error("noqx-adm","您无权限操作，项目总监、机构管理员可以委任项目总监。"); } } } @@ -223,27 +223,27 @@ public class XmProjectController { public Result addXmProject(@RequestBody XmProjectVo xmProjectVo) { if(!StringUtils.hasText(xmProjectVo.getName())){ - return failed("name-0","项目名称不能为空"); + return Result.error("name-0","项目名称不能为空"); } if(xmProjectVo.getLinks()!=null && xmProjectVo.getLinks().size()>0){ for (XmProductProjectLink link : xmProjectVo.getLinks()) { if(!StringUtils.hasText(link.getProductId())){ - return failed("productId-0","关联的产品编号不能为空"); + return Result.error("productId-0","关联的产品编号不能为空"); } } } Set words=sensitiveWordService.getSensitiveWord(xmProjectVo.getName()); if(words!=null && words.size()>0){ - return failed("name-sensitive-word","名字有敏感词"+words+",请修改后再提交"); + return Result.error("name-sensitive-word","名字有敏感词"+words+",请修改后再提交"); } words=sensitiveWordService.getSensitiveWord(xmProjectVo.getBaseRemark()); if(words!=null && words.size()>0){ - return failed("remark-sensitive-word","备注中有敏感词"+words+",请修改后再提交"); + return Result.error("remark-sensitive-word","备注中有敏感词"+words+",请修改后再提交"); } words=sensitiveWordService.getSensitiveWord(xmProjectVo.getAssessRemarks()); if(words!=null && words.size()>0){ - return failed("assessRemarks-sensitive-word","备注中有敏感词"+words+",请修改后再提交"); + return Result.error("assessRemarks-sensitive-word","备注中有敏感词"+words+",请修改后再提交"); } User user = LoginUtils.getCurrentUserInfo(); xmProjectService.saveProject(xmProjectVo); @@ -273,13 +273,13 @@ public class XmProjectController { User user= LoginUtils.getCurrentUserInfo(); XmProject xmProjectDb=this.xmProjectService.getProjectFromCache(xmProject.getId()); if(xmProjectDb==null){ - tips.setFailureMsg("项目不存在"); + return Result.error("项目不存在"); } if(!user.getBranchId().equals(xmProjectDb.getBranchId())){ - return failed("branchId-not-right","该项目不属于您的组织，不允许您进行恢复"); + return Result.error("branchId-not-right","该项目不属于您的组织，不允许您进行恢复"); } if(!"1".equals(xmProjectDb.getDel())){ - return failed("status-not-0","该项目不属于删除状态，不允许恢复"); + return Result.error("status-not-0","该项目不属于删除状态，不允许恢复"); } if(LoginUtils.isBranchAdmin(xmProjectDb.getBranchId()) || this.groupService.checkUserIsProjectAdm(xmProjectDb,user.getUserid())){ XmProject xmProjectUpdate=new XmProject(); @@ -291,7 +291,7 @@ public class XmProjectController { xmRecordService.addXmProjectRecord(xmProject.getId(),"项目-从回收站恢复项目",user.getUsername()+"从回收站恢复项目【"+xmProjectDb.getName()+"】", null, JSON.toJSONString(xmProjectDb)); }else { - tips.setFailureMsg("您不是该项目管理人员，无权从回收站恢复项目"); + return Result.error("您不是该项目管理人员，无权从回收站恢复项目"); } return Result.ok(); @@ -307,15 +307,15 @@ public class XmProjectController { User user= LoginUtils.getCurrentUserInfo(); if(xmProject==null || StringUtils.isEmpty(xmProject.getId())){ - return failed("id-0","项目编号不能为空"); + return Result.error("id-0","项目编号不能为空"); } XmProject xmProjectDb=this.xmProjectService.getProjectFromCache(xmProject.getId()); if(xmProjectDb==null){ - tips.setFailureMsg("项目不存在"); - return failed(tips); + return Result.error("项目不存在"); + return Result.error(tips); } if(!user.getBranchId().equals(xmProjectDb.getBranchId())){ - return failed("branchId-not-right","该项目不属于您的组织，不允许您进行删除"); + return Result.error("branchId-not-right","该项目不属于您的组织，不允许您进行删除"); } if(LoginUtils.isBranchAdmin(xmProjectDb.getBranchId()) || this.groupService.checkUserIsProjectAdm(xmProjectDb,user.getUserid())){ XmProject xmProjectUpdate=new XmProject(); @@ -327,7 +327,7 @@ public class XmProjectController { xmRecordService.addXmProjectRecord(xmProject.getId(),"项目-删除",user.getUsername()+"删除项目【"+xmProjectDb.getName()+"】", null, JSON.toJSONString(xmProjectDb)); }else { - tips.setFailureMsg("您不是该项目管理人员，无权删除"); + return Result.error("您不是该项目管理人员，无权删除"); } return Result.ok(); @@ -345,15 +345,15 @@ public class XmProjectController { User user= LoginUtils.getCurrentUserInfo(); if( !StringUtils.hasText(xmProject.getId())){ - return failed("id-0","项目编号不能为空"); + return Result.error("id-0","项目编号不能为空"); } XmProject xmProjectDb=this.xmProjectService.getProjectFromCache(xmProject.getId()); if(xmProjectDb==null){ - return failed("data-0","项目不存在"); + return Result.error("data-0","项目不存在"); } boolean isPm=groupService.checkUserIsProjectAdm(xmProjectDb,user.getUserid()); if( !isPm && !LoginUtils.isBranchAdmin(xmProjectDb.getBranchId())) { - return failed("noqx","您无权操作！项目管理人员才能修改项目基础数据"); + return Result.error("noqx","您无权操作！项目管理人员才能修改项目基础数据"); } xmProjectService.updateByPk(xmProject); xmProjectService.clearProject(xmProject.getId()); @@ -387,15 +387,15 @@ public class XmProjectController { User user= LoginUtils.getCurrentUserInfo(); if( !StringUtils.hasText(xmProject.getId())){ - return failed("id-0","项目编号不能为空"); + return Result.error("id-0","项目编号不能为空"); } XmProject xmProjectDb=this.xmProjectService.getProjectFromCache(xmProject.getId()); if(xmProjectDb==null){ - return failed("data-0","项目不存在"); + return Result.error("data-0","项目不存在"); } boolean isPm=groupService.checkUserIsProjectAdm(xmProjectDb,user.getUserid()); if( !isPm && !LoginUtils.isBranchAdmin(xmProjectDb.getBranchId())) { - return failed("noqx","您无权操作！项目管理人员才能修改项目状态"); + return Result.error("noqx","您无权操作！项目管理人员才能修改项目状态"); } xmProjectService.updateStatus(xmProject); xmProjectService.clearProject(xmProject.getId()); @@ -417,15 +417,15 @@ public class XmProjectController { User user= LoginUtils.getCurrentUserInfo(); if( !StringUtils.hasText(xmProject.getId())){ - return failed("id-0","项目编号不能为空"); + return Result.error("id-0","项目编号不能为空"); } XmProject xmProjectDb=this.xmProjectService.getProjectFromCache(xmProject.getId()); if(xmProjectDb==null){ - return failed("data-0","项目不存在"); + return Result.error("data-0","项目不存在"); } boolean isPm=groupService.checkUserIsProjectAdm(xmProjectDb,user.getUserid()); if( !isPm && !LoginUtils.isBranchAdmin(xmProjectDb.getBranchId())) { - return failed("noqx","您无权操作！项目管理人员才能修改项目预算"); + return Result.error("noqx","您无权操作！项目管理人员才能修改项目预算"); } xmProjectService.editBudget(xmProject); xmProjectService.clearProject(xmProject.getId()); @@ -450,15 +450,15 @@ public class XmProjectController { User user= LoginUtils.getCurrentUserInfo(); if( !StringUtils.hasText(xmProject.getId())){ - return failed("id-0","项目编号不能为空"); + return Result.error("id-0","项目编号不能为空"); } XmProject xmProjectDb=this.xmProjectService.getProjectFromCache(xmProject.getId()); if(xmProjectDb==null){ - return failed("data-0","项目不存在"); + return Result.error("data-0","项目不存在"); } boolean isPm=groupService.checkUserIsProjectAdm(xmProjectDb,user.getUserid()); if( !isPm && !LoginUtils.isBranchAdmin(xmProjectDb.getBranchId())) { - return failed("noqx","您无权操作！项目管理人员才能修改项目基础信息"); + return Result.error("noqx","您无权操作！项目管理人员才能修改项目基础信息"); } xmProjectService.updateProject(xmProject); if(StringUtils.hasText(xmProject.getPmUserid()) && !xmProject.getPmUserid().equals(xmProjectDb.getPmUserid())){ @@ -491,10 +491,10 @@ public class XmProjectController { User user= LoginUtils.getCurrentUserInfo(); if( !StringUtils.hasText(xmProject.getId())){ - return failed("id-0","请上送原项目编号参数id"); + return Result.error("id-0","请上送原项目编号参数id"); } if( !StringUtils.hasText(xmProject.getName())){ - return failed("name-0","请上送新项目名称"); + return Result.error("name-0","请上送新项目名称"); } if(StringUtils.hasText(xmProject.getCode())){ XmProject pq=new XmProject(); @@ -502,12 +502,12 @@ public class XmProjectController { pq.setCode(xmProject.getCode()); List xmProjectList=this.xmProjectService.selectListByWhere(pq); if(xmProjectList!=null && xmProjectList.size()>0){ - return failed("code-exists","项目代号【"+xmProject.getCode()+"】已存在，，请重新输入新的项目代号，如果为空，后台自动生成"); + return Result.error("code-exists","项目代号【"+xmProject.getCode()+"】已存在，，请重新输入新的项目代号，如果为空，后台自动生成"); } } XmProject xmProjectDb=this.xmProjectService.getProjectFromCache(xmProject.getId()); if(xmProjectDb==null){ - tips.setFailureMsg("项目不存在"); + return Result.error("项目不存在"); m.put("tips", tips); return m; } @@ -570,7 +570,7 @@ public class XmProjectController { tips=e.getTips(); logger.error("执行异常",e); }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); + return Result.error(e.getMessage()); logger.error("执行异常",e); } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiController.java index ccf4bd32..ed1a7722 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiController.java @@ -94,7 +94,7 @@ public class XmProjectKpiController { }else{ XmProjectKpi xmProjectKpiQuery = new XmProjectKpi(xmProjectKpi.getId()); if(xmProjectKpiService.countByWhere(xmProjectKpiQuery)>0){ - tips.setFailureMsg("编号重复，请修改编号再提交"); + return Result.error("编号重复，请修改编号再提交"); m.put("tips", tips); return m; } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiHisController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiHisController.java index fe9f52b4..15ab8c2a 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiHisController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiHisController.java @@ -97,7 +97,7 @@ public class XmProjectKpiHisController { }else{ XmProjectKpiHis xmProjectKpiHisQuery = new XmProjectKpiHis(xmProjectKpiHis.getKpiId()); if(xmProjectKpiHisService.countByWhere(xmProjectKpiHisQuery)>0){ - tips.setFailureMsg("编号重复，请修改编号再提交"); + return Result.error("编号重复，请修改编号再提交"); m.put("tips", tips); return m; } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateController.java index 5aaf8a0f..34e86f6a 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateController.java @@ -153,7 +153,7 @@ public class XmProjectStateController { public Result loadTasksToXmProjectState(@RequestBody XmProjectState xmProjectState){ if(StringUtils.isEmpty(xmProjectState.getProjectId())) { - tips.setFailureMsg("项目编号projectId必填"); + return Result.error("项目编号projectId必填"); }else { xmProjectStateService.loadTasksToXmProjectState(xmProjectState.getProjectId()); @@ -169,7 +169,7 @@ public class XmProjectStateController { public Result loadTasksSettleToXmProjectState(@RequestBody XmProjectState xmProjectState){ if(StringUtils.isEmpty(xmProjectState.getProjectId())) { - tips.setFailureMsg("项目编号projectId必填"); + return Result.error("项目编号projectId必填"); }else { xmProjectStateService.loadTasksSettleToXmProjectState(xmProjectState.getProjectId()); @@ -190,7 +190,7 @@ public class XmProjectStateController { }else{ XmProjectState xmProjectStateQuery = new XmProjectState(xmProjectState.getId()); if(xmProjectStateService.countByWhere(xmProjectStateQuery)>0){ - tips.setFailureMsg("编号重复，请修改编号再提交"); + return Result.error("编号重复，请修改编号再提交"); m.put("tips", tips); return m; } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateHisController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateHisController.java index 48089f37..d6056203 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateHisController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateHisController.java @@ -138,7 +138,7 @@ public class XmProjectStateHisController { }else{ XmProjectStateHis xmProjectStateHisQuery = new XmProjectStateHis(xmProjectStateHis.getId()); if(xmProjectStateHisService.countByWhere(xmProjectStateHisQuery)>0){ - tips.setFailureMsg("编号重复，请修改编号再提交"); + return Result.error("编号重复，请修改编号再提交"); m.put("tips", tips); return m; } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectTaskTypeStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectTaskTypeStateController.java index 618ab6d4..6c241051 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectTaskTypeStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectTaskTypeStateController.java @@ -93,7 +93,7 @@ public class XmProjectTaskTypeStateController { public Result loadTasksToXmProjectTaskTypeState(@RequestBody XmProjectTaskTypeState xmProjectTaskTypeState){ if(StringUtils.isEmpty(xmProjectTaskTypeState.getProjectId())) { - tips.setFailureMsg("项目编号projectId必填"); + return Result.error("项目编号projectId必填"); }else { xmProjectTaskTypeStateService.loadTasksToXmProjectTaskTypeState(xmProjectTaskTypeState.getBranchId()); @@ -115,7 +115,7 @@ public class XmProjectTaskTypeStateController { }else{ XmProjectTaskTypeState xmProjectTaskTypeStateQuery = new XmProjectTaskTypeState(xmProjectTaskTypeState.getId()); if(xmProjectTaskTypeStateService.countByWhere(xmProjectTaskTypeStateQuery)>0){ - tips.setFailureMsg("编号重复，请修改编号再提交"); + return Result.error("编号重复，请修改编号再提交"); m.put("tips", tips); return m; } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java index ecf1a663..38caceab 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java @@ -178,7 +178,7 @@ public class XmQuestionController { public Result addXmQuestion(@RequestBody XmQuestionVo xmQuestionVo) { if(!StringUtils.hasText(xmQuestionVo.getProjectId())){ - tips.setFailureMsg("项目编号projectId必传"); + return Result.error("项目编号projectId必传"); m.put("tips", tips); return m; } @@ -199,15 +199,15 @@ public class XmQuestionController { } Set words=sensitiveWordService.getSensitiveWord(xmQuestionVo.getName()); if(words!=null && words.size()>0){ - return failed("name-sensitive-word","名字有敏感词"+words+",请修改后再提交"); + return Result.error("name-sensitive-word","名字有敏感词"+words+",请修改后再提交"); } words=sensitiveWordService.getSensitiveWord(xmQuestionVo.getRemarks()); if(words!=null && words.size()>0){ - return failed("remark-sensitive-word","备注中有敏感词"+words+",请修改后再提交"); + return Result.error("remark-sensitive-word","备注中有敏感词"+words+",请修改后再提交"); } tips=checkOneQx(xmQuestionVo.getProjectId(),xmQuestionVo.getProductId()); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } if(StringUtils.hasText(xmQuestionVo.getProjectId())){ XmProject xmProject=projectService.getProjectFromCache(xmQuestionVo.getProjectId() ); @@ -250,12 +250,12 @@ public class XmQuestionController { if(!StringUtils.hasText(xmQuestionVo.getId())){ - return failed("id-0","编号不能为空"); + return Result.error("id-0","编号不能为空"); } XmQuestion xmQuestionDb=this.xmQuestionService.selectOneById(xmQuestionVo.getId()); tips=checkOneQx(xmQuestionDb.getProjectId(),xmQuestionDb.getProductId()); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } User user=LoginUtils.getCurrentUserInfo(); xmQuestionService.updateQuestion(xmQuestionVo); @@ -275,13 +275,13 @@ public class XmQuestionController { if(!StringUtils.hasText(xmQuestion.getId())){ - return failed("id-0","编号不能为空"); + return Result.error("id-0","编号不能为空"); } XmQuestion xmQuestionDb=this.xmQuestionService.selectOneById(xmQuestion.getId()); tips=checkOneQx(xmQuestionDb.getProjectId(),xmQuestionDb.getProductId()); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } User user=LoginUtils.getCurrentUserInfo(); xmQuestionService.updateSomeFieldByPk(xmQuestion); @@ -347,7 +347,7 @@ public class XmQuestionController { tips1=projectQxService.checkProjectScopeQx(projectService.getProjectFromCache(xmQuedb.getProjectId()),1,user,handlerUserid,handlerUsername,null); } if(!tips1.isOk()){ - return failed(tips1); + return Result.error(tips1); } } } @@ -422,9 +422,9 @@ public class XmQuestionController { msgs.add(String.format("其中%s个缺陷，无权限修改。原因【%s】",noOper.size(),noDelTips2.stream().collect(Collectors.joining(";")))); } if(canOper.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else{ - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } // return Result.ok(); @@ -474,9 +474,9 @@ public class XmQuestionController { msgs.add(String.format("其中%s个缺陷，无权限删除。原因【%s】",noOper.size(),noDelTips2.stream().collect(Collectors.joining(";")))); } if(canOper.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else{ - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); @@ -690,7 +690,7 @@ public class XmQuestionController { tips=e.getTips(); logger.error("执行异常",e); }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); + return Result.error(e.getMessage()); logger.error("执行异常",e); } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionHandleController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionHandleController.java index a36d8ae4..4c189eec 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionHandleController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionHandleController.java @@ -96,7 +96,7 @@ public class XmQuestionHandleController { }else{ XmQuestionHandle xmQuestionHandleQuery = new XmQuestionHandle(xmQuestionHandle.getId()); if(xmQuestionHandleService.countByWhere(xmQuestionHandleQuery)>0){ - tips.setFailureMsg("编号重复，请修改编号再提交"); + return Result.error("编号重复，请修改编号再提交"); m.put("tips", tips); return m; } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionTagController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionTagController.java index 29bba1ac..4d23506e 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionTagController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionTagController.java @@ -85,7 +85,7 @@ public class XmQuestionTagController { }else{ XmQuestionTag xmQuestionTagQuery = new XmQuestionTag(xmQuestionTag.getId()); if(xmQuestionTagService.countByWhere(xmQuestionTagQuery)>0){ - tips.setFailureMsg("编号重复，请修改编号再提交"); + return Result.error("编号重复，请修改编号再提交"); m.put("tips", tips); return m; } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmRecordController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmRecordController.java index 5b5591dc..2d3914b7 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmRecordController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmRecordController.java @@ -94,7 +94,7 @@ public class XmRecordController { }else{ XmRecord xmRecordQuery = new XmRecord(xmRecord.getId()); if(xmRecordService.countByWhere(xmRecordQuery)>0){ - tips.setFailureMsg("编号重复，请修改编号再提交"); + return Result.error("编号重复，请修改编号再提交"); m.put("tips", tips); return m; } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmRecordVisitController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmRecordVisitController.java index ef4e5342..7fdafa68 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmRecordVisitController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmRecordVisitController.java @@ -134,11 +134,11 @@ public class XmRecordVisitController { public Result delXmRecordVisit(@RequestBody XmRecordVisit xmRecordVisit){ if(!StringUtils.hasText(xmRecordVisit.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmRecordVisit xmRecordVisitDb = xmRecordVisitService.selectOneObject(xmRecordVisit); if( xmRecordVisitDb == null ){ - return failed("data-not-exists","数据不存在，无法删除"); + return Result.error("data-not-exists","数据不存在，无法删除"); } xmRecordVisitService.deleteByPk(xmRecordVisit); return Result.ok(); @@ -155,11 +155,11 @@ public class XmRecordVisitController { public Result editXmRecordVisit(@RequestBody XmRecordVisit xmRecordVisit) { if(!StringUtils.hasText(xmRecordVisit.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmRecordVisit xmRecordVisitDb = xmRecordVisitService.selectOneObject(xmRecordVisit); if( xmRecordVisitDb == null ){ - return failed("data-not-exists","数据不存在，无法修改"); + return Result.error("data-not-exists","数据不存在，无法修改"); } xmRecordVisitService.updateSomeFieldByPk(xmRecordVisit); @@ -177,26 +177,26 @@ public class XmRecordVisitController { List ids= (List) xmRecordVisitMap.get("ids"); if(ids==null || ids.size()==0){ - return failed("ids-0","ids不能为空"); + return Result.error("ids-0","ids不能为空"); } Set fields=new HashSet<>(); fields.add("id"); for (String fieldName : xmRecordVisitMap.keySet()) { if(fields.contains(fieldName)){ - return failed(fieldName+"-no-edit",fieldName+"不允许修改"); + return Result.error(fieldName+"-no-edit",fieldName+"不允许修改"); } } Set fieldKey=xmRecordVisitMap.keySet().stream().filter(i-> fieldsMap.containsKey(i)).collect(Collectors.toSet()); fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmRecordVisitMap.get(i) )).collect(Collectors.toSet()); if(fieldKey.size()<=0) { - return failed("fieldKey-0","没有需要更新的字段"); + return Result.error("fieldKey-0","没有需要更新的字段"); } XmRecordVisit xmRecordVisit = fromMap(xmRecordVisitMap,XmRecordVisit.class); List xmRecordVisitsDb=xmRecordVisitService.selectListByIds(ids); if(xmRecordVisitsDb==null ||xmRecordVisitsDb.size()==0){ - return failed("data-0","记录已不存在"); + return Result.error("data-0","记录已不存在"); } List can=new ArrayList<>(); List no=new ArrayList<>(); @@ -221,9 +221,9 @@ public class XmRecordVisitController { msgs.add(String.format("以下%s个数据无权限更新",no.size())); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } // return Result.ok(); @@ -242,7 +242,7 @@ public class XmRecordVisitController { if(xmRecordVisits.size()<=0){ - return failed("data-0","请上送待删除数据列表"); + return Result.error("data-0","请上送待删除数据列表"); } List datasDb=xmRecordVisitService.selectListByIds(xmRecordVisits.stream().map(i-> i.getId() ).collect(Collectors.toList())); @@ -265,19 +265,12 @@ public class XmRecordVisitController { msgs.add(String.format("以下%s条数据不能删除.【%s】",no.size(),no.stream().map(i-> i.getId() ).collect(Collectors.joining(",")))); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } - }catch (BizException e) { - tips=e.getTips(); - logger.error("",e); - }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); - logger.error("",e); - } - m.put("tips", tips); - return m; + return Result.ok(); + } */ } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmRptConfigController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmRptConfigController.java index 3e142b80..69128a08 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmRptConfigController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmRptConfigController.java @@ -98,11 +98,11 @@ public class XmRptConfigController { public Result delXmRptConfig(@RequestBody XmRptConfig xmRptConfig){ if(!StringUtils.hasText(xmRptConfig.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmRptConfig xmRptConfigDb = xmRptConfigService.selectOneObject(xmRptConfig); if( xmRptConfigDb == null ){ - return failed("data-not-exists","数据不存在，无法删除"); + return Result.error("data-not-exists","数据不存在，无法删除"); } xmRptConfigService.deleteByPk(xmRptConfig); return Result.ok(); @@ -117,11 +117,11 @@ public class XmRptConfigController { public Result editXmRptConfig(@RequestBody XmRptConfig xmRptConfig) { if(!StringUtils.hasText(xmRptConfig.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmRptConfig xmRptConfigDb = xmRptConfigService.selectOneObject(xmRptConfig); if( xmRptConfigDb == null ){ - return failed("data-not-exists","数据不存在，无法修改"); + return Result.error("data-not-exists","数据不存在，无法修改"); } xmRptConfigService.updateSomeFieldByPk(xmRptConfig); @@ -137,26 +137,26 @@ public class XmRptConfigController { List ids= (List) xmRptConfigMap.get("ids"); if(ids==null || ids.size()==0){ - return failed("ids-0","ids不能为空"); + return Result.error("ids-0","ids不能为空"); } Set fields=new HashSet<>(); fields.add("id"); for (String fieldName : xmRptConfigMap.keySet()) { if(fields.contains(fieldName)){ - return failed(fieldName+"-no-edit",fieldName+"不允许修改"); + return Result.error(fieldName+"-no-edit",fieldName+"不允许修改"); } } Set fieldKey=xmRptConfigMap.keySet().stream().filter(i-> fieldsMap.containsKey(i)).collect(Collectors.toSet()); fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmRptConfigMap.get(i) )).collect(Collectors.toSet()); if(fieldKey.size()<=0) { - return failed("fieldKey-0","没有需要更新的字段"); + return Result.error("fieldKey-0","没有需要更新的字段"); } XmRptConfig xmRptConfig = fromMap(xmRptConfigMap,XmRptConfig.class); List xmRptConfigsDb=xmRptConfigService.selectListByIds(ids); if(xmRptConfigsDb==null ||xmRptConfigsDb.size()==0){ - return failed("data-0","记录已不存在"); + return Result.error("data-0","记录已不存在"); } List can=new ArrayList<>(); List no=new ArrayList<>(); @@ -181,9 +181,9 @@ public class XmRptConfigController { msgs.add(String.format("以下%s个数据无权限更新",no.size())); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } // return Result.ok(); @@ -200,7 +200,7 @@ public class XmRptConfigController { if(xmRptConfigs.size()<=0){ - return failed("data-0","请上送待删除数据列表"); + return Result.error("data-0","请上送待删除数据列表"); } List datasDb=xmRptConfigService.selectListByIds(xmRptConfigs.stream().map(i-> i.getId() ).collect(Collectors.toList())); @@ -223,19 +223,12 @@ public class XmRptConfigController { msgs.add(String.format("以下%s条数据不能删除.【%s】",no.size(),no.stream().map(i-> i.getId() ).collect(Collectors.joining(",")))); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } - }catch (BizException e) { - tips=e.getTips(); - logger.error("",e); - }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); - logger.error("",e); - } - m.put("tips", tips); - return m; + return Result.ok(); + } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmRptDataController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmRptDataController.java index bd022ab9..1801fcdb 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmRptDataController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmRptDataController.java @@ -104,15 +104,15 @@ public class XmRptDataController { public Result delXmRptData(@RequestBody XmRptData xmRptData){ if(!StringUtils.hasText(xmRptData.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmRptData xmRptDataDb = xmRptDataService.selectOneObject(xmRptData); if( xmRptDataDb == null ){ - return failed("data-not-exists","数据不存在，无法删除"); + return Result.error("data-not-exists","数据不存在，无法删除"); } User user=LoginUtils.getCurrentUserInfo(); if( !xmRptDataDb.getCuserid().equals(user.getUserid())){ - return failed("not-yours","只能删除自己创建的报表"); + return Result.error("not-yours","只能删除自己创建的报表"); } xmRptDataService.deleteByPk(xmRptData); return Result.ok(); @@ -128,11 +128,11 @@ public class XmRptDataController { public Result editXmRptData(@RequestBody XmRptData xmRptData) { if(!StringUtils.hasText(xmRptData.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmRptData xmRptDataDb = xmRptDataService.selectOneObject(xmRptData); if( xmRptDataDb == null ){ - return failed("data-not-exists","数据不存在，无法修改"); + return Result.error("data-not-exists","数据不存在，无法修改"); } xmRptDataService.updateSomeFieldByPk(xmRptData); @@ -150,26 +150,26 @@ public class XmRptDataController { List ids= (List) xmRptDataMap.get("ids"); if(ids==null || ids.size()==0){ - return failed("ids-0","ids不能为空"); + return Result.error("ids-0","ids不能为空"); } Set fields=new HashSet<>(); fields.add("id"); for (String fieldName : xmRptDataMap.keySet()) { if(fields.contains(fieldName)){ - return failed(fieldName+"-no-edit",fieldName+"不允许修改"); + return Result.error(fieldName+"-no-edit",fieldName+"不允许修改"); } } Set fieldKey=xmRptDataMap.keySet().stream().filter(i-> fieldsMap.containsKey(i)).collect(Collectors.toSet()); fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmRptDataMap.get(i) )).collect(Collectors.toSet()); if(fieldKey.size()<=0) { - return failed("fieldKey-0","没有需要更新的字段"); + return Result.error("fieldKey-0","没有需要更新的字段"); } XmRptData xmRptData = fromMap(xmRptDataMap,XmRptData.class); List xmRptDatasDb=xmRptDataService.selectListByIds(ids); if(xmRptDatasDb==null ||xmRptDatasDb.size()==0){ - return failed("data-0","记录已不存在"); + return Result.error("data-0","记录已不存在"); } List can=new ArrayList<>(); List no=new ArrayList<>(); @@ -194,9 +194,9 @@ public class XmRptDataController { msgs.add(String.format("以下%s个数据无权限更新",no.size())); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } // return Result.ok(); @@ -215,12 +215,12 @@ public class XmRptDataController { if(xmRptDatas.size()<=0){ - return failed("data-0","请上送待删除数据列表"); + return Result.error("data-0","请上送待删除数据列表"); } User user=LoginUtils.getCurrentUserInfo(); List datasDb=xmRptDataService.selectListByIds(xmRptDatas.stream().map(i-> i.getId() ).collect(Collectors.toList())); if(datasDb.stream().filter(k->!k.getCuserid().equals(user.getUserid())).findAny().isPresent()){ - return failed("not-yours","只能删除自己创建的报表"); + return Result.error("not-yours","只能删除自己创建的报表"); } List can=new ArrayList<>(); List no=new ArrayList<>(); @@ -241,18 +241,11 @@ public class XmRptDataController { msgs.add(String.format("以下%s条数据不能删除.【%s】",no.size(),no.stream().map(i-> i.getId() ).collect(Collectors.joining(",")))); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } - }catch (BizException e) { - tips=e.getTips(); - logger.error("",e); - }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); - logger.error("",e); - } - m.put("tips", tips); - return m; + return Result.ok(); + } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskBidOrderController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskBidOrderController.java index 8ccf4170..1201e4bd 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskBidOrderController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskBidOrderController.java @@ -215,7 +215,7 @@ public class XmTaskBidOrderController { if(!StringUtils.hasText(orderId)) { - return failed("data-0","订单Id不能为空"); + return Result.error("data-0","订单Id不能为空"); } XmTaskBidOrder moOrder = xmTaskBidOrderService.selectOneById(orderId); m.put("tips", tips); @@ -233,11 +233,11 @@ public class XmTaskBidOrderController { try { if(!StringUtils.hasText(order.getId())) { - return failed("data-0","订单Id不能为空"); + return Result.error("data-0","订单Id不能为空"); } String flag= (String) this.redisTemplate.opsForValue().get("pay-notify-success-"+order.getPayId()); if(!StringUtils.hasText(flag)|| !"1".equals(flag)){ - return failed("pay-notify-success-flag-0","验证码错误"); + return Result.error("pay-notify-success-flag-0","验证码错误"); } xmTaskBidOrderService.orderPaySuccess(order.getId(),order.getPayId(),order.getPrepayId(), order.getTranId(), order.getPayAt(), order.getRemark()); @@ -245,10 +245,10 @@ public class XmTaskBidOrderController { return m; }catch (BizException e) { logger.error("",e); - return failed("data-0",e.getMessage()); + return Result.error("data-0",e.getMessage()); } catch (Exception e) { logger.error("",e); - return failed("data-0", "开通模块失败"); + return Result.error("data-0", "开通模块失败"); } } @@ -262,21 +262,21 @@ public class XmTaskBidOrderController { try { if(!StringUtils.hasText(order.getId())) { - return failed("data-0","订单Id不能为空"); + return Result.error("data-0","订单Id不能为空"); } String flag= (String) this.redisTemplate.opsForValue().get("pay-notify-cancel-"+order.getPayId()); if(!StringUtils.hasText(flag)|| !"1".equals(flag)){ - return failed("pay-notify-cancel-flag-0","验证码错误"); + return Result.error("pay-notify-cancel-flag-0","验证码错误"); } this.xmTaskBidOrderService.payCancel(order.getId(),order.getPayId(), order.getRemark()); m.put("tips", tips); return m; }catch (BizException e) { logger.error("",e); - return failed("data-0",e.getMessage()); + return Result.error("data-0",e.getMessage()); } catch (Exception e) { logger.error("",e); - return failed("data-0", "付款取消操作失败"); + return Result.error("data-0", "付款取消操作失败"); } } @ApiOperation( value = "修改订单的第三方流水号",notes=" ") @@ -288,7 +288,7 @@ public class XmTaskBidOrderController { if(!StringUtils.hasText(order.getId())) { - return failed("data-0","订单Id不能为空"); + return Result.error("data-0","订单Id不能为空"); } XmTaskBidOrder moOrder = new XmTaskBidOrder(); moOrder.setId(order.getId()); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index 42b7eb3f..c36e1988 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java @@ -294,7 +294,7 @@ public class XmTaskController { } if(oks.size()>0){ msg="成功设置"+oks.size()+"个任务的执行人。"+msg; - returnTips.setOkMsg(msg); + returnreturn Result.ok(msg); } return ResponseHelper.result(returnTips); }else if(ids.size()==1){ @@ -447,9 +447,9 @@ public class XmTaskController { msgs.add(String.format("以下%s个任务未设置执行人，不能变更为待执行状态,【%s】。",noExecs.size(),noExecs.stream().map(i->i.getName()).collect(Collectors.joining(",")))); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } // return Result.ok(); @@ -470,10 +470,10 @@ public class XmTaskController { String id=(String) xmTask.get("id"); String shareKey= (String) xmTask.get("shareKey"); if(!StringUtils.hasText(id)){ - tips.setFailureMsg("任务编号id必传"); + return Result.error("任务编号id必传"); } if(!StringUtils.hasText(shareKey)){ - //tips.setFailureMsg("分享码shareKey必传"); + //return Result.error("分享码shareKey必传"); } if(tips.isOk()){ @@ -510,7 +510,7 @@ public class XmTaskController { String id=(String) xmTask.get("id"); if(!StringUtils.hasText(id)){ - tips.setFailureMsg("任务编号id必传"); + return Result.error("任务编号id必传"); } if(tips.isOk()){ @@ -536,7 +536,7 @@ public class XmTaskController { if(!StringUtils.hasText(xmTaskVo.getNtype())){ - tips.setFailureMsg("节点类型ntype不能为空"); + return Result.error("节点类型ntype不能为空"); m.put("tips", tips); return m; } @@ -546,15 +546,15 @@ public class XmTaskController { Set words=sensitiveWordService.getSensitiveWord(xmTaskVo.getName()); if(words!=null && words.size()>0){ - return failed("name-sensitive-word","名字有敏感词"+words+",请修改后再提交"); + return Result.error("name-sensitive-word","名字有敏感词"+words+",请修改后再提交"); } words=sensitiveWordService.getSensitiveWord(xmTaskVo.getRemarks()); if(words!=null && words.size()>0){ - return failed("remark-sensitive-word","备注中有敏感词"+words+",请修改后再提交"); + return Result.error("remark-sensitive-word","备注中有敏感词"+words+",请修改后再提交"); } words=sensitiveWordService.getSensitiveWord(xmTaskVo.getDescription()); if(words!=null && words.size()>0){ - return failed("description-sensitive-word","详情中有敏感词"+words+",请修改后再提交"); + return Result.error("description-sensitive-word","详情中有敏感词"+words+",请修改后再提交"); } @@ -619,7 +619,7 @@ public class XmTaskController { }else{ XmTask xmTaskQuery = new XmTask(xmTaskVo.getId()); if(this.xmTaskService.countByWhere(xmTaskQuery)>0){ - tips.setFailureMsg("编号重复，请修改编号再提交"); + return Result.error("编号重复，请修改编号再提交"); throw new BizException(tips); } } @@ -705,7 +705,7 @@ public class XmTaskController { User user=LoginUtils.getCurrentUserInfo(); if(!StringUtils.hasText(xmTask.getId())){ - tips.setFailureMsg("任务编号不能为空"); + return Result.error("任务编号不能为空"); m.put("tips", tips); return m; } @@ -748,13 +748,13 @@ public class XmTaskController { User user=LoginUtils.getCurrentUserInfo(); if(!StringUtils.hasText(xmTaskVo.getId())){ - tips.setFailureMsg("任务编号不能为空"); + return Result.error("任务编号不能为空"); m.put("tips", tips); return m; } XmTask xmTaskDb=this.xmTaskService.selectOneObject(xmTaskVo); if(xmTaskDb==null){ - tips.setFailureMsg("该任务不存在"); + return Result.error("该任务不存在"); m.put("tips", tips); return m; } @@ -793,7 +793,7 @@ public class XmTaskController { User user=LoginUtils.getCurrentUserInfo(); if(!StringUtils.hasText(xmTaskVo.getId())){ - tips.setFailureMsg("任务编号不能为空"); + return Result.error("任务编号不能为空"); m.put("tips", tips); return m; } @@ -848,7 +848,7 @@ public class XmTaskController { User user=LoginUtils.getCurrentUserInfo(); if(!StringUtils.hasText(xmTask.getId())){ - tips.setFailureMsg("任务编号不能为空"); + return Result.error("任务编号不能为空"); m.put("tips", tips); return m; } @@ -881,7 +881,7 @@ public class XmTaskController { User user=LoginUtils.getCurrentUserInfo(); if(!StringUtils.hasText(xmTask.getId())){ - tips.setFailureMsg("任务编号不能为空"); + return Result.error("任务编号不能为空"); m.put("tips", tips); return m; } @@ -917,7 +917,7 @@ public class XmTaskController { List xmTasks=batchImportVo.getXmTasks(); User user=LoginUtils.getCurrentUserInfo(); if(xmTasks==null || xmTasks.size()==0){ - tips.setFailureMsg("任务列表不能为空"); + return Result.error("任务列表不能为空"); m.put("tips", tips); return m; } @@ -999,7 +999,7 @@ public class XmTaskController { if("0".equals(batchImportVo.getPtype())&&totalTaskBudgetAt.compareTo(BigDecimal.ZERO)>0){ tips=xmTaskService.judgetProjectBudget(projectId,totalTaskBudgetAt,tasksLvl1.stream().map(i->i.getId()).collect(Collectors.toList())); if(!tips.isOk()){ - tips.setFailureMsg(tips.getMsg()+" 相关任务【"+tasksLvl1.stream().map(i->i.getName()).collect(Collectors.joining(","))+"】"); + return Result.error(tips.getMsg()+" 相关任务【"+tasksLvl1.stream().map(i->i.getName()).collect(Collectors.joining(","))+"】"); return ResponseHelper.failed(tips); } } @@ -1133,9 +1133,9 @@ public class XmTaskController { msgs.add("以下"+noAllowTasks.size()+"个任务无权操作，只有任务负责人、项目经理、组长可以批量将任务与项目计划进行关联,【"+noAllowTasks.stream().map(i->i.getName()).collect(Collectors.joining(","))+"】"); } if(allowTasks.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining(" "))); + return Result.ok(msgs.stream().collect(Collectors.joining(" "))); }else{ - tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" "))); + return Result.error(msgs.stream().collect(Collectors.joining(" "))); } return Result.ok(); @@ -1228,9 +1228,9 @@ public class XmTaskController { msgs.add("以下"+noAllowTasks.size()+"个任务无权操作，只有任务负责人、项目经理、组长、产品组组长、需求管理组人员可以批量将任务与需求进行关联,【"+noAllowTasks.stream().map(i->i.getName()).collect(Collectors.joining(","))+"】"); } if(allowTasks.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining(" "))); + return Result.ok(msgs.stream().collect(Collectors.joining(" "))); }else{ - tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" "))); + return Result.error(msgs.stream().collect(Collectors.joining(" "))); } } @@ -1248,7 +1248,7 @@ public class XmTaskController { User user=LoginUtils.getCurrentUserInfo(); if(xmTasks==null || xmTasks.size()==0){ - tips.setFailureMsg("任务列表不能为空"); + return Result.error("任务列表不能为空"); m.put("tips", tips); return m; } @@ -1334,9 +1334,9 @@ public class XmTaskController { msgs.add(String.format("以下%s个任务无权限删除，原因【%s】",noOper.size(),noTipsMap.keySet().stream().collect(Collectors.joining(";")))); } if(canDelNodes.size()==0){ - tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" "))); + return Result.error(msgs.stream().collect(Collectors.joining(" "))); }else{ - tips.setOkMsg(msgs.stream().collect(Collectors.joining(" "))); + return Result.ok(msgs.stream().collect(Collectors.joining(" "))); } return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); @@ -1356,7 +1356,7 @@ public class XmTaskController { User user=LoginUtils.getCurrentUserInfo(); if(xmTasks==null || xmTasks.size()==0){ - tips.setFailureMsg("任务列表不能为空"); + return Result.error("任务列表不能为空"); m.put("tips", tips); return m; } @@ -1430,7 +1430,7 @@ public class XmTaskController { if("0".equals(xmTaskDb.getPtype()) && totalTaskBudgetAt.compareTo(BigDecimal.ZERO)>0){ tips=xmTaskService.judgetProjectBudget(xmTaskDb.getProjectId(),totalTaskBudgetAt,tasksLvl1.stream().map(i->i.getId()).collect(Collectors.toList())); if(!tips.isOk()){ - tips.setFailureMsg(tips.getMsg()+" 相关任务【"+tasksLvl1.stream().map(i->i.getName()).collect(Collectors.joining(","))+"】"); + return Result.error(tips.getMsg()+" 相关任务【"+tasksLvl1.stream().map(i->i.getName()).collect(Collectors.joining(","))+"】"); return ResponseHelper.failed(tips); } } @@ -1476,11 +1476,11 @@ public class XmTaskController { } if(canOpTasks.size()<=0){ - tips.setFailureMsg("成功修改0个任务。当前任务均无权限操作，只有组长助理、组长、项目助理、项目经理有权限批量修改预算。"); + return Result.error("成功修改0个任务。当前任务均无权限操作，只有组长助理、组长、项目助理、项目经理有权限批量修改预算。"); }else if(canOpTasks.size()==xmTasks.size()){ - tips.setOkMsg("成功修改"+canOpTasks.size()+"个任务。"); + return Result.ok("成功修改"+canOpTasks.size()+"个任务。"); }else { - tips.setOkMsg("成功修改"+canOpTasks.size()+"个任务。其中以下任务无权限修改。【"+noAllowTasksDbMap.values().stream().map(i->i.getName()).collect(Collectors.joining(","))+"】"); + return Result.ok("成功修改"+canOpTasks.size()+"个任务。其中以下任务无权限修改。【"+noAllowTasksDbMap.values().stream().map(i->i.getName()).collect(Collectors.joining(","))+"】"); } } @@ -1499,7 +1499,7 @@ public class XmTaskController { User user=LoginUtils.getCurrentUserInfo(); if(xmTasksVo.getTaskIds()==null || xmTasksVo.getTaskIds().size()==0){ - tips.setFailureMsg("任务列表不能为空"); + return Result.error("任务列表不能为空"); m.put("tips", tips); return m; } @@ -1596,9 +1596,9 @@ public class XmTaskController { msgs.add("以下"+sameParentTasks.size()+"个计划任务已属于【"+parentTask.getName()+"】之下，无需变更，【"+sameParentTasks.stream().map(i->i.getName()).collect(Collectors.joining(","))+"】"); } if(allowTasksDbMap3.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining(" "))); + return Result.ok(msgs.stream().collect(Collectors.joining(" "))); }else{ - tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" "))); + return Result.error(msgs.stream().collect(Collectors.joining(" "))); } return Result.ok(); @@ -1635,7 +1635,7 @@ public class XmTaskController { tips=e.getTips(); logger.error("执行异常",e); }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); + return Result.error(e.getMessage()); logger.error("执行异常",e); } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskEvalController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskEvalController.java index 689ce703..cfe05ef8 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskEvalController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskEvalController.java @@ -121,24 +121,24 @@ public class XmTaskEvalController { } if(createPk==false){ if(xmTaskEvalService.selectOneObject(xmTaskEval) !=null ){ - return failed("pk-exists","编号重复，请修改编号再提交"); + return Result.error("pk-exists","编号重复，请修改编号再提交"); } } if(!StringUtils.hasText(xmTaskEval.getTaskId())){ - return failed("taskId-0","任务编号不能为空"); + return Result.error("taskId-0","任务编号不能为空"); } if(!StringUtils.hasText(xmTaskEval.getToUserid())){ - return failed("toUserid-0","被评价人编号不能为空"); + return Result.error("toUserid-0","被评价人编号不能为空"); } Set words=sensitiveWordService.getSensitiveWord(xmTaskEval.getRemark()); if(words!=null && words.size()>0){ - return failed("remark-sensitive-word","评论存在敏感词"+words+"，请修改再提交"); + return Result.error("remark-sensitive-word","评论存在敏感词"+words+"，请修改再提交"); } User user = LoginUtils.getCurrentUserInfo(); User toUser=sysClient.getUserByUserid(xmTaskEval.getToUserid()); if(toUser==null){ - return failed("toUser-0","被评价人不存在"); + return Result.error("toUser-0","被评价人不存在"); } xmTaskEval.setEvalTime(new Date()); xmTaskEval.setEvalUserid(user.getUserid()); @@ -158,11 +158,11 @@ public class XmTaskEvalController { public Result delXmTaskEval(@RequestBody XmTaskEval xmTaskEval){ if(!StringUtils.hasText(xmTaskEval.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmTaskEval xmTaskEvalDb = xmTaskEvalService.selectOneObject(xmTaskEval); if( xmTaskEvalDb == null ){ - return failed("data-not-exists","数据不存在，无法删除"); + return Result.error("data-not-exists","数据不存在，无法删除"); } xmTaskEvalService.deleteByPk(xmTaskEval); return Result.ok(); @@ -177,11 +177,11 @@ public class XmTaskEvalController { public Result editXmTaskEval(@RequestBody XmTaskEval xmTaskEval) { if(!StringUtils.hasText(xmTaskEval.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmTaskEval xmTaskEvalDb = xmTaskEvalService.selectOneObject(xmTaskEval); if( xmTaskEvalDb == null ){ - return failed("data-not-exists","数据不存在，无法修改"); + return Result.error("data-not-exists","数据不存在，无法修改"); } xmTaskEvalService.updateSomeFieldByPk(xmTaskEval); @@ -197,26 +197,26 @@ public class XmTaskEvalController { List ids= (List) xmTaskEvalMap.get("ids"); if(ids==null || ids.size()==0){ - return failed("ids-0","ids不能为空"); + return Result.error("ids-0","ids不能为空"); } Set fields=new HashSet<>(); fields.add("id"); for (String fieldName : xmTaskEvalMap.keySet()) { if(fields.contains(fieldName)){ - return failed(fieldName+"-no-edit",fieldName+"不允许修改"); + return Result.error(fieldName+"-no-edit",fieldName+"不允许修改"); } } Set fieldKey=xmTaskEvalMap.keySet().stream().filter(i-> fieldsMap.containsKey(i)).collect(Collectors.toSet()); fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmTaskEvalMap.get(i) )).collect(Collectors.toSet()); if(fieldKey.size()<=0) { - return failed("fieldKey-0","没有需要更新的字段"); + return Result.error("fieldKey-0","没有需要更新的字段"); } XmTaskEval xmTaskEval = fromMap(xmTaskEvalMap,XmTaskEval.class); List xmTaskEvalsDb=xmTaskEvalService.selectListByIds(ids); if(xmTaskEvalsDb==null ||xmTaskEvalsDb.size()==0){ - return failed("data-0","记录已不存在"); + return Result.error("data-0","记录已不存在"); } List can=new ArrayList<>(); List no=new ArrayList<>(); @@ -241,9 +241,9 @@ public class XmTaskEvalController { msgs.add(String.format("以下%s个数据无权限更新",no.size())); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } // return Result.ok(); @@ -260,7 +260,7 @@ public class XmTaskEvalController { if(xmTaskEvals.size()<=0){ - return failed("data-0","请上送待删除数据列表"); + return Result.error("data-0","请上送待删除数据列表"); } List datasDb=xmTaskEvalService.selectListByIds(xmTaskEvals.stream().map(i-> i.getId() ).collect(Collectors.toList())); @@ -283,19 +283,12 @@ public class XmTaskEvalController { msgs.add(String.format("以下%s条数据不能删除.【%s】",no.size(),no.stream().map(i-> i.getId() ).collect(Collectors.joining(",")))); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } - }catch (BizException e) { - tips=e.getTips(); - logger.error("",e); - }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); - logger.error("",e); - } - m.put("tips", tips); - return m; + return Result.ok(); + } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java index a205fd8c..2e0a6ef4 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java @@ -168,7 +168,7 @@ public class XmTaskExecuserController { User user=LoginUtils.getCurrentUserInfo(); XmTask xmTaskDb=xmTaskService.selectOneObject(new XmTask(xmTaskExecuser.getTaskId())); if(xmTaskDb==null){ - tips.setFailureMsg("任务已不存在"); + return Result.error("任务已不存在"); m.put("tips", tips); return m; } @@ -177,7 +177,7 @@ public class XmTaskExecuserController { xmTaskExecuser.setProjectId(projectId); xmTaskExecuser.setBranchId(xmProjectDb.getBranchId()); if(!"0".equals(xmTaskDb.getTaskState()) && !"1".equals(xmTaskDb.getTaskState()) ){ - tips.setFailureMsg("该任务已经处于完工、结算状态，不允许再修改"); + return Result.error("该任务已经处于完工、结算状态，不允许再修改"); m.put("tips", tips); return m; } @@ -245,7 +245,7 @@ public class XmTaskExecuserController { public Result leave(@RequestBody List xmTaskExecusers) { if(xmTaskExecusers==null || xmTaskExecusers.size()==0){ - tips.setFailureMsg("执行人列表不能为空"); + return Result.error("执行人列表不能为空"); m.put("tips", tips); return m; } @@ -257,7 +257,7 @@ public class XmTaskExecuserController { String taskId=xmTaskExecuserListDb.get(0).getTaskId(); XmTask xmTask= xmTaskService.selectOneObject(new XmTask(xmTaskExecuserListDb.get(0).getTaskId())); if(xmTask==null ){ - tips.setFailureMsg("任务已不存在"); + return Result.error("任务已不存在"); m.put("tips", tips); return m; } @@ -267,7 +267,7 @@ public class XmTaskExecuserController { for (XmTaskExecuser xmTaskExecuser : xmTaskExecuserListDb) { if(!taskId.equals(xmTaskExecuser.getTaskId())){ - tips.setFailureMsg("批量操作只允许在同一个任务进行"); + return Result.error("批量操作只允许在同一个任务进行"); break; } if(!user.getUserid().equals(xmTaskExecuser.getUserid())) {//只有组长、任务责任人可以请别人请离开任务 @@ -297,9 +297,9 @@ public class XmTaskExecuserController { msgs.add("以下人员您无权操作，【"+allowUserNamesStr+"】;"); } if(allowUserNames.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining(" "))); + return Result.ok(msgs.stream().collect(Collectors.joining(" "))); }else{ - tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" "))); + return Result.error(msgs.stream().collect(Collectors.joining(" "))); } return Result.ok(); @@ -320,13 +320,13 @@ public class XmTaskExecuserController { String taskId=xmTaskExecuser.getTaskId(); XmTask xmTask= xmTaskService.selectOneObject(new XmTask(taskId)); if(xmTask==null ){ - tips.setFailureMsg("任务已不存在"); + return Result.error("任务已不存在"); m.put("tips", tips); return m; } if(!"0".equals(xmTask.getTaskState()) && !"1".equals(xmTask.getTaskState()) ){ - tips.setFailureMsg("该任务已经处于完工、结算状态，不允许再修改"); + return Result.error("该任务已经处于完工、结算状态，不允许再修改"); m.put("tips", tips); return m; } @@ -378,11 +378,11 @@ public class XmTaskExecuserController { } //一个任务只能一个执行人 xmTaskExecuserService.becomeExecute(xmTask,xmTaskExecuser); - tips.setOkMsg("变更成功"); - //tips.setFailureMsg("变更不成功，原因：候选人不在项目组中，请先将候选人加入项目团队中。"); + return Result.ok("变更成功"); + //return Result.error("变更不成功，原因：候选人不在项目组中，请先将候选人加入项目团队中。"); }else { xmTaskExecuserService.becomeExecute(xmTask,xmTaskExecuser); - tips.setOkMsg("变更成功"); + return Result.ok("变更成功"); } @@ -402,16 +402,16 @@ public class XmTaskExecuserController { String taskId=xmTaskAcceptanceVo.getTaskId(); if(!StringUtils.hasText(taskId)){ - tips.setFailureMsg("taskId-0"); + return Result.error("taskId-0"); return ResponseHelper.failed("taskId-0","任务编号不能为空"); } XmTask xmTaskDb= xmTaskService.selectOneById(taskId); if(xmTaskDb==null ){ - tips.setFailureMsg("任务已不存在"); + return Result.error("任务已不存在"); return ResponseHelper.failed(tips); } if("3".equals(xmTaskDb.getTaskState()) ||"4".equals(xmTaskDb.getTaskState()) || "9".equals(xmTaskDb.getTaskState())){ - tips.setFailureMsg("该任务已验收，不能重复验收"); + return Result.error("该任务已验收，不能重复验收"); return ResponseHelper.failed(tips); } @@ -429,7 +429,7 @@ public class XmTaskExecuserController { boolean isTaskCreater=user.getUserid().equals(xmTaskDb.getCreateUserid()); Tips tips1=groupService.checkIsProjectAdmOrTeamHeadOrAss(user,xmTaskDb.getExecutorUserid(),projectId); if( !isTaskCreater && !tips1.isOk() ) { - tips.setFailureMsg("您无权验收该任务！"); + return Result.error("您无权验收该任务！"); return ResponseHelper.failed(tips); } if("2".equals(xmTaskDb.getEstate()) && xmTaskDb.getEfunds()!=null && xmTaskDb.getEfunds().compareTo(BigDecimal.ZERO)>0){ @@ -488,12 +488,12 @@ public class XmTaskExecuserController { String taskId=xmTaskExecuser.getTaskId(); XmTask xmTask= xmTaskService.selectOneObject(new XmTask(taskId)); if(xmTask==null ){ - tips.setFailureMsg("任务已不存在"); + return Result.error("任务已不存在"); m.put("tips", tips); return m; } if(!"0".equals(xmTask.getTaskState()) && !"1".equals(xmTask.getTaskState()) ){ - tips.setFailureMsg("该任务已经处于完工、结算计划，不允许再修改报价"); + return Result.error("该任务已经处于完工、结算计划，不允许再修改报价"); m.put("tips", tips); return m; } @@ -513,7 +513,7 @@ public class XmTaskExecuserController { }else { - tips.setFailureMsg("只有修改处于候选状态的投标人的报价信息"); + return Result.error("只有修改处于候选状态的投标人的报价信息"); } @@ -532,12 +532,12 @@ public class XmTaskExecuserController { String taskId=xmTaskExecuser.getTaskId(); XmTask xmTask= xmTaskService.selectOneObject(new XmTask(taskId)); if(xmTask==null ){ - tips.setFailureMsg("任务已不存在"); + return Result.error("任务已不存在"); m.put("tips", tips); return m; } if(!"0".equals(xmTask.getTaskState()) && !"1".equals(xmTask.getTaskState()) ){ - tips.setFailureMsg("该任务已经不需要候选人"); + return Result.error("该任务已经不需要候选人"); m.put("tips", tips); return m; } @@ -570,7 +570,7 @@ public class XmTaskExecuserController { String taskId=xmTaskExecuser.getTaskId(); XmTask xmTaskDb= xmTaskService.selectOneObject(new XmTask(taskId)); if(xmTaskDb==null ){ - tips.setFailureMsg("任务已不存在"); + return Result.error("任务已不存在"); m.put("tips", tips); return m; } @@ -589,11 +589,11 @@ public class XmTaskExecuserController { }else { - tips.setFailureMsg("只有候选、放弃任务、黑名单中的数据可以被删除"); + return Result.error("只有候选、放弃任务、黑名单中的数据可以被删除"); } } else { - tips.setFailureMsg("没有查到数据"); + return Result.error("没有查到数据"); } return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java index c6086072..cb67dd43 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java @@ -267,11 +267,11 @@ public class XmTaskOrderController { public Result delXmTaskOrder(@RequestBody XmTaskOrder xmTaskOrder){ if(!StringUtils.hasText(xmTaskOrder.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmTaskOrder xmTaskOrderDb = xmTaskOrderService.selectOneObject(xmTaskOrder); if( xmTaskOrderDb == null ){ - return failed("data-not-exists","数据不存在，无法删除"); + return Result.error("data-not-exists","数据不存在，无法删除"); } xmTaskOrderService.deleteByPk(xmTaskOrder); return Result.ok(); @@ -288,11 +288,11 @@ public class XmTaskOrderController { public Result editXmTaskOrder(@RequestBody XmTaskOrder xmTaskOrder) { if(!StringUtils.hasText(xmTaskOrder.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmTaskOrder xmTaskOrderDb = xmTaskOrderService.selectOneObject(xmTaskOrder); if( xmTaskOrderDb == null ){ - return failed("data-not-exists","数据不存在，无法修改"); + return Result.error("data-not-exists","数据不存在，无法修改"); } xmTaskOrderService.updateSomeFieldByPk(xmTaskOrder); @@ -310,26 +310,26 @@ public class XmTaskOrderController { List ids= (List) xmTaskOrderMap.get("ids"); if(ids==null || ids.size()==0){ - return failed("ids-0","ids不能为空"); + return Result.error("ids-0","ids不能为空"); } Set fields=new HashSet<>(); fields.add("id"); for (String fieldName : xmTaskOrderMap.keySet()) { if(fields.contains(fieldName)){ - return failed(fieldName+"-no-edit",fieldName+"不允许修改"); + return Result.error(fieldName+"-no-edit",fieldName+"不允许修改"); } } Set fieldKey=xmTaskOrderMap.keySet().stream().filter(i-> fieldsMap.containsKey(i)).collect(Collectors.toSet()); fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmTaskOrderMap.get(i) )).collect(Collectors.toSet()); if(fieldKey.size()<=0) { - return failed("fieldKey-0","没有需要更新的字段"); + return Result.error("fieldKey-0","没有需要更新的字段"); } XmTaskOrder xmTaskOrder = fromMap(xmTaskOrderMap,XmTaskOrder.class); List xmTaskOrdersDb=xmTaskOrderService.selectListByIds(ids); if(xmTaskOrdersDb==null ||xmTaskOrdersDb.size()==0){ - return failed("data-0","记录已不存在"); + return Result.error("data-0","记录已不存在"); } List can=new ArrayList<>(); List no=new ArrayList<>(); @@ -354,9 +354,9 @@ public class XmTaskOrderController { msgs.add(String.format("以下%s个数据无权限更新",no.size())); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } // return Result.ok(); @@ -375,7 +375,7 @@ public class XmTaskOrderController { if(xmTaskOrders.size()<=0){ - return failed("data-0","请上送待删除数据列表"); + return Result.error("data-0","请上送待删除数据列表"); } List datasDb=xmTaskOrderService.selectListByIds(xmTaskOrders.stream().map(i-> i.getId() ).collect(Collectors.toList())); @@ -398,19 +398,12 @@ public class XmTaskOrderController { msgs.add(String.format("以下%s条数据不能删除.【%s】",no.size(),no.stream().map(i-> i.getId() ).collect(Collectors.joining(",")))); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } - }catch (BizException e) { - tips=e.getTips(); - logger.error("",e); - }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); - logger.error("",e); - } - m.put("tips", tips); - return m; + return Result.ok(); + } */ @@ -424,7 +417,7 @@ public class XmTaskOrderController { if(!StringUtils.hasText(orderId)) { - return failed("data-0","订单Id不能为空"); + return Result.error("data-0","订单Id不能为空"); } XmTaskOrder moOrder = xmTaskOrderService.selectOneById(orderId); m.put("tips", tips); @@ -442,11 +435,11 @@ public class XmTaskOrderController { try { if(!StringUtils.hasText(order.getId())) { - return failed("data-0","订单Id不能为空"); + return Result.error("data-0","订单Id不能为空"); } String flag= (String) this.redisTemplate.opsForValue().get("pay-notify-success-"+order.getPayId()); if(!StringUtils.hasText(flag)|| !"1".equals(flag)){ - return failed("pay-notify-success-flag-0","验证码错误"); + return Result.error("pay-notify-success-flag-0","验证码错误"); } xmTaskOrderService.orderPaySuccess(order.getId(),order.getPayId(),order.getPrepayId(), order.getTranId(), order.getPayAt(), order.getRemark()); @@ -454,10 +447,10 @@ public class XmTaskOrderController { return m; }catch (BizException e) { logger.error("",e); - return failed("data-0",e.getMessage()); + return Result.error("data-0",e.getMessage()); } catch (Exception e) { logger.error("",e); - return failed("data-0", "开通模块失败"); + return Result.error("data-0", "开通模块失败"); } } @@ -471,21 +464,21 @@ public class XmTaskOrderController { try { if(!StringUtils.hasText(order.getId())) { - return failed("data-0","订单Id不能为空"); + return Result.error("data-0","订单Id不能为空"); } String flag= (String) this.redisTemplate.opsForValue().get("pay-notify-cancel-"+order.getPayId()); if(!StringUtils.hasText(flag)|| !"1".equals(flag)){ - return failed("pay-notify-cancel-flag-0","验证码错误"); + return Result.error("pay-notify-cancel-flag-0","验证码错误"); } this.xmTaskOrderService.payCancel(order.getId(),order.getPayId(), order.getRemark()); m.put("tips", tips); return m; }catch (BizException e) { logger.error("",e); - return failed("data-0",e.getMessage()); + return Result.error("data-0",e.getMessage()); } catch (Exception e) { logger.error("",e); - return failed("data-0", "付款取消操作失败"); + return Result.error("data-0", "付款取消操作失败"); } } @ApiOperation( value = "修改订单的第三方流水号",notes=" ") @@ -497,7 +490,7 @@ public class XmTaskOrderController { if(!StringUtils.hasText(order.getId())) { - return failed("data-0","订单Id不能为空"); + return Result.error("data-0","订单Id不能为空"); } XmTaskOrder moOrder = new XmTaskOrder(); moOrder.setId(order.getId()); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java index f8ac2d32..21759d89 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java @@ -106,7 +106,7 @@ public class XmTaskSbillController { } if(createPk==false){ if(xmTaskSbillService.selectOneObject(xmTaskSbill) !=null ){ - tips.setFailureMsg("编号重复，请修改编号再提交"); + return Result.error("编号重复，请修改编号再提交"); m.put("tips", tips); return m; } @@ -141,18 +141,18 @@ public class XmTaskSbillController { if( xmTaskSbill==null || !StringUtils.hasText(xmTaskSbill.getId())){ - tips.setFailureMsg("请上送结算单编号"); + return Result.error("请上送结算单编号"); m.put("tips", tips); return m; } XmTaskSbill sbillDb=this.xmTaskSbillService.selectOneById(xmTaskSbill.getId()); if(!"0".equals(sbillDb.getStatus())){ - tips.setFailureMsg("只有待提交的结算单才能删除"); + return Result.error("只有待提交的结算单才能删除"); m.put("tips", tips); return m; } if(!("0".equals(sbillDb.getBizFlowState()) || "4".equals(sbillDb.getBizFlowState()))){ - tips.setFailureMsg("已发审数据不允许删除"); + return Result.error("已发审数据不允许删除"); m.put("tips", tips); return m; } @@ -303,19 +303,19 @@ public class XmTaskSbillController { if( xmTaskSbill==null || !StringUtils.hasText(xmTaskSbill.getId())){ - tips.setFailureMsg("请上送结算单编号"); + return Result.error("请上送结算单编号"); m.put("tips", tips); return m; } XmTaskSbill sbillDb=this.xmTaskSbillService.selectOneById(xmTaskSbill.getId()); if(!"0".equals(sbillDb.getStatus())){ - tips.setFailureMsg("只能修改待提交的结算单"); + return Result.error("只能修改待提交的结算单"); m.put("tips", tips); return m; } if(!("0".equals(sbillDb.getBizFlowState()) || "4".equals(sbillDb.getBizFlowState()))){ - tips.setFailureMsg("已发审数据不允许修改"); + return Result.error("已发审数据不允许修改"); m.put("tips", tips); return m; } @@ -341,7 +341,7 @@ public class XmTaskSbillController { tips=e.getTips(); logger.error("",e); }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); + return Result.error(e.getMessage()); logger.error("",e); } @@ -359,7 +359,7 @@ public class XmTaskSbillController { String sbillId= (String) paramMap.get("sbillId"); if( !StringUtils.hasText(sbillId)){ - tips.setFailureMsg("结算单ID必传"); + return Result.error("结算单ID必传"); map.put("tips", tips); return map; } @@ -372,7 +372,7 @@ public class XmTaskSbillController { tips=e.getTips(); logger.error("执行异常",e); }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); + return Result.error(e.getMessage()); logger.error("执行异常",e); } map.put("tips", tips); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java index 0c1069b0..8d6886fd 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java @@ -85,7 +85,7 @@ public class XmTaskSbillDetailController { String bizYear= (String) params.get("bizYear"); if(!StringUtils.hasText(bizYear)){ - return failed("bizYear-0","年份不能为空"); + return Result.error("bizYear-0","年份不能为空"); } User user=LoginUtils.getCurrentUserInfo(); params.put("branchId",user.getBranchId()); @@ -150,7 +150,7 @@ public class XmTaskSbillDetailController { } if(createPk==false){ if(xmTaskSbillDetailService.selectOneObject(xmTaskSbillDetail) !=null ){ - return failed("pk-exists","编号重复，请修改编号再提交"); + return Result.error("pk-exists","编号重复，请修改编号再提交"); } } xmTaskSbillDetailService.insert(xmTaskSbillDetail); @@ -176,11 +176,11 @@ public class XmTaskSbillDetailController { public Result editXmTaskSbillDetail(@RequestBody XmTaskSbillDetail xmTaskSbillDetail) { if(!StringUtils.hasText(xmTaskSbillDetail.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmTaskSbillDetail xmTaskSbillDetailDb = xmTaskSbillDetailService.selectOneObject(xmTaskSbillDetail); if( xmTaskSbillDetailDb == null ){ - return failed("data-not-exists","数据不存在，无法修改"); + return Result.error("data-not-exists","数据不存在，无法修改"); } xmTaskSbillDetailService.updateSomeFieldByPk(xmTaskSbillDetail); @@ -196,7 +196,7 @@ public class XmTaskSbillDetailController { List ids= (List) xmTaskSbillDetailMap.get("ids"); if(ids==null || ids.size()==0){ - return failed("ids-0","ids不能为空"); + return Result.error("ids-0","ids不能为空"); } Set fields=new HashSet<>(); @@ -209,14 +209,14 @@ public class XmTaskSbillDetailController { fields.add("projectId"); for (String fieldName : xmTaskSbillDetailMap.keySet()) { if(fields.contains(fieldName)){ - return failed(fieldName+"-no-edit",fieldName+"不允许修改"); + return Result.error(fieldName+"-no-edit",fieldName+"不允许修改"); } } Set fieldKey=xmTaskSbillDetailMap.keySet().stream().filter(i-> fieldsMap.containsKey(i)).collect(Collectors.toSet()); fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmTaskSbillDetailMap.get(i) )).collect(Collectors.toSet()); if(fieldKey.size()<=0) { - return failed("fieldKey-0","没有需要更新的字段"); + return Result.error("fieldKey-0","没有需要更新的字段"); } String sstatus= (String) xmTaskSbillDetailMap.get("sstatus"); if(StringUtils.hasText(sstatus)){ @@ -227,11 +227,11 @@ public class XmTaskSbillDetailController { XmTaskSbillDetail xmTaskSbillDetail = fromMap(xmTaskSbillDetailMap,XmTaskSbillDetail.class); List xmTaskSbillDetailsDb=xmTaskSbillDetailService.selectListByIds(ids); if(xmTaskSbillDetailsDb==null ||xmTaskSbillDetailsDb.size()==0){ - return failed("data-0","记录已不存在"); + return Result.error("data-0","记录已不存在"); } if(fieldKey.contains("othFee")){ if(xmTaskSbillDetailsDb.size()>1){ - return failed("data-not-1","其他费用的修改只能一次修改一条记录，不能批量修改"); + return Result.error("data-not-1","其他费用的修改只能一次修改一条记录，不能批量修改"); }else{ XmTaskSbillDetail detail=xmTaskSbillDetailsDb.get(0); this.xmTaskSbillDetailService.preCalcSamt(detail); @@ -263,9 +263,9 @@ public class XmTaskSbillDetailController { msgs.add(String.format("以下%s个数据无权限更新",no.size())); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } // return Result.ok(); @@ -283,19 +283,19 @@ public class XmTaskSbillDetailController { User user=LoginUtils.getCurrentUserInfo(); if(xmTaskSbillDetails.size()<=0){ - return failed("data-0","请上送待删除数据列表"); + return Result.error("data-0","请上送待删除数据列表"); } List datasDb=xmTaskSbillDetailService.selectListByIds(xmTaskSbillDetails.stream().map(i-> i.getId() ).collect(Collectors.toList())); String sbillId=datasDb.get(0).getSbillId(); if(datasDb.stream().filter(i->!sbillId.equals(i.getSbillId())).findAny().isPresent()){ - return failed("sbillId-0","只能删除同一个结算单的清单"); + return Result.error("sbillId-0","只能删除同一个结算单的清单"); } XmTaskSbill xmTaskSbill=xmTaskSbillService.selectOneById(sbillId); if(!user.getUserid().equals(xmTaskSbill.getCuserid())){ - return failed("sbillId-0","该结算单不是您创建的，您不能删除其清单"); + return Result.error("sbillId-0","该结算单不是您创建的，您不能删除其清单"); } if(!"0".equals(xmTaskSbill.getStatus())){ - return failed("status-not-0","结算单已提交，不允许更改"); + return Result.error("status-not-0","结算单已提交，不允许更改"); } List can=new ArrayList<>(); List no=new ArrayList<>(); @@ -316,18 +316,11 @@ public class XmTaskSbillDetailController { msgs.add(String.format("以下%s条数据不能删除.【%s】",no.size(),no.stream().map(i-> i.getId() ).collect(Collectors.joining(",")))); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } - }catch (BizException e) { - tips=e.getTips(); - logger.error("",e); - }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); - logger.error("",e); - } - m.put("tips", tips); - return m; + return Result.ok(); + } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSkillController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSkillController.java index 6d2e2919..e67034ac 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSkillController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSkillController.java @@ -88,7 +88,7 @@ public class XmTaskSkillController { }else{ XmTaskSkill xmTaskSkillQuery = new XmTaskSkill(xmTaskSkill.getId()); if(xmTaskSkillService.countByWhere(xmTaskSkillQuery)>0){ - tips.setFailureMsg("编号重复，请修改编号再提交"); + return Result.error("编号重复，请修改编号再提交"); m.put("tips", tips); return m; } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java index 72142c1f..08fe9f78 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java @@ -97,7 +97,7 @@ public class XmTestCaseController { if("func_id".equals(groupBy) || "menu_id".equals(groupBy) || "cuserid".equals(groupBy)){ }else { - return failed("groupBy-0","分组参数错误"); + return Result.error("groupBy-0","分组参数错误"); } List> xmTestCaseList = xmTestCaseService.getXmTestCaseSort(xmTestCase); //列出XmTestCase列表 @@ -135,13 +135,13 @@ public class XmTestCaseController { xmTestCase.setId(xmTestCaseService.createKey("id")); if(StringUtils.isEmpty(xmTestCase.getProductId())){ - return failed("productId-0","产品编号不能为空"); + return Result.error("productId-0","产品编号不能为空"); } User user=LoginUtils.getCurrentUserInfo(); XmProduct xmProductDb=productService.getProductFromCache(xmTestCase.getProductId()); tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCase.getCuserid(),xmTestCase.getCusername(),xmTestCase.getCbranchId()); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } if(!StringUtils.hasText(xmTestCase.getCuserid())){ xmTestCase.setCuserid(user.getUserid()); @@ -170,11 +170,11 @@ public class XmTestCaseController { public Result delXmTestCase(@RequestBody XmTestCase xmTestCase){ if(!StringUtils.hasText(xmTestCase.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmTestCase xmTestCaseDb = xmTestCaseService.selectOneObject(xmTestCase); if( xmTestCaseDb == null ){ - return failed("data-not-exists","数据不存在，无法删除"); + return Result.error("data-not-exists","数据不存在，无法删除"); } User user=LoginUtils.getCurrentUserInfo(); XmProduct xmProductDb=productService.getProductFromCache(xmTestCaseDb.getProductId()); @@ -182,7 +182,7 @@ public class XmTestCaseController { if(!isPm){ tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCaseDb.getCuserid(),xmTestCaseDb.getCusername(),xmTestCaseDb.getCbranchId()); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } } xmTestCaseService.deleteByPk(xmTestCase); @@ -198,11 +198,11 @@ public class XmTestCaseController { public Result editXmTestCase(@RequestBody XmTestCase xmTestCase) { if(!StringUtils.hasText(xmTestCase.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmTestCase xmTestCaseDb = xmTestCaseService.selectOneById(xmTestCase); if( xmTestCaseDb == null ){ - return failed("data-not-exists","数据不存在，无法修改"); + return Result.error("data-not-exists","数据不存在，无法修改"); } User user=LoginUtils.getCurrentUserInfo(); XmProduct xmProductDb=productService.getProductFromCache(xmTestCaseDb.getProductId()); @@ -210,7 +210,7 @@ public class XmTestCaseController { if(!isPm){ tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCaseDb.getCuserid(),xmTestCaseDb.getCusername(),null); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } } @@ -234,26 +234,26 @@ public class XmTestCaseController { List ids= (List) xmTestCaseMap.get("ids"); if(ids==null || ids.size()==0){ - return failed("ids-0","ids不能为空"); + return Result.error("ids-0","ids不能为空"); } Set fields=new HashSet<>(); fields.add("id"); for (String fieldName : xmTestCaseMap.keySet()) { if(fields.contains(fieldName)){ - return failed(fieldName+"-no-edit",fieldName+"不允许修改"); + return Result.error(fieldName+"-no-edit",fieldName+"不允许修改"); } } Set fieldKey=xmTestCaseMap.keySet().stream().filter(i-> fieldsMap.containsKey(i)).collect(Collectors.toSet()); fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmTestCaseMap.get(i) )).collect(Collectors.toSet()); if(fieldKey.size()<=0) { - return failed("fieldKey-0","没有需要更新的字段"); + return Result.error("fieldKey-0","没有需要更新的字段"); } XmTestCase xmTestCase = fromMap(xmTestCaseMap,XmTestCase.class); List xmTestCasesDb=xmTestCaseService.selectListByIds(ids); if(xmTestCasesDb==null ||xmTestCasesDb.size()==0){ - return failed("data-0","记录已不存在"); + return Result.error("data-0","记录已不存在"); } List can=new ArrayList<>(); List no=new ArrayList<>(); @@ -261,13 +261,13 @@ public class XmTestCaseController { User user = LoginUtils.getCurrentUserInfo(); XmTestCase xmTestCaseDb2=xmTestCasesDb.get(0); if(xmTestCasesDb.stream().filter(k->!k.getProductId().equals(xmTestCaseDb2.getProductId())).findAny().isPresent()){ - return failed("product-no-same","批量操作所有测试用例必须都在同一个产品下。"); + return Result.error("product-no-same","批量操作所有测试用例必须都在同一个产品下。"); } XmProduct xmProductDb=productService.getProductFromCache(xmTestCaseDb2.getProductId()); if( StringUtils.hasText(xmTestCase.getCuserid()) ){ tips=this.productQxService.checkProductQx(xmProductDb,1,user,xmTestCase.getCuserid(),xmTestCase.getCusername(),null); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } } boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid()); @@ -297,9 +297,9 @@ public class XmTestCaseController { msgs.add(String.format("以下%s个数据无权限更新,原因【%s】",no.size(),noTipsMap.keySet().stream().collect(Collectors.joining(";")))); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } // return Result.ok(); @@ -316,13 +316,13 @@ public class XmTestCaseController { if(xmTestCases.size()<=0){ - return failed("data-0","请上送待删除数据列表"); + return Result.error("data-0","请上送待删除数据列表"); } List datasDb=xmTestCaseService.selectListByIds(xmTestCases.stream().map(i-> i.getId() ).collect(Collectors.toList())); User user = LoginUtils.getCurrentUserInfo(); XmTestCase xmTestCaseDb2=datasDb.get(0); if(datasDb.stream().filter(k->!k.getProductId().equals(xmTestCaseDb2.getProductId())).findAny().isPresent()){ - return failed("product-no-same","批量操作所有测试用例必须都在同一个产品下。"); + return Result.error("product-no-same","批量操作所有测试用例必须都在同一个产品下。"); } XmProduct xmProductDb=productService.getProductFromCache(xmTestCaseDb2.getProductId()); boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid()); @@ -354,18 +354,11 @@ public class XmTestCaseController { msgs.add(String.format("以下%s条数据无权限删除.原因【%s】",no.size(), noTipsMap.keySet().stream().collect(Collectors.joining(";")))); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } - }catch (BizException e) { - tips=e.getTips(); - logger.error("",e); - }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); - logger.error("",e); - } - m.put("tips", tips); - return m; + return Result.ok(); + } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java index c168ff4f..f4462fbf 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java @@ -99,11 +99,11 @@ public class XmTestCasedbController { } if(createPk==false){ if(xmTestCasedbService.selectOneObject(xmTestCasedb) !=null ){ - return failed("pk-exists","编号重复，请修改编号再提交"); + return Result.error("pk-exists","编号重复，请修改编号再提交"); } } if(!StringUtils.hasText(xmTestCasedb.getProductId())){ - return failed("productId-0","产品编号不能为空"); + return Result.error("productId-0","产品编号不能为空"); } User user=LoginUtils.getCurrentUserInfo(); XmProduct xmProductDb=productService.getProductFromCache(xmTestCasedb.getProductId()); @@ -111,7 +111,7 @@ public class XmTestCasedbController { if(!isPm){ tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCasedb.getCuserid(),xmTestCasedb.getCusername(),xmTestCasedb.getCbranchId()); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } } xmTestCasedb.setPbranchId(xmProductDb.getBranchId()); @@ -131,11 +131,11 @@ public class XmTestCasedbController { public Result delXmTestCasedb(@RequestBody XmTestCasedb xmTestCasedb){ if(!StringUtils.hasText(xmTestCasedb.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmTestCasedb xmTestCasedbDb = xmTestCasedbService.selectOneObject(xmTestCasedb); if( xmTestCasedbDb == null ){ - return failed("data-not-exists","数据不存在，无法删除"); + return Result.error("data-not-exists","数据不存在，无法删除"); } User user=LoginUtils.getCurrentUserInfo(); XmProduct xmProductDb=productService.getProductFromCache(xmTestCasedbDb.getProductId()); @@ -143,7 +143,7 @@ public class XmTestCasedbController { if(!isPm){ tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCasedbDb.getCuserid(),xmTestCasedbDb.getCusername(),xmTestCasedbDb.getCbranchId()); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } } xmTestCasedbService.deleteByPk(xmTestCasedb); @@ -159,11 +159,11 @@ public class XmTestCasedbController { public Result editXmTestCasedb(@RequestBody XmTestCasedb xmTestCasedb) { if(!StringUtils.hasText(xmTestCasedb.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmTestCasedb xmTestCasedbDb = xmTestCasedbService.selectOneObject(xmTestCasedb); if( xmTestCasedbDb == null ){ - return failed("data-not-exists","数据不存在，无法修改"); + return Result.error("data-not-exists","数据不存在，无法修改"); } User user=LoginUtils.getCurrentUserInfo(); @@ -172,13 +172,13 @@ public class XmTestCasedbController { if(StringUtils.hasText(xmTestCasedb.getCuserid())){ tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCasedb.getCuserid(),xmTestCasedb.getCusername(),xmTestCasedb.getCbranchId()); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } } if(!isPm){ tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCasedbDb.getCuserid(),xmTestCasedbDb.getCusername(),xmTestCasedbDb.getCbranchId()); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } } xmTestCasedbService.updateSomeFieldByPk(xmTestCasedb); @@ -195,30 +195,30 @@ public class XmTestCasedbController { List ids= (List) xmTestCasedbMap.get("ids"); if(ids==null || ids.size()==0){ - return failed("ids-0","ids不能为空"); + return Result.error("ids-0","ids不能为空"); } Set fields=new HashSet<>(); fields.add("id"); for (String fieldName : xmTestCasedbMap.keySet()) { if(fields.contains(fieldName)){ - return failed(fieldName+"-no-edit",fieldName+"不允许修改"); + return Result.error(fieldName+"-no-edit",fieldName+"不允许修改"); } } Set fieldKey=xmTestCasedbMap.keySet().stream().filter(i-> fieldsMap.containsKey(i)).collect(Collectors.toSet()); fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmTestCasedbMap.get(i) )).collect(Collectors.toSet()); if(fieldKey.size()<=0) { - return failed("fieldKey-0","没有需要更新的字段"); + return Result.error("fieldKey-0","没有需要更新的字段"); } XmTestCasedb xmTestCasedb = fromMap(xmTestCasedbMap,XmTestCasedb.class); List xmTestCasedbsDb=xmTestCasedbService.selectListByIds(ids); if(xmTestCasedbsDb==null ||xmTestCasedbsDb.size()==0){ - return failed("data-0","记录已不存在"); + return Result.error("data-0","记录已不存在"); } XmTestCasedb xmTestCasedbDb=xmTestCasedbsDb.get(0); if(xmTestCasedbsDb.stream().filter(k->!k.getProductId().equals(xmTestCasedbDb.getProductId())).findAny().isPresent()){ - return failed("product-0","批量操作只能在同一批产品中进行"); + return Result.error("product-0","批量操作只能在同一批产品中进行"); } User user = LoginUtils.getCurrentUserInfo(); @@ -226,7 +226,7 @@ public class XmTestCasedbController { if(StringUtils.hasText(xmTestCasedb.getCuserid())){ tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCasedb.getCuserid(),xmTestCasedb.getCusername(),xmTestCasedb.getCbranchId()); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } } @@ -261,9 +261,9 @@ public class XmTestCasedbController { msgs.add(String.format("以下%s个数据无权限更新",no.size())); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } // return Result.ok(); @@ -280,15 +280,15 @@ public class XmTestCasedbController { if(xmTestCasedbs.size()<=0){ - return failed("data-0","请上送待删除数据列表"); + return Result.error("data-0","请上送待删除数据列表"); } List datasDb=xmTestCasedbService.selectListByIds(xmTestCasedbs.stream().map(i-> i.getId() ).collect(Collectors.toList())); if(datasDb==null || datasDb.size()==0){ - return failed("data-0","测试库已不存在"); + return Result.error("data-0","测试库已不存在"); } XmTestCasedb xmTestCasedbDb=datasDb.get(0); if(datasDb.stream().filter(k->!k.getProductId().equals(xmTestCasedbDb.getProductId())).findAny().isPresent()){ - return failed("data-0","批量处理只能在同一个产品下进行"); + return Result.error("data-0","批量处理只能在同一个产品下进行"); } User user=LoginUtils.getCurrentUserInfo(); XmProduct xmProductDb=productService.getProductFromCache(xmTestCasedbDb.getProductId()); @@ -338,19 +338,12 @@ public class XmTestCasedbController { msgs.add(noTips.stream().collect(Collectors.joining(";"))); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining(";"))); + return Result.ok(msgs.stream().collect(Collectors.joining(";"))); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining(";"))); + return Result.error(msgs.stream().collect(Collectors.joining(";"))); } - }catch (BizException e) { - tips=e.getTips(); - logger.error("",e); - }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); - logger.error("",e); - } - m.put("tips", tips); - return m; + return Result.ok(); + } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java index 543d52c1..26deb2b9 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java @@ -201,7 +201,7 @@ public class XmTestPlanCaseController { User user=LoginUtils.getCurrentUserInfo(); XmProduct xmProductDb=productService.getProductFromCache(xmTestPlanDb.getProductId()); if(!groupService.checkUserIsProductAdm(xmProductDb,user.getUserid()) && !groupService.checkUserExistsProductGroup(xmProductDb.getId(),user.getUserid())){ - return failed("no-in-pteam","您不是产品团队成员，不能操作。"); + return Result.error("no-in-pteam","您不是产品团队成员，不能操作。"); }; //过滤掉已存在的测试用例 同一个用例不能重复添加到同一个计划中 List planCasesDb=this.xmTestPlanCaseService.selectListByCaseIdsAndPlanId(importFromTestCaseVo.getPlanId(),importFromTestCaseVo.getCaseIds() ); @@ -240,23 +240,23 @@ public class XmTestPlanCaseController { public Result delXmTestPlanCase(@RequestBody XmTestPlanCase xmTestPlanCase){ if(!StringUtils.hasText(xmTestPlanCase.getCaseId())) { - return failed("pk-not-exists","请上送主键参数caseId"); + return Result.error("pk-not-exists","请上送主键参数caseId"); } if(!StringUtils.hasText(xmTestPlanCase.getPlanId())) { - return failed("pk-not-exists","请上送主键参数planId"); + return Result.error("pk-not-exists","请上送主键参数planId"); } XmTestPlanCase xmTestPlanCaseDb = xmTestPlanCaseService.selectOneObject(xmTestPlanCase); if( xmTestPlanCaseDb == null ){ - return failed("data-not-exists","数据不存在，无法删除"); + return Result.error("data-not-exists","数据不存在，无法删除"); } XmProduct xmProductDb=productService.getProductFromCache(xmTestPlanCaseDb.getProductId()); if(xmProductDb==null){ - return failed("product-not-exists","产品已不存在"); + return Result.error("product-not-exists","产品已不存在"); } User user=LoginUtils.getCurrentUserInfo(); tips=productQxService.checkProductQx(xmProductDb,1,user); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } xmTestPlanCaseService.deleteByPk(xmTestPlanCase); return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); @@ -271,23 +271,23 @@ public class XmTestPlanCaseController { public Result editXmTestPlanCase(@RequestBody XmTestPlanCase xmTestPlanCase) { if(!StringUtils.hasText(xmTestPlanCase.getCaseId())) { - return failed("pk-not-exists","请上送主键参数caseId"); + return Result.error("pk-not-exists","请上送主键参数caseId"); } if(!StringUtils.hasText(xmTestPlanCase.getPlanId())) { - return failed("pk-not-exists","请上送主键参数planId"); + return Result.error("pk-not-exists","请上送主键参数planId"); } XmTestPlanCase xmTestPlanCaseDb = xmTestPlanCaseService.selectOneObject(xmTestPlanCase); if( xmTestPlanCaseDb == null ){ - return failed("data-not-exists","数据不存在，无法修改"); + return Result.error("data-not-exists","数据不存在，无法修改"); } XmProduct xmProductDb=productService.getProductFromCache(xmTestPlanCaseDb.getProductId()); if(xmProductDb==null){ - return failed("product-not-exists","产品已不存在"); + return Result.error("product-not-exists","产品已不存在"); } User user=LoginUtils.getCurrentUserInfo(); tips=productQxService.checkProductQx(xmProductDb,1,user); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } xmTestPlanCaseService.updateSomeFieldByPk(xmTestPlanCase); @@ -303,7 +303,7 @@ public class XmTestPlanCaseController { List> pkList= (List>) xmTestPlanCaseMap.get("pkList"); if(pkList==null || pkList.size()==0){ - return failed("pkList-0","pkList不能为空"); + return Result.error("pkList-0","pkList不能为空"); } Set fields=new HashSet<>(); @@ -312,19 +312,19 @@ public class XmTestPlanCaseController { fields.add("execDate"); for (String fieldName : xmTestPlanCaseMap.keySet()) { if(fields.contains(fieldName)){ - return failed(fieldName+"-no-edit",fieldName+"不允许修改"); + return Result.error(fieldName+"-no-edit",fieldName+"不允许修改"); } } Set fieldKey=xmTestPlanCaseMap.keySet().stream().filter(i-> fieldsMap.containsKey(i)).collect(Collectors.toSet()); fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmTestPlanCaseMap.get(i) )).collect(Collectors.toSet()); if(fieldKey.size()<=0) { - return failed("fieldKey-0","没有需要更新的字段"); + return Result.error("fieldKey-0","没有需要更新的字段"); } XmTestPlanCase xmTestPlanCase = fromMap(xmTestPlanCaseMap,XmTestPlanCase.class); List xmTestPlanCasesDb=xmTestPlanCaseService.selectListByIds(pkList); if(xmTestPlanCasesDb==null ||xmTestPlanCasesDb.size()==0){ - return failed("data-0","记录已不存在"); + return Result.error("data-0","记录已不存在"); } if(StringUtils.hasText(xmTestPlanCase.getExecStatus()) && !"0".equals(xmTestPlanCase.getExecStatus())){ xmTestPlanCaseMap.put("execDate", DateUtils.getDate("yyyy-MM-dd")); @@ -334,13 +334,13 @@ public class XmTestPlanCaseController { Set noTipsSet=new HashSet<>(); XmTestPlanCase xmTestPlanCaseDb=xmTestPlanCasesDb.get(0); if(xmTestPlanCasesDb.stream().filter(k->!k.getPlanId().equals(xmTestPlanCaseDb.getPlanId())).findAny().isPresent()){ - return failed("planId-0","批量操作只能操作同一个测试计划的用例"); + return Result.error("planId-0","批量操作只能操作同一个测试计划的用例"); } User user = LoginUtils.getCurrentUserInfo(); XmProduct xmProductDb=productService.getProductFromCache(xmTestPlanCaseDb.getProductId()); if(xmProductDb==null){ - return failed("product-not-exists","产品已不存在"); + return Result.error("product-not-exists","产品已不存在"); } if(StringUtils.hasText(xmTestPlanCase.getExecUserid())){ tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestPlanCase.getExecUserid(),xmTestPlanCase.getExecUsername(),null); @@ -348,7 +348,7 @@ public class XmTestPlanCaseController { tips=productQxService.checkProductQx(xmProductDb,1,user); } if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid()); if(isPm){ @@ -376,9 +376,9 @@ public class XmTestPlanCaseController { msgs.add(String.format("以下%s个数据无权限更新,原因【%s】",no.size(),noTipsSet.stream().collect(Collectors.joining(";")))); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } // return Result.ok(); @@ -395,7 +395,7 @@ public class XmTestPlanCaseController { if(xmTestPlanCases.size()<=0){ - return failed("data-0","请上送待删除数据列表"); + return Result.error("data-0","请上送待删除数据列表"); } List datasDb=xmTestPlanCaseService.selectListByIds(xmTestPlanCases.stream().map(i->map( "caseId",i.getCaseId() , "planId",i.getPlanId() )).collect(Collectors.toList())); @@ -404,13 +404,13 @@ public class XmTestPlanCaseController { Set noTipsSet=new HashSet<>(); XmTestPlanCase xmTestPlanCaseDb=datasDb.get(0); if(datasDb.stream().filter(k->!k.getPlanId().equals(xmTestPlanCaseDb.getPlanId())).findAny().isPresent()){ - return failed("planId-0","批量操作只能操作同一个测试计划的用例"); + return Result.error("planId-0","批量操作只能操作同一个测试计划的用例"); } User user = LoginUtils.getCurrentUserInfo(); XmProduct xmProductDb=productService.getProductFromCache(xmTestPlanCaseDb.getProductId()); if(xmProductDb==null){ - return failed("product-not-exists","产品已不存在"); + return Result.error("product-not-exists","产品已不存在"); } boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid()); if(isPm){ @@ -437,19 +437,12 @@ public class XmTestPlanCaseController { msgs.add(String.format("以下%s条数据不能删除.原因【%s】",no.size(),noTipsSet.stream().collect(Collectors.joining(";")))); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } - }catch (BizException e) { - tips=e.getTips(); - logger.error("",e); - }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); - logger.error("",e); - } - m.put("tips", tips); - return m; + return Result.ok(); + } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java index 57bcb8a6..fb71cc02 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java @@ -94,7 +94,7 @@ public class XmTestPlanController { boolean createPk=false; if(!StringUtils.hasText(xmTestPlan.getId())) { - return failed("id-0","测试计划编号不能为空"); + return Result.error("id-0","测试计划编号不能为空"); } this.xmTestPlanService.calcXmTestPlan(xmTestPlan.getId()); return Result.ok(); @@ -115,19 +115,19 @@ public class XmTestPlanController { } if(createPk==false){ if(xmTestPlanService.selectOneObject(xmTestPlan) !=null ){ - return failed("pk-exists","编号重复，请修改编号再提交"); + return Result.error("pk-exists","编号重复，请修改编号再提交"); } } if(!StringUtils.hasText(xmTestPlan.getProjectId())){ - return failed("projectId-0","项目编号不能为空"); + return Result.error("projectId-0","项目编号不能为空"); } if(!StringUtils.hasText(xmTestPlan.getProductId())){ - return failed("productId-0","产品编号不能为空"); + return Result.error("productId-0","产品编号不能为空"); } if(!StringUtils.hasText(xmTestPlan.getCasedbId())){ - return failed("casedbId-0","测试用例库编号不能为空"); + return Result.error("casedbId-0","测试用例库编号不能为空"); } User user=LoginUtils.getCurrentUserInfo(); XmProduct xmProductDb=productService.getProductFromCache(xmTestPlan.getProductId()); @@ -135,7 +135,7 @@ public class XmTestPlanController { if(!isPm){ tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestPlan.getCuserid(),xmTestPlan.getCusername(),xmTestPlan.getCbranchId()); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } } xmTestPlan.setPbranchId(xmProductDb.getBranchId()); @@ -155,11 +155,11 @@ public class XmTestPlanController { public Result delXmTestPlan(@RequestBody XmTestPlan xmTestPlan){ if(!StringUtils.hasText(xmTestPlan.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmTestPlan xmTestPlanDb = xmTestPlanService.selectOneObject(xmTestPlan); if( xmTestPlanDb == null ){ - return failed("data-not-exists","数据不存在，无法删除"); + return Result.error("data-not-exists","数据不存在，无法删除"); } User user=LoginUtils.getCurrentUserInfo(); @@ -168,7 +168,7 @@ public class XmTestPlanController { if(!isPm){ tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestPlanDb.getCuserid(),xmTestPlanDb.getCusername(),xmTestPlanDb.getCbranchId()); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } } xmTestPlanService.deleteByPk(xmTestPlan); @@ -184,11 +184,11 @@ public class XmTestPlanController { public Result editXmTestPlan(@RequestBody XmTestPlan xmTestPlan) { if(!StringUtils.hasText(xmTestPlan.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmTestPlan xmTestPlanDb = xmTestPlanService.selectOneObject(xmTestPlan); if( xmTestPlanDb == null ){ - return failed("data-not-exists","数据不存在，无法修改"); + return Result.error("data-not-exists","数据不存在，无法修改"); } @@ -198,7 +198,7 @@ public class XmTestPlanController { if(!isPm){ tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestPlanDb.getCuserid(),xmTestPlanDb.getCusername(),xmTestPlanDb.getCbranchId()); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } } xmTestPlanService.updateSomeFieldByPk(xmTestPlan); @@ -215,37 +215,37 @@ public class XmTestPlanController { List ids= (List) xmTestPlanMap.get("ids"); if(ids==null || ids.size()==0){ - return failed("ids-0","ids不能为空"); + return Result.error("ids-0","ids不能为空"); } Set fields=new HashSet<>(); fields.add("id"); for (String fieldName : xmTestPlanMap.keySet()) { if(fields.contains(fieldName)){ - return failed(fieldName+"-no-edit",fieldName+"不允许修改"); + return Result.error(fieldName+"-no-edit",fieldName+"不允许修改"); } } Set fieldKey=xmTestPlanMap.keySet().stream().filter(i-> fieldsMap.containsKey(i)).collect(Collectors.toSet()); fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmTestPlanMap.get(i) )).collect(Collectors.toSet()); if(fieldKey.size()<=0) { - return failed("fieldKey-0","没有需要更新的字段"); + return Result.error("fieldKey-0","没有需要更新的字段"); } XmTestPlan xmTestPlan = fromMap(xmTestPlanMap,XmTestPlan.class); List xmTestPlansDb=xmTestPlanService.selectListByIds(ids); if(xmTestPlansDb==null ||xmTestPlansDb.size()==0){ - return failed("data-0","记录已不存在"); + return Result.error("data-0","记录已不存在"); } XmTestPlan xmTestPlanDb2=xmTestPlansDb.get(0); if(xmTestPlansDb.stream().filter(k->!k.getProductId().equals(xmTestPlanDb2.getProductId())).findAny().isPresent()){ - return failed("product-no-same","批量操作只能操作同一个产品下的测试计划。"); + return Result.error("product-no-same","批量操作只能操作同一个产品下的测试计划。"); } User user = LoginUtils.getCurrentUserInfo(); XmProduct xmProductDb=productService.getProductFromCache(xmTestPlanDb2.getProductId()); if(StringUtils.hasText(xmTestPlan.getCuserid())){ tips=this.productQxService.checkProductQx(xmProductDb,1,user,xmTestPlan.getCuserid(),xmTestPlan.getCusername(),xmTestPlan.getCbranchId()); if(!tips.isOk()){ - return failed(tips); + return Result.error(tips); } } boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid()); @@ -277,9 +277,9 @@ public class XmTestPlanController { msgs.add(String.format("以下%s个数据无权限更新,原因【%s】",no.size(),noTips.stream().collect(Collectors.joining(";")))); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } // return Result.ok(); @@ -296,12 +296,12 @@ public class XmTestPlanController { if(xmTestPlans.size()<=0){ - return failed("data-0","请上送待删除数据列表"); + return Result.error("data-0","请上送待删除数据列表"); } List datasDb=xmTestPlanService.selectListByIds(xmTestPlans.stream().map(i-> i.getId() ).collect(Collectors.toList())); XmTestPlan xmTestPlanDb2=datasDb.get(0); if(datasDb.stream().filter(k->!k.getProductId().equals(xmTestPlanDb2.getProductId())).findAny().isPresent()){ - return failed("product-no-same","批量操作只能操作同一个产品下的测试计划。"); + return Result.error("product-no-same","批量操作只能操作同一个产品下的测试计划。"); } User user = LoginUtils.getCurrentUserInfo(); XmProduct xmProductDb=productService.getProductFromCache(xmTestPlanDb2.getProductId()); @@ -334,19 +334,12 @@ public class XmTestPlanController { msgs.add(String.format("有%s条数据无权限删除.原因【%s】",no.size(), noTips.stream().collect(Collectors.joining(";")))); } if(can.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else { - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } - }catch (BizException e) { - tips=e.getTips(); - logger.error("",e); - }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); - logger.error("",e); - } - m.put("tips", tips); - return m; + return Result.ok(); + } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmWorkloadController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmWorkloadController.java index 29efd731..592d1706 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmWorkloadController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmWorkloadController.java @@ -203,53 +203,53 @@ public class XmWorkloadController { xmWorkload.setUbranchId(user.getBranchId()); }else{ if(!StringUtils.hasText(xmWorkload.getUbranchId())){ - return failed("ubranchId-0","请上送用户归属机构号"); + return Result.error("ubranchId-0","请上送用户归属机构号"); } } //报工类型1-任务，2-缺陷，3-测试用例设计，4-测试执行 if(!StringUtils.hasText(xmWorkload.getBizType())) { - return failed("bizType-0","请上送报工类型"); + return Result.error("bizType-0","请上送报工类型"); } if("1".equals(xmWorkload.getBizType())){ if(!StringUtils.hasText(xmWorkload.getTaskId())){ - return failed("taskId-0","请上送任务编号"); + return Result.error("taskId-0","请上送任务编号"); } } if("2".equals(xmWorkload.getBizType())){ if(!StringUtils.hasText(xmWorkload.getBugId())){ - return failed("bugId-0","请上送缺陷编号"); + return Result.error("bugId-0","请上送缺陷编号"); } } if("3".equals(xmWorkload.getBizType())){ if(!StringUtils.hasText(xmWorkload.getCaseId())){ - return failed("caseId-0","请上送测试用例编号"); + return Result.error("caseId-0","请上送测试用例编号"); } } if("4".equals(xmWorkload.getBizType())){ if(!StringUtils.hasText(xmWorkload.getPlanId())){ - return failed("planId-0","请上送测试计划编号"); + return Result.error("planId-0","请上送测试计划编号"); } if(!StringUtils.hasText(xmWorkload.getCaseId())){ - return failed("caseId-0","请上送测试用例编号"); + return Result.error("caseId-0","请上送测试用例编号"); } } if(!StringUtils.hasText(xmWorkload.getUserid())){ - return failed("userid-0","请上送工作人员编号"); + return Result.error("userid-0","请上送工作人员编号"); } if(!StringUtils.hasText(xmWorkload.getUbranchId())){ - return failed("ubranchId-0","请上送工作人员归属机构"); + return Result.error("ubranchId-0","请上送工作人员归属机构"); } if(!StringUtils.hasText(xmWorkload.getBizDate())) { - return failed("bizDate-0","请上送日期"); + return Result.error("bizDate-0","请上送日期"); } if(xmWorkload.getWorkload()==null) { - return failed("workload-0","工时不能为空"); + return Result.error("workload-0","工时不能为空"); } if(xmWorkload.getWorkload().compareTo(BigDecimal.ZERO)==0) { - return failed("workload-0","工时不能为0"); + return Result.error("workload-0","工时不能为0"); } XmWorkload xmWorkloadCount=new XmWorkload(); //xmWorkloadCount.setUserid(user.getUserid()); @@ -271,29 +271,29 @@ public class XmWorkloadController { xmWorkloadCount.setBizType(xmWorkload.getBizType()); long count=this.xmWorkloadService.countByWhere(xmWorkloadCount); if(count>0){ - return failed("data-1","当前工作项今天已经报工"); + return Result.error("data-1","当前工作项今天已经报工"); } //报工类型1-任务，2-缺陷，3-测试用例设计，4-测试执行 if("1".equals(xmWorkload.getBizType())){ XmTask xmTaskDb=this.xmTaskService.selectOneObject(new XmTask(xmWorkload.getTaskId())); if(xmTaskDb==null ){ - return failed("data-0","任务已不存在"); + return Result.error("data-0","任务已不存在"); } if("1".equals(xmTaskDb.getNtype())){ - return failed("ntype-1",xmTaskDb.getName()+"为计划，不是任务，不用登记工时"); + return Result.error("ntype-1",xmTaskDb.getName()+"为计划，不是任务，不用登记工时"); } if("3".equals(xmTaskDb.getTaskState())){ - return failed("taskState-3",xmTaskDb.getName()+"已结算完毕，不能再提交工时"); + return Result.error("taskState-3",xmTaskDb.getName()+"已结算完毕，不能再提交工时"); } //待他人报工，需要检查我的权限，需要项目管理人员才有权限代他人报工。 if(!xmWorkload.getUserid().equals(user.getUserid())){ Tips tips3=xmGroupService.checkIsProjectAdmOrTeamHeadOrAss(user,xmWorkload.getUserid(),xmTaskDb.getProjectId()); if(!tips3.isOk()){ - return failed("no-qx-for-oth-user","无权限代他人报工。只有项目管理人员可以代他人报工。"); + return Result.error("no-qx-for-oth-user","无权限代他人报工。只有项目管理人员可以代他人报工。"); } } if(!(xmWorkload.getUserid().equals(xmTaskDb.getCreateUserid())|| xmWorkload.getUserid().equals(xmTaskDb.getExecutorUserid()))){ - return failed("no-create-or-not-exec",xmWorkload.getUserid()+"不是任务的负责人也不是执行人，不能报工。"); + return Result.error("no-create-or-not-exec",xmWorkload.getUserid()+"不是任务的负责人也不是执行人，不能报工。"); } xmWorkload.setBizName(xmTaskDb.getName()); xmWorkload.setMenuId(xmTaskDb.getMenuId()); @@ -316,19 +316,19 @@ public class XmWorkloadController { }else if("2".equals(xmWorkload.getBizType())){//报工类型1-任务，2-缺陷，3-测试用例设计，4-测试执行 XmQuestion xmQuestionDb=xmQuestionService.selectOneById(xmWorkload.getBugId()); if(xmQuestionDb==null){ - return failed("bug-0","缺陷已不存在"); + return Result.error("bug-0","缺陷已不存在"); } if(StringUtils.hasText(xmQuestionDb.getProjectId())){ XmProject xmProject=xmProjectService.getProjectFromCache(xmQuestionDb.getProjectId()); if(xmProject==null){ - return failed("project-0","项目已不存在"); + return Result.error("project-0","项目已不存在"); } xmWorkload.setProjectId(xmProject.getId()); xmWorkload.setBranchId(xmProject.getBranchId()); } if (!(xmWorkload.getUserid().equals(xmQuestionDb.getCreateUserid())||xmWorkload.getUserid().equals(xmQuestionDb.getHandlerUserid()))) { - return failed("userid-err",xmWorkload.getUserid()+"不是当前缺陷的负责人或者创建人，无须报工。"); + return Result.error("userid-err",xmWorkload.getUserid()+"不是当前缺陷的负责人或者创建人，无须报工。"); } xmWorkload.setBizName(xmQuestionDb.getName()); @@ -345,10 +345,10 @@ public class XmWorkloadController { }else if("3".equals(xmWorkload.getBizType())){//报工类型1-任务，2-缺陷，3-测试用例设计，4-测试执行 XmTestCase xmTestCaseDb=this.xmTestCaseService.selectOneById(xmWorkload.getCaseId()); if(xmTestCaseDb==null){ - return failed("case-0","用例已不存在"); + return Result.error("case-0","用例已不存在"); } if(!(xmWorkload.getUserid().equals(xmTestCaseDb.getCuserid())||xmWorkload.getUserid().equals(xmTestCaseDb.getLuserid()))){ - return failed("userid-err",xmWorkload.getUserid()+"不是当前用例的负责人或者责任人，无须报工。"); + return Result.error("userid-err",xmWorkload.getUserid()+"不是当前用例的负责人或者责任人，无须报工。"); } xmWorkload.setBizName(xmTestCaseDb.getCaseName()); @@ -364,23 +364,23 @@ public class XmWorkloadController { List> datas = sssssssssssssssService.selectListMapByWhere(page,qw,params); return Result.ok(); if(xmTestPlanCaseDbs==null||xmTestPlanCaseDbs.size()==0){ - return failed("xmTestPlanCaseDb-0","执行用例已不存在"); + return Result.error("xmTestPlanCaseDb-0","执行用例已不存在"); } Map xmTestPlanCaseDb=xmTestPlanCaseDbs.get(0); if(!(xmWorkload.getUserid().equals(xmTestPlanCaseDb.get("execUserid")))){ - return failed("userid-err",xmWorkload.getUserid()+"不是当前用例的执行人，无须报工。"); + return Result.error("userid-err",xmWorkload.getUserid()+"不是当前用例的执行人，无须报工。"); } String projectId= (String) xmTestPlanCaseDb.get("projectId"); if(StringUtils.hasText(projectId)){ XmProject xmProject=xmProjectService.getProjectFromCache(projectId); if(xmProject==null){ - return failed("project-0","项目已不存在"); + return Result.error("project-0","项目已不存在"); } xmWorkload.setProjectId(xmProject.getId()); xmWorkload.setBranchId(xmProject.getBranchId()); }else{ - return failed("projectId-0","项目编号不能为空"); + return Result.error("projectId-0","项目编号不能为空"); } xmWorkload.setBizName((String) xmTestPlanCaseDb.get("caseName")); @@ -404,18 +404,18 @@ public class XmWorkloadController { public Result editXmWorkload(@RequestBody XmWorkload xmWorkload) { if(!StringUtils.hasText(xmWorkload.getId())) { - return failed("pk-not-exists","请上送主键参数id"); + return Result.error("pk-not-exists","请上送主键参数id"); } XmWorkload xmWorkloadDb = xmWorkloadService.selectOneObject(xmWorkload); if( xmWorkloadDb == null ){ - return failed("data-not-exists","数据不存在，无法修改"); + return Result.error("data-not-exists","数据不存在，无法修改"); } XmTask xmTaskDb=this.xmTaskService.selectOneObject(new XmTask(xmWorkloadDb.getTaskId())); if(xmTaskDb==null ){ - return failed("data-0","任务已不存在"); + return Result.error("data-0","任务已不存在"); } if("1".equals(xmTaskDb.getNtype())){ - return failed("ntype-1",xmTaskDb.getName()+"为计划，不是任务，不用登记工时"); + return Result.error("ntype-1",xmTaskDb.getName()+"为计划，不是任务，不用登记工时"); } User user= LoginUtils.getCurrentUserInfo(); if(!(user.getUserid().equals(xmTaskDb.getCreateUserid())|| user.getUserid().equals(xmTaskDb.getExecutorUserid()))){ @@ -423,7 +423,7 @@ public class XmWorkloadController { if(!isCreate.isOk()){ Tips isExec=xmGroupService.checkIsProjectAdmOrTeamHeadOrAss(user,xmTaskDb.getExecutorUserid(),xmTaskDb.getProjectId()); if(!isExec.isOk()){ - return failed("noqx-0","你无权针对该业务进行报工"); + return Result.error("noqx-0","你无权针对该业务进行报工"); } } @@ -512,9 +512,9 @@ public class XmWorkloadController { msgs.add("以下"+noQxDel.size()+"条工时单据无权限删除，您只能删除你负责的任务的工时单据，【"+noQxDel.stream().map(i->i.getUsername()+i.getBizDate()).collect(Collectors.joining(","))+"】."); } if(canDel.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else{ - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } return Result.ok(); @@ -616,9 +616,9 @@ public class XmWorkloadController { msgs.add("有"+taskStateNot34.size()+"条工时对应的任务不是已完工状态，不允许进入结算池"); } if(canChanges.size()>0){ - tips.setOkMsg(msgs.stream().collect(Collectors.joining())); + return Result.ok(msgs.stream().collect(Collectors.joining())); }else{ - tips.setFailureMsg(msgs.stream().collect(Collectors.joining())); + return Result.error(msgs.stream().collect(Collectors.joining())); } //