From 3128a684d6654131f01472ee95aa3f09a9d12dac Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 三月 2025 14:24:50 +0800
Subject: [PATCH] 1、git同步冲突引起文件丢失，进行系统恢复，并屏蔽一个非git提交的模块； 2、增加文件《增加一个单位（orgTag）》。
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java | 119 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 72 insertions(+), 47 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java
index daa4efb..6367ea5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java
@@ -1,21 +1,18 @@
package com.dy.pipIrrWechat.irrigatePlan;
-import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoIr.*;
import com.dy.pipIrrGlobal.pojoIr.IrIrrigatePlan;
import com.dy.pipIrrGlobal.pojoIr.IrIrrigateSchedule;
-import com.dy.pipIrrGlobal.pojoIr.IrOpeningSchedule;
import com.dy.pipIrrGlobal.pojoIr.IrPlanOperate;
-import com.dy.pipIrrGlobal.voIr.VoIrrigatePlan;
+import com.dy.pipIrrGlobal.pojoIr.IrPlanSchedule;
import com.dy.pipIrrGlobal.voIr.VoIrrigateSchedule;
-import com.dy.pipIrrWechat.irrigatePlan.qo.QoIrrigatePlan;
+import com.dy.pipIrrGlobal.voIr.VoPlanSimple;
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.List;
-import java.util.Map;
/**
* @author ZhuBaoMin
@@ -45,6 +42,12 @@
@Autowired
private IrIrrigateUnitMapper irIrrigateUnitMapper;
+ @Autowired
+ private IrPlanScheduleMapper irPlanScheduleMapper;
+
+ @Autowired
+ private IrGroupIntakeMapper irGroupIntakeMapper;
+
/**
* 娣诲姞鐏屾簤璁″垝
* @param po
@@ -69,37 +72,19 @@
* @param queryVo
* @return
*/
- public QueryResultVo<List<VoIrrigatePlan>> getIrrigatePlans(QoIrrigatePlan queryVo) {
- Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
-
- Long itemTotal = irrigatePlanMapper.getIrrigatePlanCount(params);
-
- QueryResultVo<List<VoIrrigatePlan>> rsVo = new QueryResultVo<>();
- rsVo.pageSize = queryVo.pageSize;
- rsVo.pageCurr = queryVo.pageCurr;
-
- rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = irrigatePlanMapper.getIrrigatePlans(params);
- return rsVo;
- }
-
- /**
- * 鏍规嵁鎸囧畾鐨勮鍒扞D鑾峰彇宸插彂甯冪殑鐏屾簤璁″垝鏁伴噺
- * @param planId
- * @return
- */
- public Integer getPublishedCount(Long planId) {
- return irrigatePlanMapper.getPublishedCount(planId);
- }
-
- /**
- * 鍙戝竷鎸囧畾鐨勭亴婧夎鍒�
- * @param planId
- * @return
- */
- public Integer publishIrrigatePlan(Long planId) {
- return irrigatePlanMapper.publishIrrigatePlan(planId);
- }
+ //public QueryResultVo<List<VoIrrigatePlan>> getIrrigatePlans(QoIrrigatePlan queryVo) {
+ // Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+ //
+ // Long itemTotal = irrigatePlanMapper.getIrrigatePlanCount(params);
+ //
+ // QueryResultVo<List<VoIrrigatePlan>> rsVo = new QueryResultVo<>();
+ // rsVo.pageSize = queryVo.pageSize;
+ // rsVo.pageCurr = queryVo.pageCurr;
+ //
+ // rsVo.calculateAndSet(itemTotal, params);
+ // rsVo.obj = irrigatePlanMapper.getIrrigatePlans(params);
+ // return rsVo;
+ //}
/**
* 娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍
@@ -122,34 +107,74 @@
}
/**
- * 鏍规嵁璁″垝ID鑾峰彇鐏屾簤娆″簭
+ * 鏍规嵁璁″垝ID鑾峰彇鐏屾簤娆″簭璁板綍
* @param planId
* @return
*/
- public List<VoIrrigateSchedule> getIrrigateSchedules(Byte startupMode, Long planId) {
- return irIrrigateScheduleMapper.getIrrigateSchedules(startupMode, planId);
+ public List<VoIrrigateSchedule> getSchedulesByPlanId(Long planId) {
+ return irIrrigateScheduleMapper.getSchedulesByPlanId(planId);
}
/**
- * 娣诲姞寮�闃�璁″垝
+ * 鏍规嵁缁処D鑾峰彇鍙栨按鍙D闆嗗悎
+ * @param groupId
+ * @return
+ */
+ public List<Long> getIntakeIdsByGroupId(Long groupId) {
+ return irGroupIntakeMapper.getIntakeIdsByGroupId(groupId);
+ }
+
+ /**
+ * 娣诲姞璁″垝娆″簭鍏宠仈璁板綍
* @param po
* @return
*/
- public Long addOpeningSchedule(IrOpeningSchedule po) {
- irOpeningScheduleMapper.insert(po);
+ public Long addPlanSchedule(IrPlanSchedule po) {
+ irPlanScheduleMapper.insert(po);
return po.getId();
}
/**
- * 鏍规嵁杞亴缁処D鑾峰彇鍙栨按鍙D鍒楄〃
- * @param groupId
+ * 鏍规嵁璁″垝ID鑾峰彇璁″垝绠�鍗曚俊鎭垪琛�
+ * @param planId
* @return
*/
- public List<Long> getIntakesByGroupId(Long groupId) {
- return irIrrigateGroupMapper.getIntakesByGroupId(groupId);
+ public VoPlanSimple getPlanSimple(Long planId) {
+ return irrigatePlanMapper.getPlanSimple(planId);
}
/**
+ * 鏍规嵁璁″垝ID鏇存柊璁″垝淇℃伅锛堣捣姝㈡椂闂淬�佽鍒掔姸鎬侊級
+ * @param planStartTime
+ * @param planEndTime
+ * @param planId
+ * @return
+ */
+ public Integer updatePlanTimes(Date planStartTime, Date planEndTime, Long planId) {
+ return irrigatePlanMapper.updatePlanTimes(planStartTime, planEndTime, planId);
+ }
+
+ /**
+ * 鏍规嵁鐏屾簤娆″簭ID鏇存柊娆″簭寮�濮嬫椂闂�
+ * @param scheduleId
+ * @param startTime
+ * @return
+ */
+ public Integer updateScheduleStartTime(Long scheduleId, Date startTime) {
+ return irIrrigateScheduleMapper.updateScheduleStartTime(scheduleId, startTime);
+ }
+
+ ///**
+ // * 娣诲姞寮�闃�璁″垝
+ // * @param po
+ // * @return
+ // */
+ //public Long addOpeningSchedule(IrOpeningSchedule po) {
+ // irOpeningScheduleMapper.insert(po);
+ // return po.getId();
+ //}
+
+ /**
* 鏍规嵁鐏屾簤鍗曞厓ID鑾峰彇鍙栨按鍙D
* @param unitId
* @return
--
Gitblit v1.8.0