From 346b480ab7848c742065e9bf989abaf43b515613 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期一, 21 四月 2025 15:05:26 +0800 Subject: [PATCH] 获取轮灌组详情 --- pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java | 133 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 127 insertions(+), 6 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java index e3d4abe..89c086e 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java @@ -9,9 +9,13 @@ import com.dy.pipIrrGlobal.pojoIr.IrGroupUnit; import com.dy.pipIrrGlobal.pojoIr.IrIrrigateGroup; import com.dy.pipIrrGlobal.voIr.VoGroup; +import com.dy.pipIrrGlobal.voIr.VoGroupDetail; import com.dy.pipIrrGlobal.voIr.VoGroupOne; +import com.dy.pipIrrGlobal.voIr.VoGroupSimple; import com.dy.pipIrrGlobal.voSe.VoActiveCard; import com.dy.pipIrrIrrigate.irrigateGroup.dto.GroupClient; +import com.dy.pipIrrIrrigate.irrigateGroup.dto.IrrigateGroup; +import com.dy.pipIrrIrrigate.irrigateGroup.qo.QoGroup; import com.dy.pipIrrIrrigate.result.IrrigateResultCode; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; @@ -71,7 +75,7 @@ try { Integer rec = Optional.ofNullable(irrigateGroupSv.addIrrigateGroup(po)).orElse(0); if (rec == 0) { - return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_PROJECT_FAIL.getMessage()); + return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_GROUP_FAIL.getMessage()); } } catch (Exception e) { log.error("鍒涘缓杞亴缁勫紓甯�", e); @@ -100,13 +104,13 @@ @SsoAop() public BaseResponse<Boolean> delete(@RequestBody Map map) { if (map == null || map.size() <= 0) { - BaseResponseUtils.buildFail(IrrigateResultCode.PLEASE_INPUT_PROJECT_ID.getMessage()); + BaseResponseUtils.buildFail(IrrigateResultCode.PLEASE_INPUT_GROUP_ID.getMessage()); } Long groupId = Long.parseLong(map.get("id").toString()); try { Integer rows = irrigateGroupSv.deleteIrrigateGroup(groupId); if (rows == 0) { - return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_PROJECT_FAIL.getMessage()); + return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_GROUP_FAIL.getMessage()); } } catch (Exception e) { log.error("鍒犻櫎杞亴缁勫紓甯�", e); @@ -134,7 +138,7 @@ try { Integer rows = irrigateGroupSv.deleteIrrigateGroup(groupId); if (rows == 0) { - return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_PROJECT_FAIL.getMessage()); + return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_GROUP_FAIL.getMessage()); } } catch (Exception e) { log.error("鍒犻櫎杞亴缁勫紓甯�", e); @@ -170,7 +174,7 @@ try { Integer rec = Optional.ofNullable(irrigateGroupSv.updateIrrigateGroup(po)).orElse(0); if (rec == 0) { - return BaseResponseUtils.buildFail(IrrigateResultCode.UPDATE_PROJECT_FAIL.getMessage()); + return BaseResponseUtils.buildFail(IrrigateResultCode.UPDATE_GROUP_FAIL.getMessage()); } } catch (Exception e) { log.error("淇敼杞亴缁勫紓甯�", e); @@ -264,7 +268,7 @@ irGroupUnit.setOperator(operator); Integer rec = Optional.ofNullable(irrigateGroupSv.addGroupUnit(irGroupUnit)).orElse(0); if (rec == 0) { - return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_PROJECT_FAIL.getMessage()); + return BaseResponseUtils.buildFail(IrrigateResultCode.GROUP_ADD_UNIT_FAIL.getMessage()); } } } catch (Exception e) { @@ -442,4 +446,121 @@ } return BaseResponseUtils.buildSuccess(true); } + + /** + * 鏂板杞亴缁勶紝鏂颁唬鐮� + * @param po + * @param bindingResult + * @return + */ + @PostMapping(path = "addIrrigateGroup", consumes = MediaType.APPLICATION_JSON_VALUE) + @Transactional(rollbackFor = Exception.class) + @SsoAop() + public BaseResponse<Boolean> addIrrigateGroup(@RequestBody @Valid IrrigateGroup po, BindingResult bindingResult) { + if (bindingResult != null && bindingResult.hasErrors()) { + return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); + } + + Map map_result = irrigateGroupSv.addIrrigateGroup(po); + if(map_result.get("success").equals(false)) { + return BaseResponseUtils.buildErrorMsg(map_result.get("msg").toString()); + } + return BaseResponseUtils.buildSuccess() ; + } + + /** + * 鍒犻櫎杞亴缁勶紝鏂颁唬鐮� + * @param groupId + * @return + */ + @PostMapping(path = "deleteIrrigateGroup") + @Transactional(rollbackFor = Exception.class) + @SsoAop() + public BaseResponse<Boolean> deleteIrrigateGroup(@RequestParam(required = false) Long groupId) { + if(groupId == null) { + return BaseResponseUtils.buildErrorMsg("杞亴缁処D涓嶈兘涓虹┖"); + } + + Map map_result = irrigateGroupSv.deleteGroup(groupId); + if(map_result.get("success").equals(false)) { + return BaseResponseUtils.buildErrorMsg(map_result.get("msg").toString()); + } + return BaseResponseUtils.buildSuccess() ; + } + + /** + * 淇敼杞亴缁勶紝鏂颁唬鐮� + * @param po + * @param bindingResult + * @return + */ + @PostMapping(path = "updateIrrigateGroup", consumes = MediaType.APPLICATION_JSON_VALUE) + @Transactional(rollbackFor = Exception.class) + @SsoAop() + public BaseResponse<Boolean> updateIrrigateGroup(@RequestBody @Valid IrrigateGroup po, BindingResult bindingResult){ + if (bindingResult != null && bindingResult.hasErrors()) { + return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); + } + + if(po.getGroupId() == null) { + return BaseResponseUtils.buildErrorMsg("杞亴缁処D涓嶈兘涓虹┖"); + } + + Map map_result = irrigateGroupSv.updateIrrigateGroup(po); + if(map_result.get("success").equals(false)) { + return BaseResponseUtils.buildErrorMsg(map_result.get("msg").toString()); + } + return BaseResponseUtils.buildSuccess() ; + } + + /** + * 鑾峰彇杞亴缁勫垪琛紝鏂颁唬鐮� + * @param qo + * @return + */ + @GetMapping(path = "/getSimpleGroups") + @SsoAop() + public BaseResponse<QueryResultVo<List<VoGroupSimple>>> getSimpleGroups(QoGroup qo) { + try { + QueryResultVo<List<VoGroupSimple>> res = irrigateGroupSv.getSimpleGroups(qo); + return BaseResponseUtils.buildSuccess(res); + } catch (Exception e) { + log.error("鑾峰彇椤圭洰璁板綍寮傚父", e); + return BaseResponseUtils.buildException(e.getMessage()); + } + } + + /** + * 鑾峰彇鍏ㄩ儴杞亴缁勶紝鏂颁唬鐮� + * @return + */ + @GetMapping(path = "/getAllGroups") + @SsoAop() + public BaseResponse<List<VoGroupSimple>> getAllGroups() { + try { + return BaseResponseUtils.buildSuccess(irrigateGroupSv.getAllGroups()); + } catch (Exception e) { + log.error("鑾峰彇椤圭洰璁板綍寮傚父", e); + return BaseResponseUtils.buildException(e.getMessage()); + } + } + + /** + * 鑾峰彇杞亴缁勮鎯咃紝鏂颁唬鐮� + * @param groupId + * @return + */ + @GetMapping(path = "getGroupDetail") + @SsoAop() + public BaseResponse<VoGroupDetail> getGroupDetail(@RequestParam Long groupId) { + if(groupId == null) { + return BaseResponseUtils.buildErrorMsg("杞亴缁処D涓嶈兘涓虹┖"); + } + + Map map_result = irrigateGroupSv.getGroupDetail(groupId); + if(map_result.get("success").equals(false)) { + return BaseResponseUtils.buildErrorMsg(map_result.get("msg").toString()); + } + return BaseResponseUtils.buildSuccess(map_result.get("content")) ; + } } -- Gitblit v1.8.0