From 5bfbbb8e17169131727e2589ff63180f66a0b74f Mon Sep 17 00:00:00 2001
From: huangzhen <867127663@qq.com>
Date: 星期二, 25 四月 2023 13:17:15 +0800
Subject: [PATCH] 风险事件和措施新增返回异常信息进行区分
---
src/main/java/com/ruoyi/project/tr/riskEvent/controller/RiskEventController.java | 13 ++++---------
src/main/java/com/ruoyi/project/tr/riskMeasure/controller/riskMeasureController.java | 6 +++---
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/riskEvent/controller/RiskEventController.java b/src/main/java/com/ruoyi/project/tr/riskEvent/controller/RiskEventController.java
index d13d836..d46311a 100644
--- a/src/main/java/com/ruoyi/project/tr/riskEvent/controller/RiskEventController.java
+++ b/src/main/java/com/ruoyi/project/tr/riskEvent/controller/RiskEventController.java
@@ -106,19 +106,14 @@
@Log(title = "风险单元类型", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
- //public AjaxResult addSave(PreventRiskEventSaveReqDTO riskEventSaveReqDTO)
- public AjaxResult addSave(@RequestParam Map<String, Object> params)
+ public AjaxResult addSave(PreventRiskEventSaveReqDTO riskEventSaveReqDTO)
{
- PreventRiskEventSaveReqDTO riskEventSaveReqDTO = new PreventRiskEventSaveReqDTO();
- riskEventSaveReqDTO.setRiskEventName((String) params.get("riskEventName"));
- riskEventSaveReqDTO.setEventResult((String) params.get("eventResult"));
- riskEventSaveReqDTO.setRiskUnitId(Long.valueOf((String) params.get("riskUnitId")));
ResultVO<PreventRiskEvent> resultVO = riskService.saveRiskEvent(riskEventSaveReqDTO);
String code = resultVO.getCode();
if ("200".equals(code)){
return toAjax(1);
}else {
- return toAjax(0);
+ return AjaxResult.error(resultVO.getMsg());
}
// User user = ShiroUtils.getSysUser();
// riskType.setCompanyId(user.getCompanyId());
@@ -157,7 +152,7 @@
if ("200".equals(code)){
return toAjax(1);
}else {
- return toAjax(0);
+ return AjaxResult.error(resultVO.getMsg());
}
// riskType.setUpdateBy(ShiroUtils.getSysUser().getUserName());
// return toAjax(riskTypeService.updateRiskType(riskType));
@@ -178,7 +173,7 @@
if ("200".equals(code)){
return toAjax(1);
}else {
- return toAjax(0);
+ return AjaxResult.error(resultVO.getMsg());
}
}
diff --git a/src/main/java/com/ruoyi/project/tr/riskMeasure/controller/riskMeasureController.java b/src/main/java/com/ruoyi/project/tr/riskMeasure/controller/riskMeasureController.java
index 7c97d4c..5f24e09 100644
--- a/src/main/java/com/ruoyi/project/tr/riskMeasure/controller/riskMeasureController.java
+++ b/src/main/java/com/ruoyi/project/tr/riskMeasure/controller/riskMeasureController.java
@@ -82,7 +82,7 @@
if ("200".equals(code)){
return toAjax(1);
}else {
- return toAjax(0);
+ return AjaxResult.error(resultVO.getMsg());
}
}
@@ -118,7 +118,7 @@
if ("200".equals(code)){
return toAjax(1);
}else {
- return toAjax(0);
+ return AjaxResult.error(resultVO.getMsg());
}
}
@@ -137,7 +137,7 @@
if ("200".equals(code)){
return toAjax(1);
}else {
- return toAjax(0);
+ return AjaxResult.error(resultVO.getMsg());
}
}
--
Gitblit v1.9.2