From 4a2deb11b819dd78a8c75e244ef67ec2e48cf5f5 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 14 四月 2025 21:03:28 +0800
Subject: [PATCH] 重构轮灌组修改接口
---
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupSv.java | 50 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupSv.java
index 1419aa1..1ff9050 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupSv.java
@@ -260,25 +260,43 @@
* @return
*/
public Map updateIrrigateGroup(IrrigateGroup po) {
+ // 淇敼杞亴缁�
+ IrIrrigateGroup irrigateGroup = new IrIrrigateGroup();
+ irrigateGroup.setId(po.getGroupId());
+ irrigateGroup.setGroupCode(po.getGroupCode());
+ irrigateGroup.setDefaultDuration(po.getDefaultDuration());
+ irrigateGroup.setOperator(po.getOperator());
+ irrigateGroup.setOperateTime(new Date());
+ irrigateGroup.setDeleted((byte) 0);
+ irIrrigateGroupMapper.updateByPrimaryKeySelective(irrigateGroup);
+
+ // 鍒犻櫎杞亴缁勪笌鍙栨按鍙ｅ叧鑱�
Long groupId = po.getGroupId();
- Map map_deleteGroup = deleteGroup(groupId);
- if(map_deleteGroup.get("success").equals(false)) {
- Map map = new HashMap<>();
- map.put("success", false);
- map.put("msg", map_deleteGroup.get("msg").toString());
- map.put("content", null);
- return map;
- }
+ irGroupIntakeMapper.deleteByGroupId(groupId);
- Map map_addGroup = addIrrigateGroup(po);
- if(map_addGroup.get("success").equals(false)) {
- Map map = new HashMap<>();
- map.put("success", false);
- map.put("msg", map_addGroup.get("msg").toString());
- map.put("content", null);
- return map;
- }
+ // 娣诲姞杞亴缁勪笌鍙栨按鍙ｅ叧鑱�
+ String[] intakeArr = po.getIntakes().split(",");
+ Integer sort = 1;
+ for(String intekeId : intakeArr) {
+ String trimmed = intekeId.trim();
+ if(trimmed.isEmpty()) {
+ continue;
+ }
+ try {
+ Long intakeIdLong = Long.parseLong(trimmed);
+ IrGroupIntake irGroupIntake = new IrGroupIntake();
+ irGroupIntake.setGroupId(groupId);
+ irGroupIntake.setIntakeId(intakeIdLong);
+ irGroupIntakeMapper.insert(irGroupIntake);
+ } 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", "淇敼杞亴缁勬垚鍔�");
--
Gitblit v1.8.0