From a98b1db4392c357304036e8b3cdd01646920300d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 21 Jul 2022 15:41:23 +0800
Subject: [PATCH] 1.山洪

---
 src/main/java/org/springblade/modules/mountainrain/service/impl/MountainrainServiceImpl.java |   46 +++++++++++++++++++++++++++++++---------------
 1 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/springblade/modules/mountainrain/service/impl/MountainrainServiceImpl.java b/src/main/java/org/springblade/modules/mountainrain/service/impl/MountainrainServiceImpl.java
index a0ff84a..1b39501 100644
--- a/src/main/java/org/springblade/modules/mountainrain/service/impl/MountainrainServiceImpl.java
+++ b/src/main/java/org/springblade/modules/mountainrain/service/impl/MountainrainServiceImpl.java
@@ -25,24 +25,41 @@
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springblade.common.cache.DictCache;
+import org.springblade.common.cache.ParamCache;
+import org.springblade.common.cache.SysCache;
+import org.springblade.common.cache.UserCache;
+import org.springblade.common.enums.DictEnum;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.modules.mountain.entity.Mountain;
 import org.springblade.modules.mountain.service.IMountainService;
 import org.springblade.modules.mountainrain.entity.Mountainrain;
 import org.springblade.modules.mountainrain.entity.Yucpptn;
+import org.springblade.modules.mountainrain.excel.BgrExcel;
+import org.springblade.modules.mountainrain.excel.MgrExcel;
 import org.springblade.modules.mountainrain.mapper.MountainrainMapper;
 import org.springblade.modules.mountainrain.service.IMountainrainService;
 import org.springblade.modules.mountainrain.vo.*;
 import org.springblade.modules.mountainrain.wrapper.MountainrainWrapper;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.excel.UserExcel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.InputStream;
 import java.text.DecimalFormat;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+
+import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;
 
 /**
  *  服务实现类
@@ -416,8 +433,8 @@
 	}
 
 	@Override
-	public void soleInster(String stcd, String soilval) {
-		baseMapper.soleInster(stcd,soilval);
+	public void soleInster(String stcd, String soilval,String stime) {
+		baseMapper.soleInster(stcd,soilval,stime);
 	}
 
 	@Override
@@ -441,28 +458,28 @@
 	}
 
 	@Override
-	public List<Map<String, Object>> selctsmriver(String time,String dateEnd) {
-		return baseMapper.selctsmriver(time, dateEnd);
+	public List<Map<String, Object>> selctsmriver(String time,String dateEnd,String begintime24) {
+		return baseMapper.selctsmriver(time, dateEnd,begintime24);
 	}
 
 	@Override
-	public List<Map<String, Object>> selctbgriver(String time,String dateEnd) {
-		return baseMapper.selctbgriver(time, dateEnd);
+	public List<Map<String, Object>> selctbgriver(String time,String dateEnd,String begintime24) {
+		return baseMapper.selctbgriver(time, dateEnd,begintime24);
 	}
 
 	@Override
-	public List<MountainrainsCVO> MountainYi(String times, String dateEnd1, String code) {
-		return baseMapper.MountainYi(times, dateEnd1, code);
+	public List<MountainrainsCVO> MountainYi(String times, String dateEnd1, String code,String stime) {
+		return baseMapper.MountainYi(times, dateEnd1, code,stime);
 	}
 
 	@Override
-	public List<MountainrainsCVO> MountainTw(String times, String dateEnd2, String code) {
-		return baseMapper.MountainTw(times, dateEnd2, code);
+	public List<MountainrainsCVO> MountainTw(String times, String dateEnd2, String code,String stime) {
+		return baseMapper.MountainTw(times, dateEnd2, code,stime);
 	}
 
 	@Override
-	public List<MountainrainsCVO> MountainTr(String times, String dateEnd3, String code) {
-		return baseMapper.MountainTr(times, dateEnd3, code);
+	public List<MountainrainsCVO> MountainTr(String times, String dateEnd3, String code,String stime) {
+		return baseMapper.MountainTr(times, dateEnd3, code,stime);
 	}
 
 	@Override
@@ -486,15 +503,14 @@
 	}
 
 	@Override
-	public List<Map<String, Object>> selectS() {
-		return baseMapper.selectS();
+	public List<Map<String, Object>> selectS(String stime) {
+		return baseMapper.selectS(stime);
 	}
 
 	@Override
 	public void del() {
 		baseMapper.del();
 	}
-
 
 	/*
 	 * 计算最大值

--
Gitblit v1.9.3