From 759160807674a36ad8b04ea516da258a8d0cfef5 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 22 七月 2024 15:31:07 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupSv.java | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 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 f776ad5..76dd797 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,8 +1,10 @@
package com.dy.pipIrrIrrigate.irrigateGroup;
import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pipIrrGlobal.daoIr.IrGroupClientMapper;
import com.dy.pipIrrGlobal.daoIr.IrGroupUnitMapper;
import com.dy.pipIrrGlobal.daoIr.IrIrrigateGroupMapper;
+import com.dy.pipIrrGlobal.pojoIr.IrGroupClient;
import com.dy.pipIrrGlobal.pojoIr.IrGroupUnit;
import com.dy.pipIrrGlobal.pojoIr.IrIrrigateGroup;
import com.dy.pipIrrGlobal.voIr.VoGroup;
@@ -25,11 +27,13 @@
@Slf4j
@Service
public class IrrigateGroupSv {
-
@Autowired
private IrIrrigateGroupMapper irIrrigateGroupMapper;
@Autowired
private IrGroupUnitMapper irGroupUnitMapper;
+
+ @Autowired
+ private IrGroupClientMapper irGroupClientMapper;
/**
* 鍒涘缓杞亴缁�
@@ -110,7 +114,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 +128,44 @@
* @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);
+ }
}
--
Gitblit v1.8.0