From 3bc6fb1aa90463ccf8e9dcdaca58ad9365f39916 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 28 三月 2025 15:30:42 +0800
Subject: [PATCH] 获取项目详情接口
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrProjectGroupMapper.xml | 5
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/PipIrrIrrigateApplication.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrProjectMapper.java | 8 +
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrProjectGroupMapper.java | 7 +
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoProjectDetail.java | 27 +++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrProjectMapper.xml | 18 ++
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectCtrl.java | 175 ++++++++++++++++++------
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectSv.java | 145 ++++++++++++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/dto/IrrigateProject.java | 7
9 files changed, 342 insertions(+), 52 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrProjectGroupMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrProjectGroupMapper.java
index adfa010..766733e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrProjectGroupMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrProjectGroupMapper.java
@@ -25,4 +25,11 @@
int updateByPrimaryKey(IrProjectGroup record);
+ /**
+ * 瑙ｇ粦椤圭洰涓庤疆缃愮粍鍏宠仈
+ * @param projectId
+ * @return
+ */
+ Integer unbindGroup(Long projectId);
+
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrProjectMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrProjectMapper.java
index 9b0380b..82bb1ae 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrProjectMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrProjectMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoIr.IrProject;
import com.dy.pipIrrGlobal.voIr.VoProject;
+import com.dy.pipIrrGlobal.voIr.VoProjectDetail;
import com.dy.pipIrrGlobal.voIr.VoProjectOne;
import com.dy.pipIrrGlobal.voIr.VoProjectSimple;
import org.apache.ibatis.annotations.Mapper;
@@ -79,4 +80,11 @@
* @return
*/
List<VoProjectSimple> getSimpleProjects(Map<?, ?> params);
+
+ /**
+ * 鏍规嵁椤圭洰Id鑾峰彇椤圭洰璇︽儏锛岀紪杈戦」鐩俊鎭娇鐢�
+ * @param projectId
+ * @return
+ */
+ VoProjectDetail getProjectDetail(Long projectId);
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoProjectDetail.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoProjectDetail.java
new file mode 100644
index 0000000..29c2859
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoProjectDetail.java
@@ -0,0 +1,27 @@
+package com.dy.pipIrrGlobal.voIr;
+
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import lombok.Data;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2025-03-28 8:49
+ * @LastEditTime 2025-03-28 8:49
+ * @Description 鐏屾簤椤圭洰璇︽儏瑙嗗浘瀵硅薄
+ */
+
+@Data
+@JsonPropertyOrder({"projectName", "irrigateGroups"})
+public class VoProjectDetail {
+ public static final long serialVersionUID = 202503280850001L;
+
+ /**
+ * 椤圭洰鍚嶇О
+ */
+ private String projectName;
+
+ /**
+ * 鐏屾簤缁勫垪琛�
+ */
+ private String irrigateGroups;
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrProjectGroupMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrProjectGroupMapper.xml
index d9ab535..62d8fdb 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrProjectGroupMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrProjectGroupMapper.xml
@@ -88,4 +88,9 @@
sort = #{sort,jdbcType=INTEGER}
where id = #{id,jdbcType=BIGINT}
</update>
+
+ <!--瑙ｇ粦椤圭洰涓庤疆缃愮粍鍏宠仈-->
+ <delete id="unbindGroup">
+ delete from ir_project_group where project_id=#{projectId}
+ </delete>
</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrProjectMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrProjectMapper.xml
index 050c788..304156e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrProjectMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrProjectMapper.xml
@@ -308,4 +308,22 @@
</if>
</trim>
</select>
+
+ <!--鏍规嵁椤圭洰Id鑾峰彇椤圭洰璇︽儏锛岀紪杈戦」鐩俊鎭娇鐢�-->
+ <select id="getProjectDetail" resultType="com.dy.pipIrrGlobal.voIr.VoProjectDetail">
+ SELECT
+ projectName,
+ GROUP_CONCAT(groupId) AS irrigateGroups
+ FROM
+ (
+ SELECT
+ pro.project_name AS projectName,
+ grp.id AS groupId
+ FROM ir_project pro
+ INNER JOIN ir_project_group pg ON pg.project_id = pro.id
+ INNER JOIN ir_irrigate_group grp ON grp.id = pg.group_id
+ WHERE pro.id = #{projectId}
+ ) project
+ GROUP BY projectName
+ </select>
</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/PipIrrIrrigateApplication.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/PipIrrIrrigateApplication.java
index 2d31732..297f1a0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/PipIrrIrrigateApplication.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/PipIrrIrrigateApplication.java
@@ -9,7 +9,7 @@
import org.springframework.context.annotation.FilterType;
@SpringBootApplication
-@EnableAspectJAutoProxy
+@EnableAspectJAutoProxy(exposeProxy = true)
@EnableMultiDataSource
@ComponentScan(basePackages = {"com.dy.common", "com.dy.pipIrrGlobal", "com.dy.pipIrrIrrigate"},
excludeFilters = {
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 0814908..30ab742 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
@@ -7,10 +7,11 @@
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.pojoIr.IrProject;
import com.dy.pipIrrGlobal.voIr.VoProject;
+import com.dy.pipIrrGlobal.voIr.VoProjectDetail;
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.project.dto.IrrigateProject;
import com.dy.pipIrrIrrigate.result.IrrigateResultCode;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
@@ -26,7 +27,10 @@
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
/**
* @author :WuZeYu
@@ -77,45 +81,7 @@
}
/**
- * 娣诲姞椤圭洰锛屾柊鐗堟湰锛屼娇鐢ㄨ繖涓�
- * @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);
- }
-
- /**
- * 閫昏緫鍒犻櫎椤圭洰
+ * 閫昏緫鍒犻櫎椤圭洰锛屾棫鐗堟湰锛屽師鍒欎笂搴熷純
* @param map
* @return
*/
@@ -177,7 +143,7 @@
}
/**
- * 淇敼椤圭洰淇℃伅
+ * 淇敼椤圭洰淇℃伅锛屾棫鐗堟湰锛屽師鍒欎笂搴熷純
* @param po
* @param bindingResult
* @return
@@ -211,7 +177,7 @@
}
/**
- * 淇敼椤圭洰鐘舵��
+ * 淇敼椤圭洰鐘舵�侊紝鏃犵敤鎺ュ彛锛屽師鍒欎笂搴熷純
* @param po
* @param
* @return
@@ -242,8 +208,7 @@
}
/**
- * 鑾峰彇涓�涓」鐩暟鎹�
- *
+ * 鑾峰彇涓�涓」鐩暟鎹紝鏃х増鏈紝鍘熷垯涓婂簾寮�
* @return 鑾峰彇涓�涓」鐩暟鎹�
*/
@Operation(summary = "鑾峰彇涓�涓」鐩暟鎹�", description = "鑾峰彇涓�涓」鐩暟鎹�")
@@ -291,6 +256,108 @@
}
/**
+ * 娣诲姞椤圭洰锛屾柊鐗堟湰锛屼娇鐢ㄨ繖涓�
+ * @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());
+ }
+
+ Map map_result = projectSv.addIrrigateProject(po);
+ if(map_result.get("success").equals(false)) {
+ return BaseResponseUtils.buildErrorMsg(map_result.get("msg").toString());
+ }
+ return BaseResponseUtils.buildSuccess() ;
+
+ //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(",");
+ //Integer sort = 1;
+ //for(String irrigateGroupId : irrigateGroupArr) {
+ // String trimmed = irrigateGroupId.trim();
+ // if(trimmed.isEmpty()) {
+ // continue;
+ // }
+ // try {
+ // Long irrigateGroupIdLong = Long.parseLong(trimmed);
+ // IrProjectGroup irProjectGroup = new IrProjectGroup();
+ // irProjectGroup.setProjectId(projectId);
+ // irProjectGroup.setGroupId(irrigateGroupIdLong);
+ // irProjectGroup.setSort(sort++);
+ // projectSv.projectBindGroup(irProjectGroup);
+ //
+ // } catch (NumberFormatException e) {
+ // return BaseResponseUtils.buildErrorMsg("鐏屾簤缁処D鏍煎紡閿欒");
+ // }
+ //}
+
+ }
+
+ /**
+ * 鍒犻櫎椤圭洰锛屾柊鐗堟湰锛屼娇鐢ㄨ繖涓�
+ * @param projectId
+ * @return
+ */
+ @PostMapping(path = "deleteIrrigateProject")
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> deleteIrrigateProject(@RequestParam(required = false) Long projectId) {
+ if(projectId == null) {
+ return BaseResponseUtils.buildErrorMsg("椤圭洰ID涓嶈兘涓虹┖");
+ }
+
+ Map map_result = projectSv.deleteIrrigateProject(projectId);
+ 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 = "updateIrrigateProject", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> updateIrrigateProject(@RequestBody @Valid IrrigateProject po, BindingResult bindingResult){
+ if (bindingResult != null && bindingResult.hasErrors()) {
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ if(po.getProjectId() == null) {
+ return BaseResponseUtils.buildErrorMsg("椤圭洰ID涓嶈兘涓虹┖");
+ }
+
+ Map map_result = projectSv.updateIrrigateProject(po);
+ if(map_result.get("success").equals(false)) {
+ return BaseResponseUtils.buildErrorMsg(map_result.get("msg").toString());
+ }
+ return BaseResponseUtils.buildSuccess() ;
+ }
+
+ /**
* 鍒嗛〉鏌ヨ椤圭洰锛屾柊鐗堟湰锛岀洰鍓嶄娇鐢�
* @param qo
* @return
@@ -307,4 +374,22 @@
}
}
+ /**
+ * 鏍规嵁椤圭洰Id鑾峰彇椤圭洰璇︽儏锛岀紪杈戦」鐩俊鎭娇鐢�
+ * @param projectId
+ * @return
+ */
+ @GetMapping(path = "getProject")
+ @SsoAop()
+ public BaseResponse<VoProjectDetail> getProject(@RequestParam Long projectId) {
+ if(projectId == null) {
+ return BaseResponseUtils.buildErrorMsg("椤圭洰ID涓嶈兘涓虹┖");
+ }
+
+ Map map_result = projectSv.getProjectDetail(projectId);
+ if(map_result.get("success").equals(false)) {
+ return BaseResponseUtils.buildErrorMsg(map_result.get("msg").toString());
+ }
+ return BaseResponseUtils.buildSuccess(map_result.get("content")) ;
+ }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectSv.java
index 9df7dfb..0e913ac 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectSv.java
@@ -2,17 +2,24 @@
import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pipIrrGlobal.daoIr.IrProjectGroupMapper;
import com.dy.pipIrrGlobal.daoIr.IrProjectMapper;
import com.dy.pipIrrGlobal.pojoIr.IrProject;
+import com.dy.pipIrrGlobal.pojoIr.IrProjectGroup;
import com.dy.pipIrrGlobal.voIr.VoProject;
+import com.dy.pipIrrGlobal.voIr.VoProjectDetail;
import com.dy.pipIrrGlobal.voIr.VoProjectOne;
import com.dy.pipIrrGlobal.voIr.VoProjectSimple;
+import com.dy.pipIrrIrrigate.project.dto.IrrigateProject;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
+import org.springframework.aop.framework.AopContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -27,6 +34,9 @@
public class ProjectSv {
@Autowired
private IrProjectMapper irProjectMapper;
+
+ @Autowired
+ private IrProjectGroupMapper irProjectGroupMapper;
/**
* 娣诲姞椤圭洰锛屾棫鐗堟湰锛屽師鍒欎笂搴熷純
@@ -66,14 +76,117 @@
* @param po
* @return
*/
- public Long addIrrigateProject(IrProject po) {
- irProjectMapper.insert(po);
- return po.getId();
+ @Transactional(rollbackFor = Exception.class)
+ public Map addIrrigateProject(IrrigateProject po) {
+ 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);
+ irProjectMapper.insert(irProject);
+ Long projectId = irProject.getId();
+ if(projectId == null) {
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", "鍒涘缓鐏屾簤椤圭洰澶辫触");
+ map.put("content", null);
+ return map;
+ }
+
+ String[] irrigateGroupArr = irrigateGroups.split(",");
+ Integer sort = 1;
+ for(String irrigateGroupId : irrigateGroupArr) {
+ String trimmed = irrigateGroupId.trim();
+ if(trimmed.isEmpty()) {
+ continue;
+ }
+ try {
+ Long irrigateGroupIdLong = Long.parseLong(trimmed);
+ IrProjectGroup irProjectGroup = new IrProjectGroup();
+ irProjectGroup.setProjectId(projectId);
+ irProjectGroup.setGroupId(irrigateGroupIdLong);
+ irProjectGroup.setSort(sort++);
+ irProjectGroupMapper.insert(irProjectGroup);
+ } catch (NumberFormatException e) {
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", "鐏屾簤缁処D鏍煎紡閿欒");
+ map.put("content", null);
+ return map;
+ }
+ }
+ Map map = new HashMap<>();
+ map.put("success", true);
+ map.put("msg", "娣诲姞鐏屾簤椤圭洰鎴愬姛");
+ map.put("content", null);
+ return map;
}
/**
- * 鍒犻櫎椤圭洰
- *
+ * 鍒犻櫎鐏屾簤椤圭洰锛岀洰鍓嶄娇鐢�
+ * @param projectId
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public Map deleteIrrigateProject(Long projectId) {
+ try {
+ irProjectGroupMapper.unbindGroup(projectId);
+ irProjectMapper.deleteByPrimaryKey(projectId);
+
+ Map map = new HashMap<>();
+ map.put("success", true);
+ map.put("msg", "鐏屾簤椤圭洰鍒犻櫎鎴愬姛");
+ map.put("content", null);
+ return map;
+ } catch (Exception e) {
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", "鐏屾簤椤圭洰鍒犻櫎澶辫触");
+ map.put("content", null);
+ return map;
+ }
+ }
+
+ /**
+ * 淇敼鐏屾簤椤圭洰锛岀洰鍓嶄娇鐢�
+ * @param po
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public Map updateIrrigateProject(IrrigateProject po) {
+ Long projectId = po.getProjectId();
+ Map map_deleteProject = ((ProjectSv) AopContext.currentProxy()).deleteIrrigateProject(projectId);
+ if(map_deleteProject.get("success").equals(false)) {
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", map_deleteProject.get("msg").toString());
+ map.put("content", null);
+ return map;
+ }
+
+ Map map_addProject = ((ProjectSv) AopContext.currentProxy()).addIrrigateProject(po);
+ if(map_addProject.get("success").equals(false)) {
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", map_addProject.get("msg").toString());
+ map.put("content", null);
+ return map;
+ }
+
+ Map map = new HashMap<>();
+ map.put("success", true);
+ map.put("msg", "淇敼鐏屾簤椤圭洰鎴愬姛");
+ map.put("content", null);
+ return map;
+ }
+
+ /**
+ * 鍒犻櫎椤圭洰锛屾棫鐗堟湰锛屽師鍒欎笂搴熷純
* @param id
*/
public Integer deleteProject(Long id) {
@@ -173,4 +286,26 @@
rsVo.obj = irProjectMapper.getSimpleProjects(params);
return rsVo;
}
+
+ /**
+ * 鏍规嵁椤圭洰Id鑾峰彇椤圭洰璇︽儏锛岀紪杈戦」鐩俊鎭娇鐢�
+ * @param projectId
+ * @return
+ */
+ public Map getProjectDetail(Long projectId) {
+ try {
+ VoProjectDetail voProjectDetail = irProjectMapper.getProjectDetail(projectId);
+ Map map = new HashMap<>();
+ map.put("success", true);
+ map.put("msg", "鑾峰彇椤圭洰璇︽儏鎴愬姛");
+ map.put("content", voProjectDetail);
+ return map;
+ } catch (Exception e) {
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", "鑾峰彇椤圭洰璇︽儏澶辫触");
+ map.put("content", null);
+ return map;
+ }
+ }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/dto/irrigateProject.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/dto/IrrigateProject.java
similarity index 85%
rename from pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/dto/irrigateProject.java
rename to pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/dto/IrrigateProject.java
index cf6c558..6c44efe 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/dto/irrigateProject.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/dto/IrrigateProject.java
@@ -12,10 +12,15 @@
*/
@Data
-public class irrigateProject {
+public class IrrigateProject {
public static final long serialVersionUID = 202503271510001L;
/**
+ * 椤圭洰ID锛屼慨鏀归」鐩俊鎭椂闇�瑕佷紶鍏�
+ */
+ private Long projectId;
+
+ /**
* 椤圭洰鍚嶇О
*/
@NotBlank(message = "椤圭洰鍚嶇О涓嶈兘涓虹┖")
--
Gitblit v1.8.0