From 4c3185f4e6580bc2ad2afb869b57861eec9787cb Mon Sep 17 00:00:00 2001 From: huangzhen <867127663@qq.com> Date: 星期五, 09 九月 2022 09:36:05 +0800 Subject: [PATCH] 接口的一些自测bug修复 --- src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml | 2 +- src/main/resources/mybatis/doublePrevention/PreventRiskEventMapper.xml | 1 + src/main/java/com/ruoyi/doublePrevention/controller/PreventRiskControlMeasureController.java | 9 +++------ src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java | 2 +- src/main/java/com/ruoyi/doublePrevention/controller/PreventRiskEventController.java | 9 +++------ 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/ruoyi/doublePrevention/controller/PreventRiskControlMeasureController.java b/src/main/java/com/ruoyi/doublePrevention/controller/PreventRiskControlMeasureController.java index e9fd8a3..c7f5bba 100644 --- a/src/main/java/com/ruoyi/doublePrevention/controller/PreventRiskControlMeasureController.java +++ b/src/main/java/com/ruoyi/doublePrevention/controller/PreventRiskControlMeasureController.java @@ -11,15 +11,12 @@ import com.ruoyi.doublePrevention.vo.ResultVO; import org.apache.tomcat.util.net.openssl.ciphers.Authentication; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @RestController -@RequestMapping("/prevent/riskControlMeasure") +@RequestMapping("/riskControlMeasure") public class PreventRiskControlMeasureController { @Autowired @@ -70,7 +67,7 @@ /** * 管控措施- 获取管控措施模板 */ - @PostMapping("/select/listMeasureTemplates") + @GetMapping("/select/listMeasureTemplates") public ResultVO<List<PreventRiskMeasureTemplatesListQueryRespDTO>> listMeasures() { return riskService.listMeasureTemplates(); } diff --git a/src/main/java/com/ruoyi/doublePrevention/controller/PreventRiskEventController.java b/src/main/java/com/ruoyi/doublePrevention/controller/PreventRiskEventController.java index 97014fb..1a3eda7 100644 --- a/src/main/java/com/ruoyi/doublePrevention/controller/PreventRiskEventController.java +++ b/src/main/java/com/ruoyi/doublePrevention/controller/PreventRiskEventController.java @@ -15,17 +15,14 @@ import com.ruoyi.doublePrevention.vo.ResultVO; import com.ruoyi.project.system.user.domain.User; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; import static com.ruoyi.common.utils.security.ShiroUtils.getSysUser; @RestController -@RequestMapping("/prevent/riskEvent") +@RequestMapping("/riskEvent") public class PreventRiskEventController { @Autowired @@ -74,7 +71,7 @@ /** * @description 获取所有风险事件不分页 */ - @PostMapping("/select/listRiskEvent") + @GetMapping("/select/listRiskEvent") public ResultVO<List<PreventRiskEventListQueryRespDTO>> listRiskEvent() { return riskService.listRiskEvent(); } diff --git a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java index 0321bac..ef0310c 100644 --- a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java +++ b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java @@ -597,7 +597,7 @@ return resultVO; } resultVO.setCode(ResultCodes.OK.getCode()); - resultVO.setMsg("更新安全风险事件成功"); + resultVO.setMsg("更新风险管控措施成功"); return resultVO; } diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml index c4425a8..767e7bd 100644 --- a/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml +++ b/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml @@ -148,7 +148,7 @@ <select id="getPreventRiskControlMeasureById" - resultType="com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure"> + resultMap="BaseResultMap"> select * from prevent_risk_control_measure where id = #{id} and delete_status = 0 </select> diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskEventMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskEventMapper.xml index 00464a4..8bf37cd 100644 --- a/src/main/resources/mybatis/doublePrevention/PreventRiskEventMapper.xml +++ b/src/main/resources/mybatis/doublePrevention/PreventRiskEventMapper.xml @@ -57,6 +57,7 @@ <if test="updateReportDataTime != null ">update_report_data_time = #{updateReportDataTime},</if> <if test="reportSwitch != null ">report_switch = #{reportSwitch},</if> </trim> + where id = #{id} and delete_status = 0 </update> -- Gitblit v1.9.2