From e58e36f8a49073e5d4c71a794ad5fa0d9cfaee15 Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期五, 26 一月 2024 08:58:08 +0800 Subject: [PATCH] 修改取水口删除接口get改为post --- pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java | 86 +++++++++++++++++++++++-------------------- 1 files changed, 46 insertions(+), 40 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java index 0d99ab9..7372135 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java @@ -33,10 +33,7 @@ import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.time.format.DateTimeFormatter; -import java.util.Date; -import java.util.List; -import java.util.Objects; -import java.util.Optional; +import java.util.*; /** * @author WuZeYu @@ -48,13 +45,14 @@ @Slf4j @Tag(name = "鍙栨按鍙g鐞�", description = "鍙栨按鍙f搷浣�") @RestController -@RequestMapping(path="intake") +@RequestMapping(path = "intake") @RequiredArgsConstructor public class IntakeCtrl { private final IntakeSv intakeSv; /** * 瀹㈡埛绔姹傚緱鍒版墍鏈夊彇姘村彛鍚嶅瓧 + * * @return 鎵�鏈夊彇姘村彛鍚嶅瓧 */ @Operation(summary = "鑾峰緱鍏ㄩ儴鍙栨按鍙�", description = "杩斿洖鍏ㄩ儴鍙栨按鍙f暟鎹�") @@ -68,22 +66,23 @@ }) @GetMapping(path = "all") @SsoAop() - public BaseResponse<QueryResultVo<List<PrIntake>>> all(){ + public BaseResponse<QueryResultVo<List<PrIntake>>> all() { try { QueryResultVo<List<PrIntake>> res = this.intakeSv.selectAll(); - if(res == null) { + if (res == null) { return BaseResponseUtils.buildFail(ProjectResultCode.NO_INTAKES.getMessage()); - }else { + } else { return BaseResponseUtils.buildSuccess(res); } } catch (Exception e) { log.error("鏌ヨ鍙栨按鍙e紓甯�", e); - return BaseResponseUtils.buildException(e.getMessage()) ; + return BaseResponseUtils.buildException(e.getMessage()); } } /** * 寰楀埌涓�涓彇姘村彛鏁版嵁 + * * @return 涓�涓彇姘村彛鏁版嵁 */ @Operation(summary = "涓�涓彇姘村彛", description = "寰楀埌涓�涓彇姘村彛鏁版嵁") @@ -97,10 +96,10 @@ }) @GetMapping(path = "one/{id}") @SsoAop() - public BaseResponse<PrIntake> one(@PathVariable("id") Long id){ - if(this.intakeSv.selectById(id) == null) { + public BaseResponse<PrIntake> one(@PathVariable("id") Long id) { + if (this.intakeSv.selectById(id) == null) { return BaseResponseUtils.buildFail(ProjectResultCode.NO_INTAKES.getMessage()); - }else { + } else { return BaseResponseUtils.buildSuccess(this.intakeSv.selectById(id)); } } @@ -116,16 +115,16 @@ }) @GetMapping(path = "getIntakes") @SsoAop() - public BaseResponse<QueryResultVo<List<VoIntake>>> getIntakes(QueryVo vo){ + public BaseResponse<QueryResultVo<List<VoIntake>>> getIntakes(QueryVo vo) { try { QueryResultVo<List<VoIntake>> res = intakeSv.getIntakes(vo); - if(res == null) { + if (res == null) { return BaseResponseUtils.buildFail(ProjectResultCode.NO_INTAKES.getMessage()); } return BaseResponseUtils.buildSuccess(res); } catch (Exception e) { log.error("鑾峰彇鍙栨按鍙h褰曞紓甯�", e); - return BaseResponseUtils.buildException(e.getMessage()) ; + return BaseResponseUtils.buildException(e.getMessage()); } } @@ -141,23 +140,24 @@ @PostMapping(path = "add", consumes = MediaType.APPLICATION_JSON_VALUE) @Transactional(rollbackFor = Exception.class) @SsoAop() - public BaseResponse<Boolean> add(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid PrIntake po, @Parameter(hidden = true) BindingResult bindingResult){ + public BaseResponse<Boolean> add(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid PrIntake po, @Parameter(hidden = true) BindingResult bindingResult) { DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - if(bindingResult != null && bindingResult.hasErrors()){ + if (bindingResult != null && bindingResult.hasErrors()) { return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } Date operateTime = new Date(); po.setOperateDt(operateTime); Integer rec = Optional.ofNullable(intakeSv.addIntake(po)).orElse(0); - if(rec == 0) { + if (rec == 0) { return BaseResponseUtils.buildFail(ProjectResultCode.ADD_INTAKE_FAIL.getMessage()); } - return BaseResponseUtils.buildSuccess(true) ; + return BaseResponseUtils.buildSuccess(true); } /** * 缂栬緫淇敼鍙栨按鍙� + * * @param po 淇濆瓨鍙栨按鍙orm琛ㄥ崟瀵硅薄 * @return 鏄惁鎴愬姛 */ @@ -172,8 +172,8 @@ }) @PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE) @SsoAop() - public BaseResponse<Boolean> update(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid PrIntake po, @Parameter(hidden = true) BindingResult bindingResult){ - if(bindingResult != null && bindingResult.hasErrors()){ + public BaseResponse<Boolean> update(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid PrIntake po, @Parameter(hidden = true) BindingResult bindingResult) { + if (bindingResult != null && bindingResult.hasErrors()) { return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } int count; @@ -183,18 +183,19 @@ count = this.intakeSv.update(po); } catch (Exception e) { log.error("淇濆瓨鍒嗘按鍙e紓甯�", e); - return BaseResponseUtils.buildException(e.getMessage()) ; + return BaseResponseUtils.buildException(e.getMessage()); } - if(count <= 0){ - return BaseResponseUtils.buildFail(ProjectResultCode.UPDATE_INTAKE.getMessage()) ; - }else{ - return BaseResponseUtils.buildSuccess(true) ; + if (count <= 0) { + return BaseResponseUtils.buildFail(ProjectResultCode.UPDATE_INTAKE.getMessage()); + } else { + return BaseResponseUtils.buildSuccess(true); } } /** * 鍒犻櫎鍙栨按鍙� - * @param id 鍙栨按鍙D + * + * @param map 鍙栨按鍙D * @return 鏄惁鎴愬姛 */ @Operation(summary = "鍒犻櫎鍒嗘按鍙�", description = "鎻愪氦鍙栨按鍙D锛岃繘琛岄�昏緫鍒犻櫎") @@ -206,28 +207,32 @@ schema = @Schema(implementation = Boolean.class))} ) }) - @GetMapping(path = "delete/{id}") + @PostMapping(path = "delete") @SsoAop() - public BaseResponse<Boolean> delete(@PathVariable("id") Long id){ - if(id == null ){ - return BaseResponseUtils.buildFail(ProjectResultCode.PLEASE_INPUT_INTAKE_ID.getMessage()) ; + public BaseResponse<Boolean> delete(@RequestBody Map map) { + if (map == null || map.size() <= 0) { + return BaseResponseUtils.buildFail(ProjectResultCode.PLEASE_INPUT_INTAKE_ID.getMessage()); } - int count; + Long id = Long.parseLong(map.get("id").toString()); try { - count = this.intakeSv.delete(id); + //鍙栨按鍙D + Integer recordCount = Optional.ofNullable(intakeSv.delete(id)).orElse(0); + if (recordCount == 0) { + return BaseResponseUtils.buildFail(ProjectResultCode.DELETE_INTAKE_FAIL.getMessage()); + } else { + return BaseResponseUtils.buildSuccess(true); + } } catch (Exception e) { log.error("淇濆瓨鍒嗘按鍙e紓甯�", e); - return BaseResponseUtils.buildException(e.getMessage()) ; + return BaseResponseUtils.buildException(e.getMessage()); } - if(count <= 0){ - return BaseResponseUtils.buildFail(ProjectResultCode.DELETE_INTAKE_FAIL.getMessage()) ; - }else{ - return BaseResponseUtils.buildSuccess(true) ; - } + + } /** * 瀵煎嚭鍙栨按鍙e垪琛� + * * @param response * @param vo */ @@ -247,6 +252,7 @@ /** * 瀵煎叆鍙栨按鍙e垪琛� + * * @param file */ @SneakyThrows @@ -257,7 +263,7 @@ .head(VoIntake.class) .sheet() .doReadSync(); - return BaseResponseUtils.buildSuccess(memberList) ; + return BaseResponseUtils.buildSuccess(memberList); } /** -- Gitblit v1.8.0