From 1a2b07f01ba4616fd9e894dddf474b56d020158c Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期一, 07 四月 2025 15:18:51 +0800 Subject: [PATCH] 整理版本 --- pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupSv.java | 221 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 216 insertions(+), 5 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 f776ad5..1419aa1 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,27 @@ 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.VoGroupDetail; import com.dy.pipIrrGlobal.voIr.VoGroupOne; +import com.dy.pipIrrGlobal.voIr.VoGroupSimple; +import com.dy.pipIrrIrrigate.irrigateGroup.dto.IrrigateGroup; +import com.dy.pipIrrIrrigate.irrigateGroup.qo.QoGroup; 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 +34,17 @@ @Slf4j @Service public class IrrigateGroupSv { - @Autowired private IrIrrigateGroupMapper irIrrigateGroupMapper; + @Autowired private IrGroupUnitMapper irGroupUnitMapper; + + @Autowired + private IrGroupClientMapper irGroupClientMapper; + + @Autowired + private IrGroupIntakeMapper irGroupIntakeMapper; /** * 鍒涘缓杞亴缁� @@ -38,7 +53,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 +82,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; @@ -110,7 +125,6 @@ */ public Integer addGroupUnit(IrGroupUnit po) { po.setOperateDt(new Date()); - po.setDeleted((byte) 0); int rows = irGroupUnitMapper.insertSelective(po); if (rows == 0) { return 0; @@ -125,11 +139,208 @@ * @return */ public Integer deleteGroupUnit(IrGroupUnit po) { - po.setOperateDt(new Date()); int rows = irGroupUnitMapper.deleteByUnitIdGroupId(po); if (rows == 0) { return 0; } return 1; } + + /** + * 鏌ヤ竴涓疆鐏岀粍缁戝畾鐨勭亴婧夊崟鍏僫d + * @param groupId + * @return + */ + public List<Long> getGroupBindUnits(Long groupId) { + List<Long> groupBindUnits = irGroupUnitMapper.getGroupBindUnits(groupId); + return groupBindUnits; + } + + /** + * //鏌ユ湭缁戝畾杞亴缁勭殑鐏屾簤鍗曞厓id + * @return + */ + public List<Long> getNotBindUnits() { + 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; + } + } + + /** + * 淇敼杞亴缁� + * @param po + * @return + */ + public Map updateIrrigateGroup(IrrigateGroup po) { + 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; + } + + 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; + } + + Map map = new HashMap<>(); + map.put("success", true); + map.put("msg", "淇敼杞亴缁勬垚鍔�"); + map.put("content", null); + return map; + } + + /** + * 鏌ヨ杞亴缁勫垪琛� + * @param queryVo + * @return + */ + public QueryResultVo<List<VoGroupSimple>> getSimpleGroups(QoGroup queryVo) { + Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo); + Long itemTotal = irIrrigateGroupMapper.getSimpleGroupCount(params); + + QueryResultVo<List<VoGroupSimple>> rsVo = new QueryResultVo<>(); + rsVo.pageSize = queryVo.pageSize; + rsVo.pageCurr = queryVo.pageCurr; + rsVo.calculateAndSet(itemTotal, params); + rsVo.obj = irIrrigateGroupMapper.getSimpleGroups(params); + return rsVo; + } + + /** + * 鏌ヨ鍏ㄩ儴杞亴缁� + * @return + */ + public List<VoGroupSimple> getAllGroups() { + //Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo); + //Long itemTotal = irIrrigateGroupMapper.getSimpleGroupCount(params); + + //QueryResultVo<List<VoGroupSimple>> rsVo = new QueryResultVo<>(); + //rsVo.pageSize = queryVo.pageSize; + //rsVo.pageCurr = queryVo.pageCurr; + //rsVo.calculateAndSet(itemTotal, params); + //rsVo.obj = irIrrigateGroupMapper.getSimpleGroups(null); + //return rsVo; + + return irIrrigateGroupMapper.getSimpleGroups(null); + } + + /** + * 鑾峰彇杞亴缁勮鎯� + * @param groupId + * @return + */ + public Map getGroupDetail(Long groupId) { + try { + VoGroupDetail voGroupDetail = irIrrigateGroupMapper.getGroupDetail(groupId); + Map map = new HashMap<>(); + map.put("success", true); + map.put("msg", "鑾峰彇杞亴缁勮鎯呮垚鍔�"); + map.put("content", voGroupDetail); + 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