From 4297d17c914dc6b2d64388776ba0db7fb093c1b9 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期六, 29 三月 2025 08:32:03 +0800 Subject: [PATCH] 轮灌组添加接口、删除接口 --- pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupSv.java | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 103 insertions(+), 3 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 d1e3e50..61962f8 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 @@ -1,18 +1,24 @@ package com.dy.pipIrrIrrigate.irrigateGroup; import com.dy.common.webUtil.QueryResultVo; +import com.dy.pipIrrGlobal.daoIr.IrGroupClientMapper; +import com.dy.pipIrrGlobal.daoIr.IrGroupIntakeMapper; import com.dy.pipIrrGlobal.daoIr.IrGroupUnitMapper; import com.dy.pipIrrGlobal.daoIr.IrIrrigateGroupMapper; +import com.dy.pipIrrGlobal.pojoIr.IrGroupClient; +import com.dy.pipIrrGlobal.pojoIr.IrGroupIntake; import com.dy.pipIrrGlobal.pojoIr.IrGroupUnit; import com.dy.pipIrrGlobal.pojoIr.IrIrrigateGroup; import com.dy.pipIrrGlobal.voIr.VoGroup; import com.dy.pipIrrGlobal.voIr.VoGroupOne; +import com.dy.pipIrrIrrigate.irrigateGroup.dto.IrrigateGroup; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.common.utils.PojoUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -25,11 +31,16 @@ @Slf4j @Service public class IrrigateGroupSv { - @Autowired private IrIrrigateGroupMapper irIrrigateGroupMapper; @Autowired private IrGroupUnitMapper irGroupUnitMapper; + + @Autowired + private IrGroupClientMapper irGroupClientMapper; + + @Autowired + private IrGroupIntakeMapper irGroupIntakeMapper; /** * 鍒涘缓杞亴缁� @@ -38,7 +49,7 @@ * @return */ public Integer addIrrigateGroup(IrIrrigateGroup po) { - po.setOperateDt(new Date()); + po.setOperateTime(new Date()); po.setDeleted((byte) 0); int rows = irIrrigateGroupMapper.insertSelective(po); if (rows == 0) { @@ -67,7 +78,7 @@ * @return */ public Integer updateIrrigateGroup(IrIrrigateGroup po){ - po.setOperateDt(new Date()); + po.setOperateTime(new Date()); int rows = irIrrigateGroupMapper.updateByPrimaryKeySelective(po); if (rows == 0){ return 0; @@ -149,4 +160,93 @@ List<Long> notBindUnits = irGroupUnitMapper.getNotBindUnits(); return notBindUnits; } + + //杞亴缁勫叧鑱斿啘鎴� + public Long addGroupClient(IrGroupClient po) { + irGroupClientMapper.insert(po); + return po.getId(); + } + + /** + * 鍒犻櫎杞亴缁勪笌鍐滄埛绠$悊 + * @param id + * @return + */ + public Integer deleteGroupClient (Long id) { + return irGroupClientMapper.deleteByPrimaryKey(id); + } + + /** + * 鍒涘缓杞亴缁� + * @param po + * @return + */ + public Map addIrrigateGroup(IrrigateGroup po) { + IrIrrigateGroup irrigateGroup = new IrIrrigateGroup(); + irrigateGroup.setGroupCode(po.getGroupCode()); + irrigateGroup.setDefaultDuration(po.getDefaultDuration()); + irrigateGroup.setOperator(po.getOperator()); + irrigateGroup.setOperateTime(new Date()); + irrigateGroup.setDeleted((byte) 0); + irIrrigateGroupMapper.insertSelective(irrigateGroup); + Long groupId = irrigateGroup.getId(); + if(groupId == null) { + Map map = new HashMap<>(); + map.put("success", false); + map.put("msg", "鍒涘缓杞亴缁勫け璐�"); + 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", "娣诲姞杞亴缁勬垚鍔�"); + map.put("content", null); + return map; + } + + /** + * 鏍规嵁缁処D鍒犻櫎鍙栨按鍙e叧鑱� + * @param groupId + * @return + */ + public Map deleteGroup(Long groupId) { + try { + irGroupIntakeMapper.deleteByGroupId(groupId); + irIrrigateGroupMapper.deleteByPrimaryKey(groupId); + + 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; + } + } } -- Gitblit v1.8.0