From 3a709d693bec87de92b4b91abba535d14392810b Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期四, 27 三月 2025 16:10:25 +0800 Subject: [PATCH] 获取项目列表接口 --- pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectCtrl.java | 67 ++++++++++++++++++++++++++++++--- 1 files changed, 60 insertions(+), 7 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectCtrl.java index 6f46207..0814908 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectCtrl.java @@ -6,11 +6,11 @@ import com.dy.common.webUtil.QueryResultVo; import com.dy.common.webUtil.ResultCodeMsg; import com.dy.pipIrrGlobal.pojoIr.IrProject; -import com.dy.pipIrrGlobal.pojoPr.PrIntake; import com.dy.pipIrrGlobal.voIr.VoProject; import com.dy.pipIrrGlobal.voIr.VoProjectOne; -import com.dy.pipIrrGlobal.voPr.VoIntake; +import com.dy.pipIrrGlobal.voIr.VoProjectSimple; import com.dy.pipIrrGlobal.voSe.VoActiveCard; +import com.dy.pipIrrIrrigate.project.dto.irrigateProject; import com.dy.pipIrrIrrigate.result.IrrigateResultCode; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; @@ -21,13 +21,11 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; import org.springframework.http.MediaType; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; -import java.lang.reflect.Array; import java.util.*; /** @@ -45,8 +43,7 @@ private final ProjectSv projectSv; /** - * 娣诲姞椤圭洰 - * + * 娣诲姞椤圭洰锛屾棫鐗堟湰锛屽師鍒欎笂搴熷純 * @param po 椤圭洰瀹炰綋瀵硅薄 * @param bindingResult * @return 娣诲姞鏄惁鎴愬姛 @@ -76,6 +73,44 @@ log.error("娣诲姞椤圭洰寮傚父", e); return BaseResponseUtils.buildException(e.getMessage()); } + return BaseResponseUtils.buildSuccess(true); + } + + /** + * 娣诲姞椤圭洰锛屾柊鐗堟湰锛屼娇鐢ㄨ繖涓� + * @param po 椤圭洰瀹炰綋瀵硅薄 + * @param bindingResult + * @return 娣诲姞鏄惁鎴愬姛 + */ + @PostMapping(path = "addIrrigateProject", consumes = MediaType.APPLICATION_JSON_VALUE) + @Transactional(rollbackFor = Exception.class) + @SsoAop() + public BaseResponse<Boolean> addIrrigateProject(@RequestBody @Valid irrigateProject po, BindingResult bindingResult) { + if (bindingResult != null && bindingResult.hasErrors()) { + return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); + } + + String projectName = po.getProjectName(); + String irrigateGroups = po.getIrrigateGroups(); + Long operatorId = po.getOperatorId(); + + IrProject irProject = new IrProject(); + irProject.setProjectName(projectName); + irProject.setProjectState((byte)1); + irProject.setOperator(operatorId); + irProject.setOperateTime(new Date()); + irProject.setDeleted((byte)0); + Long projectId = projectSv.addIrrigateProject(irProject); + if(projectId == null) { + return BaseResponseUtils.buildErrorMsg("鍒涘缓鐏屾簤椤圭洰澶辫触"); + } + + //String[] irrigateGroupArr = irrigateGroups.split(","); + //for(Long irrigateGroupId : irrigateGroupArr) { + // + //} + + return BaseResponseUtils.buildSuccess(true); } @@ -230,7 +265,7 @@ } /** - * 鍒嗛〉鏌ヨ + * 鍒嗛〉鏌ヨ锛屾棫鐗堟湰锛屽師鍒欎笂搴熷純 * @param vo * @return */ @@ -254,4 +289,22 @@ return BaseResponseUtils.buildException(e.getMessage()); } } + + /** + * 鍒嗛〉鏌ヨ椤圭洰锛屾柊鐗堟湰锛岀洰鍓嶄娇鐢� + * @param qo + * @return + */ + @GetMapping(path = "/getSimpleProjects") + @SsoAop() + public BaseResponse<QueryResultVo<List<VoProjectSimple>>> getSimpleProjects(QueryVo qo) { + try { + QueryResultVo<List<VoProjectSimple>> res = projectSv.getSimpleProjects(qo); + return BaseResponseUtils.buildSuccess(res); + } catch (Exception e) { + log.error("鑾峰彇椤圭洰璁板綍寮傚父", e); + return BaseResponseUtils.buildException(e.getMessage()); + } + } + } -- Gitblit v1.8.0