From 56c84cd7fb04407536eb0135162313029828a81f Mon Sep 17 00:00:00 2001 From: 16639036659 <577530412@qq.com> Date: 星期一, 11 十二月 2023 10:14:41 +0800 Subject: [PATCH] 暂时提交 --- src/main/java/com/ruoyi/project/tr/riskMeasure/controller/riskMeasureController.java | 45 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 39 insertions(+), 6 deletions(-) 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 dfd3a56..9ce48bd 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 @@ -13,7 +13,9 @@ import com.ruoyi.framework.web.page.TableDataInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.ModelMap; +import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -40,7 +42,7 @@ */ @PostMapping("/list") @ResponseBody - public TableDataInfo list(@RequestBody PreventRiskControlMeasureQueryReqDTO measureQueryReqDTO) + public TableDataInfo list(PreventRiskControlMeasureQueryReqDTO measureQueryReqDTO) { ResultVO<List<PreventRiskControlMeasurePageQueryRespDTO>> resultVO = riskService.getRiskControlMeasurePage(measureQueryReqDTO); List<PreventRiskControlMeasureQueryReqDTO> data = (List<PreventRiskControlMeasureQueryReqDTO>) resultVO.getData(); @@ -74,14 +76,15 @@ @Log(title = "风险单元类型", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody - public AjaxResult addSave(@RequestBody PreventRiskControlMeasureSaveReqDTO measureSaveReqDTO) + public AjaxResult addSave(PreventRiskControlMeasureSaveReqDTO measureSaveReqDTO) { + ResultVO<PreventRiskControlMeasure> resultVO = riskService.saveRiskControlMeasure(measureSaveReqDTO); String code = resultVO.getCode(); if ("200".equals(code)){ return toAjax(1); }else { - return toAjax(0); + return AjaxResult.error(resultVO.getMsg()); } } @@ -110,14 +113,14 @@ @Log(title = "风险单元类型", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(@RequestBody PreventRiskControlMeasureUpdateReqDTO measureUpdateReqDTO) + public AjaxResult editSave(PreventRiskControlMeasureUpdateReqDTO measureUpdateReqDTO) { ResultVO<PreventRiskControlMeasure> resultVO = riskService.updateRiskControlMeasure(measureUpdateReqDTO); String code = resultVO.getCode(); if ("200".equals(code)){ return toAjax(1); }else { - return toAjax(0); + return AjaxResult.error(resultVO.getMsg()); } } @@ -136,7 +139,37 @@ if ("200".equals(code)){ return toAjax(1); }else { - return toAjax(0); + return AjaxResult.error(resultVO.getMsg()); + } + } + + /** + * 新增风险管控措施 - 最大风险源 + */ + @GetMapping("/addOne") + public String addOne(ModelMap mmap) + { + ResultVO<List<PreventRiskEventListQueryRespDTO>> resultVO = riskService.listRiskEvent(); + Object data = resultVO.getData(); + mmap.put("riskEvents", data); + return prefix + "/add"; + } + + /** + * 新增保存 + */ + @Log(title = "风险单元类型", businessType = BusinessType.INSERT) + @PostMapping("/addOne") + @ResponseBody + public AjaxResult addSaveOne(PreventRiskControlMeasureSaveReqDTO measureSaveReqDTO) + { + + ResultVO<PreventRiskControlMeasure> resultVO = riskService.saveRiskControlMeasure(measureSaveReqDTO); + String code = resultVO.getCode(); + if ("200".equals(code)){ + return toAjax(1); + }else { + return AjaxResult.error(resultVO.getMsg()); } } -- Gitblit v1.9.2