pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectCtrl.java
@@ -8,7 +8,9 @@ import com.dy.pipIrrGlobal.pojoIr.IrProject; import com.dy.pipIrrGlobal.voIr.VoProject; import com.dy.pipIrrGlobal.voIr.VoProjectOne; 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; @@ -24,10 +26,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.*; /** * @author :WuZeYu @@ -44,8 +43,7 @@ private final ProjectSv projectSv; /** * 添加项目 * * 添加项目，旧版本，原则上废弃 * @param po 项目实体对象 * @param bindingResult * @return 添加是否成功 @@ -75,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); } @@ -229,7 +265,7 @@ } /** * 分页查询 * 分页查询，旧版本，原则上废弃 * @param vo * @return */ @@ -253,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()); } } } pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectSv.java
@@ -6,6 +6,7 @@ import com.dy.pipIrrGlobal.pojoIr.IrProject; import com.dy.pipIrrGlobal.voIr.VoProject; import com.dy.pipIrrGlobal.voIr.VoProjectOne; import com.dy.pipIrrGlobal.voIr.VoProjectSimple; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.common.utils.PojoUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -28,8 +29,7 @@ private IrProjectMapper irProjectMapper; /** * 添加项目 * * 添加项目，旧版本，原则上废弃 * @param po * @return */ @@ -59,6 +59,16 @@ return 0; } return 1; } /** * 添加项目，目前使用 * @param po * @return */ public Long addIrrigateProject(IrProject po) { irProjectMapper.insert(po); return po.getId(); } /** @@ -131,7 +141,7 @@ } /** * 分页查询项目 * 分页查询项目，旧版本，原则上废弃 * @param queryVo * @return */ @@ -146,4 +156,21 @@ rsVo.obj = irProjectMapper.getProjects(params); return rsVo; } /** * 分页查询项目，新版本，目前使用 * @param queryVo * @return */ public QueryResultVo<List<VoProjectSimple>> getSimpleProjects(QueryVo queryVo) { Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo); Long itemTotal = irProjectMapper.getSimpleProjectsCount(params); QueryResultVo<List<VoProjectSimple>> rsVo = new QueryResultVo<>(); rsVo.pageSize = queryVo.pageSize; rsVo.pageCurr = queryVo.pageCurr; rsVo.calculateAndSet(itemTotal, params); rsVo.obj = irProjectMapper.getSimpleProjects(params); return rsVo; } } pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/dto/irrigateProject.java
New file @@ -0,0 +1,35 @@ package com.dy.pipIrrIrrigate.project.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; /** * @author ZhuBaoMin * @date 2025-03-27 15:09 * @LastEditTime 2025-03-27 15:09 * @Description 灌溉项目实体类，添加项目使用 */ @Data public class irrigateProject { public static final long serialVersionUID = 202503271510001L; /** * 项目名称 */ @NotBlank(message = "项目名称不能为空") private String projectName; /** * 轮灌组列表 */ @NotBlank(message = "项目必须包含轮灌组") private String irrigateGroups; /** * 操作员ID */ @NotNull(message = "操作员ID不能为空") private Long operatorId; } pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/PipIrrRemoteApplication.java
@@ -29,7 +29,8 @@ "com.dy.pipIrrGlobal.daoBa", "com.dy.pipIrrGlobal.daoFi", "com.dy.pipIrrGlobal.daoAllRound", "com.dy.pipIrrGlobal.daoLargeScreen" "com.dy.pipIrrGlobal.daoLargeScreen", "com.dy.pipIrrGlobal.daoIr" }) public class PipIrrRemoteApplication {
