兴安盟水资源运维系统-修改实时数据功能，返回离线的站点

.editorconfig

@@ -1,21 +0,0 @@
-# http://editorconfig.org
-root = true
-
-# 空格替代Tab缩进在各种编辑工具下效果一致
-[*]
-indent_style = space
-indent_size = 4
-charset = utf-8
-end_of_line = lf
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.java]
-indent_style = tab
-
-[*.{json,yml}]
-indent_size = 2
-
-[*.md]
-insert_final_newline = false
-trim_trailing_whitespace = false

.gitignore

@@ -1,27 +0,0 @@
-# maven #
-target
-
-logs
-
-# windows #
-Thumbs.db
-
-# Mac #
-.DS_Store
-
-# eclipse #
-.settings
-.project
-.classpath
-.log
-*.class
-
-# idea #
-.idea
-*.iml
-
-# Package Files #
-*.jar
-*.war
-*.ear
-/target

pom.xml

@@ -203,11 +203,7 @@
             <artifactId>javase</artifactId>
             <version>3.3.3</version>
         </dependency>
-        <dependency>
-            <groupId>org.rocksdb</groupId>
-            <artifactId>rocksdbjni</artifactId>
-            <version>5.5.1</version>
-        </dependency>
+
         <dependency>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>

src/main/java/org/springblade/etl/EtlGroundDataTask.java

@@ -1,65 +0,0 @@
-/**
- * Copyright
- * All right reserved.
- * 项目名称:
- * 创建日期:2022/5/22
- */
-package org.springblade.etl;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.springblade.etl.dto.EtlGroundDataDTO;
-import org.springblade.etl.entity.EtlGroundDataEntity;
-import org.springblade.etl.service.IEtlGroundDataService;
-import org.springblade.modules.business.data.entity.RtuDataGroundEntity;
-import org.springblade.modules.business.data.service.IRtuDataGroundService;
-
-import java.util.Date;
-import java.util.List;
-
-/***
- * Date:2022/5/22
- * Title: 墒情同步
- * Description：
- * @author swp
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-
-public class EtlGroundDataTask {
-
-	public static RtuDataGroundEntity dataSync(EtlGroundDataDTO etlGroundDataDTO, IEtlGroundDataService etlGroundDataService, IRtuDataGroundService rtuDataGroundService) {
-		List<EtlGroundDataEntity> groundDataEntityList = etlGroundDataService.selectLastList(etlGroundDataDTO);
-		if (null != groundDataEntityList && groundDataEntityList.size() > 0) {
-			EtlGroundDataEntity entity = groundDataEntityList.get(0);
-			LambdaQueryWrapper<RtuDataGroundEntity> dataWrapper = Wrappers.<RtuDataGroundEntity>query().lambda();
-			dataWrapper.eq(RtuDataGroundEntity::getRtuCode, entity.getRtuCode());
-			dataWrapper.eq(RtuDataGroundEntity::getIsDeleted, 0);
-			RtuDataGroundEntity groundDataEntity = rtuDataGroundService.getOne(dataWrapper);
-			if (null == groundDataEntity) {
-				groundDataEntity = new RtuDataGroundEntity();
-				groundDataEntity.setRtuCode(entity.getRtuCode());
-				groundDataEntity.setCreateTime(new Date());
-				groundDataEntity.setUpdateTime(new Date());
-				groundDataEntity.setStatus(1);
-				groundDataEntity.setIsDeleted(0);
-			}
-			groundDataEntity.setSlm10(entity.getMoco10cm());
-			groundDataEntity.setSlm20(entity.getMoco20cm());
-			groundDataEntity.setSlm30(entity.getMoco30cm());
-			groundDataEntity.setSlm40(entity.getMoco40cm());
-			groundDataEntity.setSlm50(entity.getMoco50cm());
-			groundDataEntity.setSlm60(entity.getMoco60cm());
-			groundDataEntity.setSlm80(entity.getMoco80cm());
-			groundDataEntity.setSlm100(entity.getMoco100cm());
-			groundDataEntity.setSrlslm(entity.getSurfMoco());
-			groundDataEntity.setVtavslm(entity.getVertAverMoco());
-			groundDataEntity.setTm(entity.getTm());
-			rtuDataGroundService.saveOrUpdate(groundDataEntity);
-
-			return groundDataEntity;
-		}
-		return null;
-	}
-}

src/main/java/org/springblade/etl/EtlMvAttStBaseDataTask.java

@@ -1,81 +0,0 @@
-/**
- * Copyright
- * All right reserved.
- * 项目名称:
- * 创建日期:2022/5/22
- */
-package org.springblade.etl;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.extern.slf4j.Slf4j;
-import org.springblade.etl.entity.EtlMvAttStBaseEntity;
-import org.springblade.etl.service.IEtlMvAttStBaseService;
-import org.springblade.modules.baseinfo.stbase.entity.MvAttStBaseEntity;
-import org.springblade.modules.baseinfo.stbase.service.IMvAttStBaseService;
-
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.Callable;
-
-/***
- * Date:2022/5/22
- * Title: 测站基础数据
- * Description：
- * @author swp
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Slf4j
-public class EtlMvAttStBaseDataTask implements Callable<Integer> {
-
-	private IEtlMvAttStBaseService etlMvAttStBaseService;
-	private IMvAttStBaseService mvAttStBaseService;
-
-	EtlMvAttStBaseDataTask(IEtlMvAttStBaseService etlMvAttStBaseService, IMvAttStBaseService mvAttStBaseService) {
-		this.etlMvAttStBaseService = etlMvAttStBaseService;
-		this.mvAttStBaseService = mvAttStBaseService;
-	}
-
-	@Override
-	public Integer call() {
-		try {
-
-			log.info("测站数据抽取开始**************");
-			List<EtlMvAttStBaseEntity> list = etlMvAttStBaseService.selectList();
-			if (list != null && list.size() > 0) {
-				for (int i = 0; i < list.size(); i++) {
-					EtlMvAttStBaseEntity entity = list.get(i);
-					LambdaQueryWrapper<MvAttStBaseEntity> dataWrapper = Wrappers.<MvAttStBaseEntity>query().lambda();
-					dataWrapper.eq(MvAttStBaseEntity::getStCode, entity.getStCode());
-					MvAttStBaseEntity baseEntity = mvAttStBaseService.getOne(dataWrapper);
-					if (null == baseEntity) {
-						baseEntity = new MvAttStBaseEntity();
-						baseEntity.setCreateTime(new Date());
-						baseEntity.setUpdateTime(new Date());
-						baseEntity.setStatus(1);
-						baseEntity.setIsDeleted(0);
-					}
-					baseEntity.setStCode(entity.getStCode());
-					baseEntity.setStName(entity.getStName());
-					baseEntity.setAdCode(entity.getAdCode());
-					baseEntity.setAdName(entity.getAdName());
-					baseEntity.setRvCode(entity.getRvCode());
-					baseEntity.setRvName(entity.getRvName());
-					baseEntity.setStLong(entity.getStLong());
-					baseEntity.setStLat(entity.getStLat());
-					baseEntity.setIsRain(entity.getIsRain());
-					baseEntity.setIsRiver(entity.getIsRiver());
-					baseEntity.setIsRes(entity.getIsRes());
-					baseEntity.setRainStType(entity.getRainStType());
-					baseEntity.setUpdateTime(new Date());
-					mvAttStBaseService.saveOrUpdate(baseEntity);
-				}
-			}
-		} catch (Exception e) {
-			log.error("实时数据统计任务异常 {}", e.getMessage());
-		}
-		return 0;
-	}
-}

src/main/java/org/springblade/etl/EtlRainDataTask.java

@@ -1,55 +0,0 @@
-/**
- * Copyright
- * All right reserved.
- * 项目名称:
- * 创建日期:2022/5/22
- */
-package org.springblade.etl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.springblade.etl.dto.EtlRainDataDTO;
-import org.springblade.etl.entity.EtlRainDataEntity;
-import org.springblade.etl.service.IEtlRainDataService;
-import org.springblade.modules.business.data.entity.RtuDataRainEntity;
-import org.springblade.modules.business.data.service.IRtuDataRainService;
-
-import java.util.Date;
-import java.util.List;
-
-
-/***
- * Date:2022/5/22
- * Title: 降水抽取
- * Description：每小时同步一次
- * @author swp
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public class EtlRainDataTask {
-
-	public static RtuDataRainEntity dataSync(EtlRainDataDTO etlRainDataDTO, IEtlRainDataService etlRainDataService, IRtuDataRainService rtuDataRainService) {
-		List<EtlRainDataEntity> rainDataEntityList = etlRainDataService.selectLastList(etlRainDataDTO);
-		if (null != rainDataEntityList && rainDataEntityList.size() > 0) {
-			EtlRainDataEntity entity = rainDataEntityList.get(0);
-			LambdaQueryWrapper<RtuDataRainEntity> dataWrapper = Wrappers.<RtuDataRainEntity>query().lambda();
-			dataWrapper.eq(RtuDataRainEntity::getRtuCode, entity.getRtuCode());
-			dataWrapper.eq(RtuDataRainEntity::getIsDeleted, 0);
-			RtuDataRainEntity rainEntity = rtuDataRainService.getOne(dataWrapper);
-			if (null == rainEntity) {
-				rainEntity = new RtuDataRainEntity();
-				rainEntity.setRtuCode(entity.getRtuCode());
-				rainEntity.setCreateTime(new Date());
-				rainEntity.setStatus(1);
-				rainEntity.setIsDeleted(0);
-			}
-			rainEntity.setUpdateTime(new Date());
-			rainEntity.setDrp(entity.getDrp());
-			rainEntity.setIntv(entity.getIntv());
-			rainEntity.setTm(entity.getTm());
-			rtuDataRainService.saveOrUpdate(rainEntity);
-			return rainEntity;
-		}
-		return null;
-	}
-}

src/main/java/org/springblade/etl/EtlRegionDataTask.java

@@ -1,51 +0,0 @@
-/**
- * Copyright
- * All right reserved.
- * 项目名称:
- * 创建日期:2022/5/22
- */
-package org.springblade.etl;
-
-
-import lombok.extern.slf4j.Slf4j;
-import org.springblade.etl.service.IEtlAdCdService;
-import org.springblade.modules.baseinfo.region.service.IBaseInfoRegionService;
-import org.springframework.data.redis.core.RedisTemplate;
-
-import java.util.concurrent.Callable;
-
-/***
- * Date:2022/5/22
- * Title: 行政区划数据抽取
- * Description：
- * @author swp
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Slf4j
-public class EtlRegionDataTask implements Callable<Integer> {
-
-	private RedisTemplate redisTemplate;
-	private IEtlAdCdService etlAdCdService;
-	private IBaseInfoRegionService regionService;
-
-
-	EtlRegionDataTask(RedisTemplate redisTemplate, IEtlAdCdService etlAdCdService, IBaseInfoRegionService regionService) {
-		this.redisTemplate = redisTemplate;
-		this.etlAdCdService = etlAdCdService;
-		this.regionService = regionService;
-	}
-
-	@Override
-	public Integer call() {
-		try {
-			log.info("行政区划数据抽取开始**************");
-
-
-
-		} catch (Exception e) {
-			log.error("实时数据统计任务异常 {}", e.getMessage());
-		}
-		return 0;
-	}
-}

src/main/java/org/springblade/etl/EtlRiverDataTask.java

@@ -1,54 +0,0 @@
-/**
- * Copyright
- * All right reserved.
- * 项目名称:
- * 创建日期:2022/5/22
- */
-package org.springblade.etl;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.springblade.etl.dto.EtlRiverDataDTO;
-import org.springblade.etl.entity.EtlRiverDataEntity;
-import org.springblade.etl.service.IEtlRiverDataService;
-import org.springblade.modules.business.data.entity.RtuDataRiverEntity;
-import org.springblade.modules.business.data.service.IRtuDataRiverService;
-
-import java.util.Date;
-import java.util.List;
-
-/***
- * Date:2022/5/22
- * Title: 河道水位抽取
- * Description：
- * @author swp
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public class EtlRiverDataTask {
-
-	public static RtuDataRiverEntity dataSync(EtlRiverDataDTO etlRiverDataDTO, IEtlRiverDataService etlRiverDataService, IRtuDataRiverService rtuDataRiverService) {
-		List<EtlRiverDataEntity> riverDataEntityList = etlRiverDataService.selectLastList(etlRiverDataDTO);
-		if (null != riverDataEntityList && riverDataEntityList.size() > 0) {
-			EtlRiverDataEntity entity = riverDataEntityList.get(0);
-			LambdaQueryWrapper<RtuDataRiverEntity> dataWrapper = Wrappers.<RtuDataRiverEntity>query().lambda();
-			dataWrapper.eq(RtuDataRiverEntity::getRtuCode, entity.getRtuCode());
-			dataWrapper.eq(RtuDataRiverEntity::getIsDeleted, 0);
-			RtuDataRiverEntity riverEntity = rtuDataRiverService.getOne(dataWrapper);
-			if (null == riverEntity) {
-				riverEntity = new RtuDataRiverEntity();
-				riverEntity.setRtuCode(entity.getRtuCode());
-				riverEntity.setCreateTime(new Date());
-				riverEntity.setStatus(1);
-				riverEntity.setIsDeleted(0);
-			}
-			riverEntity.setUpdateTime(new Date());
-			riverEntity.setZ(entity.getZ());
-			riverEntity.setTm(entity.getTm());
-			rtuDataRiverService.saveOrUpdate(riverEntity);
-			return riverEntity;
-		}
-		return null;
-	}
-}

src/main/java/org/springblade/etl/EtlRsvrDataTask.java

@@ -1,55 +0,0 @@
-/**
- * Copyright
- * All right reserved.
- * 项目名称:
- * 创建日期:2022/5/22
- */
-package org.springblade.etl;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.springblade.etl.dto.EtlRsvrDataDTO;
-import org.springblade.etl.entity.EtlRsvrDataEntity;
-import org.springblade.etl.service.IEtlRsvrDataService;
-import org.springblade.modules.business.data.entity.RtuDataRsvrEntity;
-import org.springblade.modules.business.data.service.IRtuDataRsvrService;
-
-
-import java.util.Date;
-import java.util.List;
-
-/***
- * Date:2022/5/22
- * Title: 水库水位
- * Description：
- * @author swp
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public class EtlRsvrDataTask {
-
-	public static RtuDataRsvrEntity dataSync(EtlRsvrDataDTO etlRsvrDataDTO, IEtlRsvrDataService etlRsvrDataService, IRtuDataRsvrService rtuDataRsvrService) {
-		List<EtlRsvrDataEntity> rsvrDataEntityList = etlRsvrDataService.selectLastList(etlRsvrDataDTO);
-		if (null != rsvrDataEntityList && rsvrDataEntityList.size() > 0) {
-			EtlRsvrDataEntity entity = rsvrDataEntityList.get(0);
-			LambdaQueryWrapper<RtuDataRsvrEntity> dataWrapper = Wrappers.<RtuDataRsvrEntity>query().lambda();
-			dataWrapper.eq(RtuDataRsvrEntity::getRtuCode, entity.getRtuCode());
-			dataWrapper.eq(RtuDataRsvrEntity::getIsDeleted, 0);
-			RtuDataRsvrEntity rsvrDataEntity = rtuDataRsvrService.getOne(dataWrapper);
-			if (null == rsvrDataEntity) {
-				rsvrDataEntity = new RtuDataRsvrEntity();
-				rsvrDataEntity.setRtuCode(entity.getRtuCode());
-				rsvrDataEntity.setCreateTime(new Date());
-				rsvrDataEntity.setUpdateTime(new Date());
-				rsvrDataEntity.setStatus(1);
-				rsvrDataEntity.setIsDeleted(0);
-			}
-			rsvrDataEntity.setRz(entity.getRz());
-			rsvrDataEntity.setTm(entity.getTm());
-			rtuDataRsvrService.saveOrUpdate(rsvrDataEntity);
-			return rsvrDataEntity;
-		}
-		return null;
-	}
-}

src/main/java/org/springblade/etl/EtlRtuDataTask.java

@@ -1,194 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2023/2/21
- */
-package org.springblade.etl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.tool.jackson.JsonUtil;
-import org.springblade.core.tool.utils.ConcurrentDateFormat;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.etl.dto.EtlGroundDataDTO;
-import org.springblade.etl.dto.EtlRainDataDTO;
-import org.springblade.etl.dto.EtlRiverDataDTO;
-import org.springblade.etl.dto.EtlRsvrDataDTO;
-import org.springblade.etl.service.*;
-import org.springblade.modules.baseinfo.rtu.entity.RtuInfoEntity;
-import org.springblade.modules.baseinfo.rtu.service.IRtuBaseInfoService;
-import org.springblade.modules.business.data.entity.RtuDataGroundEntity;
-import org.springblade.modules.business.data.entity.RtuDataRainEntity;
-import org.springblade.modules.business.data.entity.RtuDataRiverEntity;
-import org.springblade.modules.business.data.entity.RtuDataRsvrEntity;
-import org.springblade.modules.business.data.service.IRtuDataGroundService;
-import org.springblade.modules.business.data.service.IRtuDataRainService;
-import org.springblade.modules.business.data.service.IRtuDataRiverService;
-import org.springblade.modules.business.data.service.IRtuDataRsvrService;
-import org.springblade.modules.business.rtumanage.entity.RtuStatusEntity;
-import org.springframework.data.redis.core.HashOperations;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.kafka.core.KafkaTemplate;
-
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.Callable;
-
-/***
- * Date:2023/2/21
- * Title: ETL数据处理任务模块
- * Description：处理雨情数据、河道水位数据、水库水位数据、墒情数据
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Slf4j
-public class EtlRtuDataTask implements Callable<Integer> {
-	private KafkaTemplate<String, String> kafkaTemplate;
-	private RedisTemplate redisTemplate;
-	private IRtuBaseInfoService rtuBaseInfoService;
-	private IEtlRainDataService etlRainDataService;
-	private IRtuDataRainService rtuDataRainService;
-	private IEtlRiverDataService etlRiverDataService;
-	private IRtuDataRiverService rtuDataRiverService;
-	private IEtlRsvrDataService etlRsvrDataService;
-	private IRtuDataRsvrService rtuDataRsvrService;
-	private IEtlGroundDataService etlGroundDataService;
-	private IRtuDataGroundService rtuDataGroundService;
-
-	EtlRtuDataTask(
-		KafkaTemplate<String, String> kafkaTemplate,
-		RedisTemplate redisTemplate,
-		IRtuBaseInfoService rtuBaseInfoService,
-		IEtlRainDataService etlRainDataService,
-		IRtuDataRainService rtuDataRainService,
-		IEtlRiverDataService etlRiverDataService,
-		IRtuDataRiverService rtuDataRiverService,
-		IEtlRsvrDataService etlRsvrDataService,
-		IRtuDataRsvrService rtuDataRsvrService,
-		IEtlGroundDataService etlGroundDataService,
-		IRtuDataGroundService rtuDataGroundService) {
-		this.kafkaTemplate = kafkaTemplate;
-		this.redisTemplate = redisTemplate;
-		this.rtuBaseInfoService = rtuBaseInfoService;
-		this.etlRainDataService = etlRainDataService;
-		this.rtuDataRainService = rtuDataRainService;
-		this.etlRiverDataService = etlRiverDataService;
-		this.rtuDataRiverService = rtuDataRiverService;
-		this.etlRsvrDataService = etlRsvrDataService;
-		this.rtuDataRsvrService = rtuDataRsvrService;
-		this.etlGroundDataService = etlGroundDataService;
-		this.rtuDataGroundService = rtuDataGroundService;
-	}
-
-	@Override
-	public Integer call() {
-		try {
-			log.info("测站定时报数据抽取开始**************");
-			long st = System.currentTimeMillis();
-			HashOperations<String, String, String> opsHash = redisTemplate.opsForHash();
-			LambdaQueryWrapper<RtuInfoEntity> wrapper = Wrappers.<RtuInfoEntity>query().lambda();
-			wrapper.eq(RtuInfoEntity::getIsDeleted, 0);
-			List<RtuInfoEntity> rtuInfoEntityList = rtuBaseInfoService.list(wrapper);
-			for (RtuInfoEntity rtuInfoEntity : rtuInfoEntityList) {
-				Date rtuUpTm = null;
-				//读取最新一条雨情数据
-				EtlRainDataDTO etlRainDataDTO = new EtlRainDataDTO();
-				etlRainDataDTO.setRtuCode(rtuInfoEntity.getRtuCode());
-				if (opsHash.hasKey("etl_rtu_rain_read_time", rtuInfoEntity.getRtuCode())) {
-					String dt = opsHash.get("etl_rtu_rain_read_time", rtuInfoEntity.getRtuCode());
-					Date lastDate = Func.parse(dt, ConcurrentDateFormat.of("yyyy-MM-dd HH:mm:ss"));
-					etlRainDataDTO.setLastTime(lastDate);
-				}
-				RtuDataRainEntity rtuDataRainEntity = EtlRainDataTask.dataSync(etlRainDataDTO, etlRainDataService, rtuDataRainService);
-				if (null != rtuDataRainEntity) {
-					//保存时间
-					String dt = Func.formatDateTime(rtuDataRainEntity.getTm());
-					opsHash.put("etl_rtu_rain_read_time", rtuInfoEntity.getRtuCode(), dt);
-					//最后上报时间
-					rtuUpTm = rtuDataRainEntity.getTm();
-				}
-				//读取最新一条河道数据
-				EtlRiverDataDTO etlRiverDataDTO = new EtlRiverDataDTO();
-				etlRiverDataDTO.setRtuCode(rtuInfoEntity.getRtuCode());
-				if (opsHash.hasKey("etl_rtu_river_read_time", rtuInfoEntity.getRtuCode())) {
-					String dt = opsHash.get("etl_rtu_river_read_time", rtuInfoEntity.getRtuCode());
-					Date lastDate = Func.parse(dt, ConcurrentDateFormat.of("yyyy-MM-dd HH:mm:ss"));
-					etlRiverDataDTO.setLastTime(lastDate);
-				}
-				RtuDataRiverEntity rtuDataRiverEntity = EtlRiverDataTask.dataSync(etlRiverDataDTO, etlRiverDataService, rtuDataRiverService);
-				if (null != rtuDataRiverEntity) {
-					//保存时间
-					String dt = Func.formatDateTime(rtuDataRiverEntity.getTm());
-					opsHash.put("etl_rtu_river_read_time", rtuInfoEntity.getRtuCode(), dt);
-					//最后上报时间
-					if (rtuUpTm != null) {
-						if (rtuDataRiverEntity.getTm().after(rtuUpTm)) {
-							rtuUpTm = rtuDataRiverEntity.getTm();
-						}
-					} else {
-						rtuUpTm = rtuDataRiverEntity.getTm();
-					}
-				}
-				//读取最新一条水库数据
-				EtlRsvrDataDTO etlRsvrDataDTO = new EtlRsvrDataDTO();
-				etlRsvrDataDTO.setRtuCode(rtuInfoEntity.getRtuCode());
-				if (opsHash.hasKey("etl_rtu_rsvr_read_time", rtuInfoEntity.getRtuCode())) {
-					String dt = opsHash.get("etl_rtu_rsvr_read_time", rtuInfoEntity.getRtuCode());
-					Date lastDate = Func.parse(dt, ConcurrentDateFormat.of("yyyy-MM-dd HH:mm:ss"));
-					etlRsvrDataDTO.setLastTime(lastDate);
-				}
-				RtuDataRsvrEntity rsvrDataEntity = EtlRsvrDataTask.dataSync(etlRsvrDataDTO, etlRsvrDataService, rtuDataRsvrService);
-				if (null != rsvrDataEntity) {
-					//保存时间
-					String dt = Func.formatDateTime(rsvrDataEntity.getTm());
-					opsHash.put("etl_rtu_rsvr_read_time", rtuInfoEntity.getRtuCode(), dt);
-					//最后上报时间
-					if (rtuUpTm != null) {
-						if (rsvrDataEntity.getTm().after(rtuUpTm)) {
-							rtuUpTm = rsvrDataEntity.getTm();
-						}
-					} else {
-						rtuUpTm = rsvrDataEntity.getTm();
-					}
-				}
-				//读取最新一条墒情数据
-				EtlGroundDataDTO groundDataDTO = new EtlGroundDataDTO();
-				groundDataDTO.setRtuCode(rtuInfoEntity.getRtuCode());
-				if (opsHash.hasKey("etl_rtu_ground_read_time", rtuInfoEntity.getRtuCode())) {
-					String dt = opsHash.get("etl_rtu_ground_read_time", rtuInfoEntity.getRtuCode());
-					Date lastDate = Func.parse(dt, ConcurrentDateFormat.of("yyyy-MM-dd HH:mm:ss"));
-					groundDataDTO.setLastTime(lastDate);
-				}
-				RtuDataGroundEntity groundDataEntity = EtlGroundDataTask.dataSync(groundDataDTO, etlGroundDataService, rtuDataGroundService);
-				if (null != groundDataEntity) {
-					//保存时间
-					String dt = Func.formatDateTime(groundDataEntity.getTm());
-					opsHash.put("etl_rtu_ground_read_time", rtuInfoEntity.getRtuCode(), dt);
-					//最后上报时间
-					if (rtuUpTm != null) {
-						if (groundDataEntity.getTm().after(rtuUpTm)) {
-							rtuUpTm = groundDataEntity.getTm();
-						}
-					} else {
-						rtuUpTm = groundDataEntity.getTm();
-					}
-				}
-				//更新测站最近上报时间
-				if (null != rtuUpTm) {
-					RtuStatusEntity statusEntity = new RtuStatusEntity();
-					statusEntity.setLastUpTime(rtuUpTm);
-					statusEntity.setRtuCode(rtuInfoEntity.getRtuCode());
-					kafkaTemplate.send("ywxt.rtu.status", JsonUtil.toJson(statusEntity));
-				}
-			}
-			long et = System.currentTimeMillis();
-			log.info("测站定时报数据抽取完成 {}", (et - st) / 1000);
-		} catch (Exception e) {
-			log.error("实时数据统计任务异常 {}", e.getMessage());
-		}
-		return 0;
-	}
-}

src/main/java/org/springblade/etl/EtlWarningTask.java

@@ -1,73 +0,0 @@
-/**
- * Copyright
- * All right reserved.
- * 项目名称:
- * 创建日期:2022/5/22
- */
-package org.springblade.etl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.tool.utils.ConcurrentDateFormat;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.etl.entity.EtlWarningInfoEntity;
-import org.springblade.etl.service.IEtlWarningService;
-import org.springblade.modules.business.warning.entity.RtuWarningInfoEntity;
-import org.springblade.modules.business.warning.service.IRtuWarningService;
-import org.springframework.data.redis.core.HashOperations;
-import org.springframework.data.redis.core.RedisTemplate;
-
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.Callable;
-
-/***
- * Date:2022/5/22
- * Title: 预警数据抽取
- * Description：
- * @author swp
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Slf4j
-public class EtlWarningTask implements Callable<Integer> {
-
-	private RedisTemplate redisTemplate;
-	private IEtlWarningService etlWarningService;
-	private IRtuWarningService rtuWarningService;
-
-	public EtlWarningTask(RedisTemplate redisTemplate, IEtlWarningService etlWarningService, IRtuWarningService rtuWarningService){
-		this.redisTemplate=redisTemplate;
-		this.etlWarningService=etlWarningService;
-		this.rtuWarningService=rtuWarningService;
-	}
-
-	@Override
-	public Integer call()  {
-		try {
-			log.info("预警数据抽取开始**************");
-			HashOperations<String, String, String> opsHash = redisTemplate.opsForHash();
-			Date date = new Date();
-			if (opsHash.hasKey("etl", "warn_update_time")) {
-				String dt = opsHash.get("etl", "warn_update_time");
-				date = Func.parse(dt, ConcurrentDateFormat.of("yyyy-MM-dd HH:mm:ss"));
-			}
-			LambdaQueryWrapper<EtlWarningInfoEntity> wrapper = Wrappers.<EtlWarningInfoEntity>query().lambda();
-			wrapper.gt(EtlWarningInfoEntity::getOriginalCreateTime,date);
-			wrapper.orderByAsc(EtlWarningInfoEntity::getOriginalCreateTime);
-			List<EtlWarningInfoEntity> list = etlWarningService.list(wrapper);
-			if (null != list && list.size() > 0) {
-				for (EtlWarningInfoEntity warningInfo : list) {
-					RtuWarningInfoEntity rtuWarningInfoEntity=new RtuWarningInfoEntity();
-					rtuWarningService.save(rtuWarningInfoEntity);
-				}
-			}
-			String dt = Func.formatDateTime(date);
-			opsHash.put("etl", "warn_update_time", dt);
-		} catch (Exception e) {
-			log.error("数据任务异常 {}", e.getMessage());
-		}
-		return 0;
-	}
-}

src/main/java/org/springblade/etl/controller/EtlTestController.java

@@ -1,1048 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/8/22
- */
-package org.springblade.etl.controller;
-
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-
-import io.swagger.annotations.Api;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.ConcurrentDateFormat;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.etl.entity.*;
-
-import org.springblade.etl.service.*;
-
-import org.springblade.modules.baseinfo.monitorpoint.entity.MonitorPointInfoEntity;
-import org.springblade.modules.baseinfo.monitorpoint.entity.MonitorPointRelEntity;
-import org.springblade.modules.baseinfo.monitorpoint.service.IMonitorPointRelService;
-import org.springblade.modules.baseinfo.monitorpoint.service.IMonitorPointService;
-import org.springblade.modules.baseinfo.monitorpoint.vo.MonitorPointInfoVO;
-import org.springblade.modules.baseinfo.monitorsite.entity.MonitorSiteInfoEntity;
-import org.springblade.modules.baseinfo.monitorsite.entity.MonitorSiteRelEntity;
-import org.springblade.modules.baseinfo.monitorsite.service.IMonitorSiteRelService;
-import org.springblade.modules.baseinfo.monitorsite.service.IMonitorSiteService;
-import org.springblade.modules.baseinfo.rtu.entity.RtuInfoEntity;
-import org.springblade.modules.baseinfo.rtu.service.IRtuBaseInfoService;
-import org.springblade.modules.baseinfo.wateruseconsumer.entity.WaterUseConsumerInfoEntity;
-import org.springblade.modules.baseinfo.wateruseconsumer.service.IWaterUseConsumerService;
-import org.springblade.modules.business.warning.service.IRtuWarningService;
-import org.springblade.surfacerain.SurfaceRainDataProcessor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ValueOperations;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import ucar.nc2.NetcdfFile;
-import ucar.nc2.NetcdfFiles;
-
-import javax.annotation.Resource;
-
-import java.util.*;
-
-
-/***
- * Date:2022/8/22
- * Title:行政区划管理
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@RestController
-@RequestMapping("galaxy-test/etl/test")
-@AllArgsConstructor
-@Api(value = "业务字典", tags = "业务字典")
-@Slf4j
-public class EtlTestController extends BladeController {
-    private final IRtuBaseInfoService rtuBaseInfoService;
-    private final IEtlRainDataService etlRainDataService;
-
-    private final IRtuWarningService rtuWarningService;
-
-    @Resource
-    private RedisTemplate redisTemplate;
-    @Autowired
-    private KafkaTemplate<String, String> kafkaTemplate;
-
-    @Resource
-    private SurfaceRainDataProcessor surfDataProcessTask;
-
-    private final IEtlRtuDataService rtuDataService;
-
-    private final IEtlWiuDataService wiuDataService;
-
-    private final IWaterUseConsumerService waterUseConsumerService;
-
-    private final IEtlWiustDataService wiustDataService;
-
-    private final IMonitorSiteService monitorSiteService;
-
-    private final IEtlMpDataService mpDataService;
-
-    private final IMonitorPointService monitorPointService;
-
-    private final IEtlWiuWiustDataService wiuWiustDataService;
-    private final IMonitorSiteRelService monitorSiteRelService;
-
-    private final IEtlWiustMpDataService wiustMpDataService;
-    private final IMonitorPointRelService monitorPointRelService;
-
-
-    @GetMapping("/rtu")
-    @ApiOperationSupport(order = 1)
-    public R<String> updateEtlRtu() {
-        EtlRtuDataEntity etlRtuDataEntity = new EtlRtuDataEntity();
-        List<EtlRtuDataEntity> list = rtuDataService.selectList(etlRtuDataEntity);
-        for (EtlRtuDataEntity entity : list) {
-            RtuInfoEntity rtuInfoEntity = new RtuInfoEntity();
-            rtuInfoEntity.setRtuCode(entity.getRtuCd());
-            rtuInfoEntity.setAdCode(entity.getOrgCode());
-            if ("00".equals(entity.getOrgCode())) {
-                rtuInfoEntity.setOrgId(1123598813738675201L);
-            } else if ("11".equals(entity.getOrgCode())) {
-                rtuInfoEntity.setOrgId(1715215595639267330L);
-            } else if ("12".equals(entity.getOrgCode())) {
-                rtuInfoEntity.setOrgId(1715215690510229506L);
-            } else if ("10".equals(entity.getOrgCode())) {
-                rtuInfoEntity.setOrgId(1715215884710699010L);
-            } else if ("13".equals(entity.getOrgCode())) {
-                rtuInfoEntity.setOrgId(1715215952884916226L);
-            } else if ("14".equals(entity.getOrgCode())) {
-                rtuInfoEntity.setOrgId(1715216007264067585L);
-            } else if ("15".equals(entity.getOrgCode())) {
-                rtuInfoEntity.setOrgId(1715216066533777409L);
-            } else if ("713".equals(entity.getOrgCode())) {
-                rtuInfoEntity.setOrgId(1715215779899236354L);
-            } else if ("111".equals(entity.getOrgCode())) {
-                rtuInfoEntity.setOrgId(1715216136150835201L);
-            }
-            rtuBaseInfoService.save(rtuInfoEntity);
-        }
-
-        return R.success("ok");
-    }
-
-    @GetMapping("/wiu")
-    @ApiOperationSupport(order = 1)
-    public R<String> updateEtlWiu() {
-        EtlWiuDataEntity dataEntity = new EtlWiuDataEntity();
-        List<EtlWiuDataEntity> list = wiuDataService.selectList(dataEntity);
-        for (EtlWiuDataEntity entity : list) {
-            WaterUseConsumerInfoEntity waterUseConsumerInfoEntity = new WaterUseConsumerInfoEntity();
-            waterUseConsumerInfoEntity.setWiuCd(entity.getWiuCd());
-            waterUseConsumerInfoEntity.setWiuNm(entity.getWiuNm());
-            waterUseConsumerInfoEntity.setLrNm(entity.getLrNm());
-            waterUseConsumerInfoEntity.setTradTp(entity.getTradTp());
-            waterUseConsumerInfoEntity.setEcoTp(entity.getEcoTp());
-            waterUseConsumerInfoEntity.setMonLevel(entity.getMong());
-            waterUseConsumerInfoEntity.setWiuTp(entity.getWiuTp());
-            waterUseConsumerInfoEntity.setAddr(entity.getAddr());
-            if ("00".equals(entity.getOrgCode())) {
-                waterUseConsumerInfoEntity.setOrgId(1123598813738675201L);
-            } else if ("11".equals(entity.getOrgCode())) {
-                waterUseConsumerInfoEntity.setOrgId(1715215595639267330L);
-            } else if ("12".equals(entity.getOrgCode())) {
-                waterUseConsumerInfoEntity.setOrgId(1715215690510229506L);
-            } else if ("10".equals(entity.getOrgCode())) {
-                waterUseConsumerInfoEntity.setOrgId(1715215884710699010L);
-            } else if ("13".equals(entity.getOrgCode())) {
-                waterUseConsumerInfoEntity.setOrgId(1715215952884916226L);
-            } else if ("14".equals(entity.getOrgCode())) {
-                waterUseConsumerInfoEntity.setOrgId(1715216007264067585L);
-            } else if ("15".equals(entity.getOrgCode())) {
-                waterUseConsumerInfoEntity.setOrgId(1715216066533777409L);
-            } else if ("713".equals(entity.getOrgCode())) {
-                waterUseConsumerInfoEntity.setOrgId(1715215779899236354L);
-            } else if ("111".equals(entity.getOrgCode())) {
-                waterUseConsumerInfoEntity.setOrgId(1715216136150835201L);
-            }
-            waterUseConsumerService.save(waterUseConsumerInfoEntity);
-        }
-
-        return R.success("ok");
-    }
-
-    @GetMapping("/wiust")
-    @ApiOperationSupport(order = 1)
-    public R<String> updateEtlWiust() {
-        EtlWiustDataEntity dataEntity = new EtlWiustDataEntity();
-        List<EtlWiustDataEntity> list = wiustDataService.selectList(dataEntity);
-        for (EtlWiustDataEntity entity : list) {
-            MonitorSiteInfoEntity monitorSiteInfoEntity = new MonitorSiteInfoEntity();
-            monitorSiteInfoEntity.setWiustCd(entity.getWiustCd());
-            monitorSiteInfoEntity.setWiustNm(entity.getWiustNm());
-            monitorSiteInfoEntity.setWiustTp(entity.getWiustTp());
-            monitorSiteInfoEntity.setLoc(entity.getLoc());
-            monitorSiteInfoEntity.setDatTp(entity.getDatTp());
-            monitorSiteInfoEntity.setWellTp(entity.getWellTp());
-            String tm = entity.getEstStYm() + "01120000";
-            monitorSiteInfoEntity.setEstStYm(Func.parse(tm, ConcurrentDateFormat.of("yyyyMMddHHmmss")));
-
-            monitorSiteService.save(monitorSiteInfoEntity);
-        }
-
-        return R.success("ok");
-    }
-
-
-    @GetMapping("/mp")
-    @ApiOperationSupport(order = 1)
-    public R<String> updateEtlMp() {
-        EtlMpDataEntity dataEntity = new EtlMpDataEntity();
-        List<EtlMpDataEntity> list = mpDataService.selectList(dataEntity);
-        for (EtlMpDataEntity entity : list) {
-            MonitorPointInfoEntity pointInfoEntity = new MonitorPointInfoEntity();
-            pointInfoEntity.setMpCd(entity.getMpCd());
-            pointInfoEntity.setMpNm(entity.getMpNm());
-            pointInfoEntity.setMpAddr(entity.getMpAddr());
-            pointInfoEntity.setMpItem(entity.getMpItem());
-            pointInfoEntity.setIsAuto(entity.getIsAuto());
-            pointInfoEntity.setSourTp(entity.getSourTp());
-            pointInfoEntity.setLat(entity.getWeiDu());
-            pointInfoEntity.setLng(entity.getJingDu());
-
-            monitorPointService.save(pointInfoEntity);
-        }
-
-        return R.success("ok");
-    }
-
-    @GetMapping("/rel/mp")
-    @ApiOperationSupport(order = 1)
-    public R<String> updateEtlWiustMp() {
-        EtlWiustMpDataEntity dataEntity = new EtlWiustMpDataEntity();
-        List<EtlWiustMpDataEntity> list = wiustMpDataService.selectList(dataEntity);
-        for (EtlWiustMpDataEntity entity : list) {
-            MonitorPointRelEntity pointInfoEntity = new MonitorPointRelEntity();
-            pointInfoEntity.setMpCd(entity.getMpCd());
-            pointInfoEntity.setWiustCd(entity.getWiustCd());
-            monitorPointRelService.save(pointInfoEntity);
-        }
-
-        return R.success("ok");
-    }
-
-    @GetMapping("/rel/wiust")
-    @ApiOperationSupport(order = 1)
-    public R<String> updateEtlWiuWiust() {
-        EtlWiuWiustDataEntity dataEntity = new EtlWiuWiustDataEntity();
-        List<EtlWiuWiustDataEntity> list = wiuWiustDataService.selectList(dataEntity);
-        for (EtlWiuWiustDataEntity entity : list) {
-            MonitorSiteRelEntity pointInfoEntity = new MonitorSiteRelEntity();
-            pointInfoEntity.setWiuCd(entity.getWiuCd());
-            pointInfoEntity.setWiustCd(entity.getWiustCd());
-
-
-            monitorSiteRelService.save(pointInfoEntity);
-        }
-
-        return R.success("ok");
-    }
-
-    @GetMapping("/data/rain")
-    @ApiOperationSupport(order = 1)
-    public R<String> addRain(@RequestParam(name = "rtuCode") String rtuCode) {
-        try {
-            String filename = "D:\\tmp\\test\\Z_SURF_C_BABJ_20230517112343_P_CMPA_RT_BEHT_0P01_HOR-PRE-2023051711.GRB2";
-
-
-            //NetcdfFile netcdfFile = NetcdfFiles.open(filename, null);
-            NetcdfFile netcdfFile = NetcdfFiles.open(filename);
-            ///	ImmutableList<Variable> variables = netcdfFile.getVariables();
-            //	surfDataProcessTask.submit(filename,Func.formatDateTime(new Date()));
-
-//			log.info("***************************");
-//			log.info("{}",	netcdfFile.getFileTypeId());
-//			log.info("***************************");
-//			log.info("{}",	netcdfFile.getTitle());
-//			log.info("***************************");
-//			log.info("{}",	netcdfFile.getDetailInfo());
-//			log.info("***************************");
-//			log.info("{}",netcdfFile.getLocation());
-//			log.info("***************************");
-            //	ImmutableDescriptor
-            //ImmutableList<Variable> variables = netcdfFile.getVariables();
-//			ImmutableList<Attribute> attributeIterator =	netcdfFile.getGlobalAttributes();
-//			for(Attribute a:attributeIterator){
-//				log.info("***************************");
-//				log.info("Attribute {},{},{}",a.getName(),a.getStringValue(),a.getDataType().toString());
-//			}
-
-            //	List<String> lons = new LinkedList<>();
-//			List<String> lats = new LinkedList<>();
-//			List<String> times = new LinkedList<>();
-//
-//			List<Map<String, String>> values = new LinkedList<>();
-//
-//			for (Variable v : variables) {
-//				log.info("***************************");
-//				log.info("{},{},{}", v.getFullName(), v.getDataType().toString(), v.getDimensionsString());
-//				log.info("***************************");
-//				if (v.getFullName().equals("lon")) {
-//					log.info("lon size {}", v.getSize());
-//					Array datas = v.read();
-//					Index index = datas.getIndex();
-//					int[] shapelist = v.getShape();
-//					for (int i = 0; i < shapelist[0]; i++) {
-//						float lonv = datas.getFloat(index.set(i));
-//						lons.add(Func.toStr(lonv));
-//					}
-//				}
-//				log.info("***************************");
-//				if (v.getFullName().equals("lat")) {
-//					log.info("lat size {}", v.getSize());
-//					Array datas = v.read();
-//					Index index = datas.getIndex();
-//					int[] shapelist = v.getShape();
-//					for (int i = 0; i < shapelist[0]; i++) {
-//						float latv = datas.getFloat(index.set(i));
-//						lats.add(Func.toStr(latv));
-//					}
-//				}
-//				log.info("***************************");
-//				if (v.getFullName().equals("time")) {
-//					log.info("time size {}", v.getSize());
-//					Array datas = v.read();
-//					Index index = datas.getIndex();
-//					int[] shapelist = v.getShape();
-//					for (int i = 0; i < shapelist[0]; i++) {
-//						double timev = datas.getDouble(index.set(i));
-//						times.add(Func.toStr(timev));
-//					}
-//				}
-//				log.info("***************************");
-//				if (v.getFullName().equals("reftime")) {
-//					log.info("reftime size {}", v.getSize());
-////					Array datas = v.read();
-////					Index index= datas.getIndex();
-////					int[] shapelist= v.getShape();
-////					for (int i = 0; i < shapelist[0]; i++) {
-////						double timev=	datas.getDouble(index.set(i));
-////						times.add(Func.toStr(timev));
-////					}
-//				}
-//
-//
-//				log.info("***************************");
-//				if (v.getFullName().equals("Total_precipitation_surface")) {
-//					log.info("surface size {}", v.getSize());
-//					Array datas = v.read();
-//					int[] shapelist = v.getShape();
-//					Index index = datas.getIndex();
-//					//按时间
-//					for (int i = 0; i < shapelist[0]; i++) {
-//						// 按维度
-//						for (int n = 0; n < shapelist[1]; n++) {
-//							// 按经度
-//							for (int k = 0; k < 100; k++) {
-//								// 按照对应索引获取数据并转换为string类型添加到数组中
-//								float dval = datas.getFloat(index.set(i, n, k));
-//								log.info("shape {} {} {}", i, n, k);
-//								log.info("time,lat,lon,value:    {},{},{}", lats.get(n), lons.get(k), dval);
-//							}
-//						}
-//					}
-//				}
-//
-//			}
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return R.data("ok");
-    }
-
-    @GetMapping("/data/rain/1")
-    @ApiOperationSupport(order = 1)
-    public R<String> addRain1() {
-        EtlRainDataEntity etlRainDataEntity = new EtlRainDataEntity();
-        Calendar calendar = Calendar.getInstance();
-        //calendar.set(Calendar.HOUR_OF_DAY, 1);
-        calendar.set(Calendar.MINUTE, 0);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01710140");
-        etlRainDataEntity.setIntv(1.0);
-        etlRainDataEntity.setDrp(3.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-        return R.data("ok");
-    }
-
-    @GetMapping("/data/rain/2")
-    @ApiOperationSupport(order = 1)
-    public R<String> addRain2() {
-        EtlRainDataEntity etlRainDataEntity = new EtlRainDataEntity();
-        Calendar calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 2);
-        calendar.set(Calendar.MINUTE, 0);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01740030");
-        etlRainDataEntity.setIntv(1.0);
-        etlRainDataEntity.setDrp(3.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-        return R.data("ok");
-    }
-
-    @GetMapping("/data/rain/3")
-    @ApiOperationSupport(order = 1)
-    public R<String> addRain3() {
-        EtlRainDataEntity etlRainDataEntity = new EtlRainDataEntity();
-        Calendar calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 3);
-        calendar.set(Calendar.MINUTE, 0);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01740030");
-        etlRainDataEntity.setIntv(1.0);
-        etlRainDataEntity.setDrp(3.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-        return R.data("ok");
-    }
-
-    @GetMapping("/data/rain/4")
-    @ApiOperationSupport(order = 1)
-    public R<String> addRain4() {
-        EtlRainDataEntity etlRainDataEntity = new EtlRainDataEntity();
-        Calendar calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 4);
-        calendar.set(Calendar.MINUTE, 0);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-        return R.data("ok");
-    }
-
-    @GetMapping("/data/rain/5")
-    @ApiOperationSupport(order = 1)
-    public R<String> addRain5() {
-        EtlRainDataEntity etlRainDataEntity = new EtlRainDataEntity();
-        Calendar calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 5);
-        calendar.set(Calendar.MINUTE, 0);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(1.0);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-        return R.data("ok");
-    }
-
-    @GetMapping("/data/river/0")
-    @ApiOperationSupport(order = 1)
-    public R<String> addriver0() {
-        ValueOperations<String, String> ops = redisTemplate.opsForValue();
-        String key = "etl.river.40516502.up.5min";
-        JSONArray array = new JSONArray();
-        ops.set(key, array.toJSONString());
-        return R.data("ok");
-    }
-
-    @GetMapping("/data/river/1")
-    @ApiOperationSupport(order = 1)
-    public R<String> addriver1() {
-
-        EtlRsvrDataEntity etlRsvrDataEntity = new EtlRsvrDataEntity();
-
-        Calendar calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 9);
-        calendar.set(Calendar.MINUTE, 0);
-        calendar.set(Calendar.SECOND, 0);
-        etlRsvrDataEntity.setTm(calendar.getTime());
-
-        calendar.set(Calendar.HOUR_OF_DAY, 11);
-        calendar.set(Calendar.MINUTE, 0);
-        calendar.set(Calendar.SECOND, 0);
-        etlRsvrDataEntity.setFromDate(calendar.getTime());
-
-        etlRsvrDataEntity.setRtuCode("20911190");
-        etlRsvrDataEntity.setRz(0.05);
-
-
-        kafkaTemplate.send("topic-etl-rsvr-data", JSONObject.toJSONString(etlRsvrDataEntity));
-        return R.data("ok");
-    }
-
-    @GetMapping("/data/river/2")
-    @ApiOperationSupport(order = 1)
-    public R<String> addriver2() {
-        EtlRsvrDataEntity etlRsvrDataEntity = new EtlRsvrDataEntity();
-
-        Calendar calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 9);
-        calendar.set(Calendar.MINUTE, 10);
-        calendar.set(Calendar.SECOND, 0);
-        etlRsvrDataEntity.setTm(calendar.getTime());
-
-        calendar.set(Calendar.HOUR_OF_DAY, 12);
-        calendar.set(Calendar.MINUTE, 0);
-        calendar.set(Calendar.SECOND, 0);
-
-        etlRsvrDataEntity.setFromDate(calendar.getTime());
-
-        etlRsvrDataEntity.setRtuCode("01718530");
-        etlRsvrDataEntity.setRz(0.05);
-
-
-        kafkaTemplate.send("topic-etl-rsvr-data", JSONObject.toJSONString(etlRsvrDataEntity));
-        return R.data("ok");
-
-
-    }
-
-    @GetMapping("/data/river/3")
-    @ApiOperationSupport(order = 1)
-    public R<String> addriver3() {
-        EtlRsvrDataEntity etlRsvrDataEntity = new EtlRsvrDataEntity();
-
-        Calendar calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 12);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRsvrDataEntity.setTm(calendar.getTime());
-
-        calendar.set(Calendar.MINUTE, 27);
-
-        etlRsvrDataEntity.setFromDate(calendar.getTime());
-
-        etlRsvrDataEntity.setRtuCode("20911190");
-        etlRsvrDataEntity.setRz(0.05);
-
-
-        kafkaTemplate.send("topic-etl-rsvr-data", JSONObject.toJSONString(etlRsvrDataEntity));
-        return R.data("ok");
-
-
-    }
-
-    @GetMapping("/data/river/4")
-    @ApiOperationSupport(order = 1)
-    public R<String> addriver4() {
-        EtlRsvrDataEntity etlRsvrDataEntity = new EtlRsvrDataEntity();
-
-        Calendar calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 12);
-        calendar.set(Calendar.MINUTE, 20);
-        calendar.set(Calendar.SECOND, 0);
-        etlRsvrDataEntity.setTm(calendar.getTime());
-
-        calendar.set(Calendar.MINUTE, 35);
-
-        etlRsvrDataEntity.setFromDate(calendar.getTime());
-
-        etlRsvrDataEntity.setRtuCode("20911190");
-        etlRsvrDataEntity.setRz(0.05);
-
-
-        kafkaTemplate.send("topic-etl-rsvr-data", JSONObject.toJSONString(etlRsvrDataEntity));
-        return R.data("ok");
-
-
-    }
-
-    @GetMapping("/data/rain/hour/0")
-    @ApiOperationSupport(order = 1)
-    public R<String> addrainhour0() {
-        String key = "etl.rain.01751310.up.hour";
-
-        ValueOperations<String, String> ops = redisTemplate.opsForValue();
-
-        JSONArray array = new JSONArray();
-        ops.set(key, array.toJSONString());
-        return R.data("ok");
-    }
-
-    @GetMapping("/data/rain/hour")
-    @ApiOperationSupport(order = 1)
-    public R<String> addrainhour() {
-        EtlRainDataEntity etlRainDataEntity = new EtlRainDataEntity();
-        Calendar calendar = Calendar.getInstance();
-        calendar.set(Calendar.DAY_OF_MONTH, 9);
-        calendar.set(Calendar.HOUR_OF_DAY, 12);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.DAY_OF_MONTH, 9);
-        calendar.set(Calendar.HOUR_OF_DAY, 13);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.DAY_OF_MONTH, 9);
-        calendar.set(Calendar.HOUR_OF_DAY, 13);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-//		 etlRainDataEntity= new EtlRainDataEntity();
-//		 calendar=Calendar.getInstance();
-//		calendar.set(Calendar.DAY_OF_MONTH,9);
-//		calendar.set(Calendar.HOUR_OF_DAY,14);
-//		calendar.set(Calendar.MINUTE,15);
-//		calendar.set(Calendar.SECOND,0);
-//		etlRainDataEntity.setTm(calendar.getTime());
-//		calendar.set(Calendar.MINUTE,27);
-//		etlRainDataEntity.setFromDate(calendar.getTime());
-//		etlRainDataEntity.setRtuCode("01751310");
-//		etlRainDataEntity.setIntv(0.05);
-//		etlRainDataEntity.setDrp(1.0);
-//		kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-//		 etlRainDataEntity= new EtlRainDataEntity();
-//		 calendar=Calendar.getInstance();
-//		calendar.set(Calendar.DAY_OF_MONTH,9);
-//		calendar.set(Calendar.HOUR_OF_DAY,15);
-//		calendar.set(Calendar.MINUTE,15);
-//		calendar.set(Calendar.SECOND,0);
-//		etlRainDataEntity.setTm(calendar.getTime());
-//		calendar.set(Calendar.MINUTE,27);
-//		etlRainDataEntity.setFromDate(calendar.getTime());
-//		etlRainDataEntity.setRtuCode("01751310");
-//		etlRainDataEntity.setIntv(0.05);
-//		etlRainDataEntity.setDrp(1.0);
-//		kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-//		 etlRainDataEntity= new EtlRainDataEntity();
-//		 calendar=Calendar.getInstance();
-//		calendar.set(Calendar.DAY_OF_MONTH,9);
-//		calendar.set(Calendar.HOUR_OF_DAY,16);
-//		calendar.set(Calendar.MINUTE,15);
-//		calendar.set(Calendar.SECOND,0);
-//		etlRainDataEntity.setTm(calendar.getTime());
-//		calendar.set(Calendar.MINUTE,27);
-//		etlRainDataEntity.setFromDate(calendar.getTime());
-//		etlRainDataEntity.setRtuCode("01751310");
-//		etlRainDataEntity.setIntv(0.05);
-//		etlRainDataEntity.setDrp(1.0);
-//		kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.DAY_OF_MONTH, 9);
-        calendar.set(Calendar.HOUR_OF_DAY, 17);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.DAY_OF_MONTH, 9);
-        calendar.set(Calendar.HOUR_OF_DAY, 18);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-//		 etlRainDataEntity= new EtlRainDataEntity();
-//		 calendar=Calendar.getInstance();
-//		calendar.set(Calendar.DAY_OF_MONTH,9);
-//		calendar.set(Calendar.HOUR_OF_DAY,19);
-//		calendar.set(Calendar.MINUTE,15);
-//		calendar.set(Calendar.SECOND,0);
-//		etlRainDataEntity.setTm(calendar.getTime());
-//		calendar.set(Calendar.MINUTE,27);
-//		etlRainDataEntity.setFromDate(calendar.getTime());
-//		etlRainDataEntity.setRtuCode("01751310");
-//		etlRainDataEntity.setIntv(0.05);
-//		etlRainDataEntity.setDrp(1.0);
-//		kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-//		 etlRainDataEntity= new EtlRainDataEntity();
-//		 calendar=Calendar.getInstance();
-//		calendar.set(Calendar.DAY_OF_MONTH,9);
-//		calendar.set(Calendar.HOUR_OF_DAY,20);
-//		calendar.set(Calendar.MINUTE,15);
-//		calendar.set(Calendar.SECOND,0);
-//		etlRainDataEntity.setTm(calendar.getTime());
-//		calendar.set(Calendar.MINUTE,27);
-//		etlRainDataEntity.setFromDate(calendar.getTime());
-//		etlRainDataEntity.setRtuCode("01751310");
-//		etlRainDataEntity.setIntv(0.05);
-//		etlRainDataEntity.setDrp(1.0);
-//		kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.DAY_OF_MONTH, 9);
-        calendar.set(Calendar.HOUR_OF_DAY, 21);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.DAY_OF_MONTH, 9);
-        calendar.set(Calendar.HOUR_OF_DAY, 22);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.DAY_OF_MONTH, 9);
-        calendar.set(Calendar.HOUR_OF_DAY, 23);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 0);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 1);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 2);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 3);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 4);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 5);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 6);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 7);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-//		etlRainDataEntity= new EtlRainDataEntity();
-//		calendar=Calendar.getInstance();
-//		calendar.set(Calendar.HOUR_OF_DAY,8);
-//		calendar.set(Calendar.MINUTE,15);
-//		calendar.set(Calendar.SECOND,0);
-//		etlRainDataEntity.setTm(calendar.getTime());
-//		calendar.set(Calendar.MINUTE,27);
-//		etlRainDataEntity.setFromDate(calendar.getTime());
-//		etlRainDataEntity.setRtuCode("01751310");
-//		etlRainDataEntity.setIntv(0.05);
-//		etlRainDataEntity.setDrp(1.0);
-//		kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 9);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 10);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 11);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 12);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 13);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-//
-//		etlRainDataEntity= new EtlRainDataEntity();
-//		calendar=Calendar.getInstance();
-//		calendar.set(Calendar.HOUR_OF_DAY,14);
-//		calendar.set(Calendar.MINUTE,15);
-//		calendar.set(Calendar.SECOND,0);
-//		etlRainDataEntity.setTm(calendar.getTime());
-//		calendar.set(Calendar.MINUTE,27);
-//		etlRainDataEntity.setFromDate(calendar.getTime());
-//		etlRainDataEntity.setRtuCode("01751310");
-//		etlRainDataEntity.setIntv(0.05);
-//		etlRainDataEntity.setDrp(1.0);
-//		kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 15);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 16);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-//
-//
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 17);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 18);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 19);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-
-        etlRainDataEntity = new EtlRainDataEntity();
-        calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 20);
-        calendar.set(Calendar.MINUTE, 15);
-        calendar.set(Calendar.SECOND, 0);
-        etlRainDataEntity.setTm(calendar.getTime());
-        calendar.set(Calendar.MINUTE, 27);
-        etlRainDataEntity.setFromDate(calendar.getTime());
-        etlRainDataEntity.setRtuCode("01751310");
-        etlRainDataEntity.setIntv(0.05);
-        etlRainDataEntity.setDrp(1.0);
-        kafkaTemplate.send("topic-etl-rain-data", JSONObject.toJSONString(etlRainDataEntity));
-
-        return R.data("ok");
-    }
-}

src/main/java/org/springblade/etl/dto/EtlGroundDataDTO.java

@@ -1,49 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.dto;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.etl.entity.EtlGroundDataEntity;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class EtlGroundDataDTO extends EtlGroundDataEntity {
-	@ApiModelProperty("查询截止时间")
-	@DateTimeFormat(
-		pattern = "yyyy-MM-dd HH:mm:ss"
-	)
-	@JsonFormat(
-		pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8"
-	)
-	private Date lastTime;
-
-	@ApiModelProperty("查询截止时间")
-	@DateTimeFormat(
-		pattern = "yyyy-MM-dd HH:mm:ss"
-	)
-	@JsonFormat(
-		pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8"
-	)
-	private Date time;
-
-}

src/main/java/org/springblade/etl/dto/EtlMvAttStBaseDTO.java

@@ -1,27 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.dto;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class EtlMvAttStBaseDTO extends BaseEntity {
-
-}

src/main/java/org/springblade/etl/dto/EtlRainDataDTO.java

@@ -1,49 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.dto;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.etl.entity.EtlRainDataEntity;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class EtlRainDataDTO extends EtlRainDataEntity {
-
-	@ApiModelProperty("查询截止时间")
-	@DateTimeFormat(
-		pattern = "yyyy-MM-dd HH:mm:ss"
-	)
-	@JsonFormat(
-		pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8"
-	)
-	private Date lastTime;
-
-	@ApiModelProperty("查询截止时间")
-	@DateTimeFormat(
-		pattern = "yyyy-MM-dd HH:mm:ss"
-	)
-	@JsonFormat(
-		pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8"
-	)
-	private Date time;
-}

src/main/java/org/springblade/etl/dto/EtlRiverDataDTO.java

@@ -1,48 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.dto;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.etl.entity.EtlRiverDataEntity;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class EtlRiverDataDTO extends EtlRiverDataEntity {
-	@ApiModelProperty("查询截止时间")
-	@DateTimeFormat(
-		pattern = "yyyy-MM-dd HH:mm:ss"
-	)
-	@JsonFormat(
-		pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8"
-	)
-	private Date lastTime;
-
-	@ApiModelProperty("查询截止时间")
-	@DateTimeFormat(
-		pattern = "yyyy-MM-dd HH:mm:ss"
-	)
-	@JsonFormat(
-		pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8"
-	)
-	private Date time;
-}

src/main/java/org/springblade/etl/dto/EtlRsvrDataDTO.java

@@ -1,49 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.dto;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.etl.entity.EtlRsvrDataEntity;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class EtlRsvrDataDTO extends EtlRsvrDataEntity {
-	@ApiModelProperty("查询截止时间")
-	@DateTimeFormat(
-		pattern = "yyyy-MM-dd HH:mm:ss"
-	)
-	@JsonFormat(
-		pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8"
-	)
-	private Date lastTime;
-
-	@ApiModelProperty("查询截止时间")
-	@DateTimeFormat(
-		pattern = "yyyy-MM-dd HH:mm:ss"
-	)
-	@JsonFormat(
-		pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8"
-	)
-	private Date time;
-
-}

src/main/java/org/springblade/etl/dto/EtlWarningInfoDTO.java

@@ -1,31 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.dto;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class EtlWarningInfoDTO extends BaseEntity {
-
-}

src/main/java/org/springblade/etl/entity/EtlMpDataEntity.java

@@ -1,55 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("WR_MP_B")
-public class EtlMpDataEntity extends BaseEntity {
-	private static final long serialVersionUID = 1L;
-
-	@ApiModelProperty("监测点代码")
-	private String mpCd;
-
-	@ApiModelProperty("监测点名称")
-	private String mpNm;
-
-	@ApiModelProperty("监测点地址")
-	private String mpAddr;
-
-	@ApiModelProperty("监测项目")
-	private String mpItem;
-
-	@ApiModelProperty("监测类型")
-	private String isAuto;
-
-	@ApiModelProperty("水源类型")
-	private String sourTp;
-
-	@ApiModelProperty("纬度")
-	private String weiDu;
-
-	@ApiModelProperty("经度")
-	private String jingDu;
-
-
-}

src/main/java/org/springblade/etl/entity/EtlRtuDataEntity.java

@@ -1,40 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("WR_RTU_B")
-public class EtlRtuDataEntity extends BaseEntity {
-	private static final long serialVersionUID = 1L;
-
-	@ApiModelProperty("编码")
-	private String rtuCd;
-
-	@ApiModelProperty("机构")
-	private String orgCode;
-
-}

src/main/java/org/springblade/etl/entity/EtlWiuDataEntity.java

@@ -1,56 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("WR_WIU_B")
-public class EtlWiuDataEntity extends BaseEntity {
-	private static final long serialVersionUID = 1L;
-
-	@ApiModelProperty("编码")
-	private String wiuCd;
-
-	@ApiModelProperty("名称")
-	private String wiuNm;
-
-	@ApiModelProperty("法人代表")
-	private String lrNm;
-
-	@ApiModelProperty("行业类别")
-	private String tradTp;
-
-	@ApiModelProperty("经济类型")
-	private String ecoTp;
-
-	@ApiModelProperty("监控级别")
-	private String mong;
-
-	@ApiModelProperty("取用类别")
-	private String wiuTp;
-
-	@ApiModelProperty("地址")
-	private String addr;
-
-	@ApiModelProperty("机构")
-	private String orgCode;
-}

src/main/java/org/springblade/etl/entity/EtlWiuWiustDataEntity.java

@@ -1,36 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("REL_WIU_WIUST")
-public class EtlWiuWiustDataEntity extends BaseEntity {
-	private static final long serialVersionUID = 1L;
-
-	@ApiModelProperty("用水户")
-	private String wiuCd;
-
-	@ApiModelProperty("测站")
-	private String wiustCd;
-
-}

src/main/java/org/springblade/etl/entity/EtlWiustDataEntity.java

@@ -1,51 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("WR_WIUST_B")
-public class EtlWiustDataEntity extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("取用水测站代码")
-    private String wiustCd;
-
-    @ApiModelProperty("取用水测站名称")
-    private String wiustNm;
-
-    @ApiModelProperty("取用水测站类别")
-    private String wiustTp;
-
-    @ApiModelProperty("所在地")
-    private String loc;
-
-    @ApiModelProperty("基面类型")
-    private String datTp;
-
-    @ApiModelProperty("测井类型")
-    private String wellTp;
-
-    @ApiModelProperty("设站年月")
-    private String estStYm;
-
-}

src/main/java/org/springblade/etl/entity/EtlWiustMpDataEntity.java

@@ -1,36 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("REL_WIUST_MP")
-public class EtlWiustMpDataEntity extends BaseEntity {
-	private static final long serialVersionUID = 1L;
-
-	@ApiModelProperty("取用水测点代码")
-	private String mpCd;
-
-	@ApiModelProperty("取用水测站代码")
-	private String wiustCd;
-
-}

src/main/java/org/springblade/etl/mapper/EtlGroundDataMapper.java

@@ -1,28 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/8/24
- */
-package org.springblade.etl.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.springblade.etl.dto.EtlGroundDataDTO;
-import org.springblade.etl.entity.EtlGroundDataEntity;
-
-
-import java.util.List;
-
-
-/***
- * Date:2022/8/24
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface EtlGroundDataMapper extends BaseMapper<EtlGroundDataEntity> {
-	List<EtlGroundDataEntity> selectLastList(@Param("etlGroundDataDTO") EtlGroundDataDTO etlGroundDataDTO);
-}

src/main/java/org/springblade/etl/mapper/EtlGroundDataMapper.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.etl.mapper.EtlGroundDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="groundDataEntityResultMap" type="org.springblade.etl.entity.EtlGroundDataEntity">
-        <result column="GUID" property="guid"/>
-        <result column="ST_CODE" property="rtuCode"/>
-        <result column="MEAS_DATE" property="tm"/>
-        <result column="VERT_AVER_MOCO" property="vtavslm"/>
-        <result column="SURF_MOCO" property="srlslm"/>
-        <result column="MOCO_10CM" property="slm10"/>
-        <result column="MOCO_20CM" property="slm20"/>
-        <result column="MOCO_30CM" property="slm30"/>
-        <result column="MOCO_40CM" property="slm40"/>
-        <result column="MOCO_50CM" property="slm50"/>
-        <result column="MOCO_60CM" property="slm60"/>
-        <result column="MOCO_80CM" property="slm80"/>
-        <result column="MOCO_10CM" property="slm100"/>
-
-    </resultMap>
-
-
-    <select id="selectLastList" resultMap="groundDataEntityResultMap">
-        SELECT
-        d.*
-        FROM
-        etl_att_st_somo d
-        WHERE 1=1
-        <if test="etlGroundDataDTO.rtuCode!=null">
-            and d.ST_CODE = #{etlGroundDataDTO.rtuCode}
-        </if>
-        <if test="etlGroundDataDTO.lastTime!=null">
-            and d.MEAS_DATE > #{etlGroundDataDTO.lastTime}
-        </if>
-        order  by d.MEAS_DATE desc
-        limit 1
-    </select>
-</mapper>

src/main/java/org/springblade/etl/mapper/EtlMpMapper.java

@@ -1,27 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/8/24
- */
-package org.springblade.etl.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.springblade.etl.entity.EtlMpDataEntity;
-import org.springblade.etl.entity.EtlWiustDataEntity;
-
-import java.util.List;
-
-
-/***
- * Date:2022/8/24
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface EtlMpMapper extends BaseMapper<EtlMpDataEntity> {
-	List<EtlMpDataEntity> selectList(@Param("entity") EtlMpDataEntity entity);
-}

src/main/java/org/springblade/etl/mapper/EtlMpMapper.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.etl.mapper.EtlMpMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="entityResultMap" type="org.springblade.etl.entity.EtlMpDataEntity">
-        <result column="MP_CD" property="mpCd"/>
-        <result column="MP_NM" property="mpNm"/>
-        <result column="MP_ADDR" property="mpAddr"/>
-        <result column="MP_ITEM" property="mpItem"/>
-        <result column="IS_AUTO" property="isAuto"/>
-        <result column="SOUR_TP" property="sourTp"/>
-        <result column="wei_du" property="weiDu"/>
-        <result column="jing_du" property="jingDu"/>
-
-    </resultMap>
-
-    <select id="selectList" resultMap="entityResultMap">
-        SELECT
-        d.MP_CD,d.MP_NM,d.MP_ADDR,d.MP_ITEM,d.IS_AUTO,d.SOUR_TP,d.wei_du,d.jing_du
-        FROM
-        WR_MP_B d
-        WHERE 1=1
-    </select>
-</mapper>

src/main/java/org/springblade/etl/mapper/EtlMvAttStBaseMapper.java

@@ -1,27 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/8/24
- */
-package org.springblade.etl.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.springblade.etl.entity.EtlAdCdEntity;
-import org.springblade.etl.entity.EtlMvAttStBaseEntity;
-
-import java.util.List;
-
-
-/***
- * Date:2022/8/24
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface EtlMvAttStBaseMapper extends BaseMapper<EtlMvAttStBaseEntity> {
-	List<EtlMvAttStBaseEntity> selectList();
-}

src/main/java/org/springblade/etl/mapper/EtlMvAttStBaseMapper.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.etl.mapper.EtlMvAttStBaseMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="stBaseEntityResultMap" type="org.springblade.etl.entity.EtlMvAttStBaseEntity">
-        <result column="ST_CODE" property="stCode"/>
-        <result column="ST_NAME" property="stName"/>
-        <result column="AD_CODE" property="adCode"/>
-        <result column="AD_NAME" property="adName"/>
-        <result column="ST_TYPE" property="stType"/>
-        <result column="ST_LONG" property="stLong"/>
-        <result column="ST_LAT" property="stLat"/>
-        <result column="ST_SITE" property="stSite"/>
-        <result column="RV_CODE" property="rvCode"/>
-        <result column="RV_NAME" property="rvName"/>
-        <result column="IS_RAIN" property="isRain"/>
-        <result column="IS_RIVER" property="isRiver"/>
-        <result column="IS_RES" property="isRes"/>
-        <result column="RAIN_ST_TYPE" property="rainStType"/>
-    </resultMap>
-
-
-    <select id="selectList" resultMap="stBaseEntityResultMap">
-        SELECT
-        d.*
-        FROM
-        etl_mv_att_st_base d
-        WHERE 1=1
-        order  by d.ST_CODE
-    </select>
-</mapper>

src/main/java/org/springblade/etl/mapper/EtlRainDataMapper.java

@@ -1,29 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/8/24
- */
-package org.springblade.etl.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.springblade.etl.dto.EtlRainDataDTO;
-import org.springblade.etl.entity.EtlRainDataEntity;
-
-import java.util.List;
-
-
-/***
- * Date:2022/8/24
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface EtlRainDataMapper extends BaseMapper<EtlRainDataEntity> {
-	List<EtlRainDataEntity> selectLastList(@Param("etlRainDataDTO") EtlRainDataDTO etlRainDataDTO);
-
-	boolean saveTestData(@Param("etlRainDataEntity") EtlRainDataEntity etlRainDataEntity);
-}

src/main/java/org/springblade/etl/mapper/EtlRainDataMapper.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.etl.mapper.EtlRainDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="rainDataEntityResultMap" type="org.springblade.etl.entity.EtlRainDataEntity">
-        <result column="GUID" property="guid"/>
-        <result column="ST_CODE" property="rtuCode"/>
-        <result column="TM" property="tm"/>
-        <result column="DRP" property="drp"/>
-        <result column="INTV" property="intv"/>
-        <result column="PDR" property="pdr"/>
-        <result column="DYP" property="dyp"/>
-        <result column="WTH" property="wth"/>
-    </resultMap>
-
-
-    <select id="selectLastList" resultMap="rainDataEntityResultMap">
-        SELECT
-        d.*
-        FROM
-        etl_att_st_prec d
-        WHERE 1=1
-        <if test="etlRainDataDTO.rtuCode!=null">
-            and d.ST_CODE = #{etlRainDataDTO.rtuCode}
-        </if>
-        <if test="etlRainDataDTO.lastTime!=null">
-            and d.TM > #{etlRainDataDTO.lastTime}
-        </if>
-        order by d.TM desc
-        limit 1
-    </select>
-
-    <insert id="saveTestData">
-         insert  into  etl_att_st_prec(GUID,ST_CODE,TM,DRP,INTV) values (#{etlRainDataEntity.guid},#{etlRainDataEntity.rtuCode},#{etlRainDataEntity.tm},#{etlRainDataEntity.drp},#{etlRainDataEntity.intv})
-    </insert>
-</mapper>

src/main/java/org/springblade/etl/mapper/EtlRiverDataMapper.java

@@ -1,28 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/8/24
- */
-package org.springblade.etl.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.springblade.etl.dto.EtlRiverDataDTO;
-import org.springblade.etl.entity.EtlRainDataEntity;
-import org.springblade.etl.entity.EtlRiverDataEntity;
-
-import java.util.List;
-
-
-/***
- * Date:2022/8/24
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface EtlRiverDataMapper extends BaseMapper<EtlRiverDataEntity> {
-	List<EtlRiverDataEntity> selectLastList(@Param("etlRiverDataDTO") EtlRiverDataDTO etlRiverDataDTO);
-}

src/main/java/org/springblade/etl/mapper/EtlRiverDataMapper.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.etl.mapper.EtlRiverDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="riverDataEntityResultMap" type="org.springblade.etl.entity.EtlRiverDataEntity">
-        <result column="GUID" property="guid"/>
-        <result column="ST_CODE" property="rtuCode"/>
-        <result column="TM" property="tm"/>
-        <result column="Z" property="z"/>
-
-    </resultMap>
-
-
-    <select id="selectLastList" resultMap="riverDataEntityResultMap">
-        SELECT
-        d.*
-        FROM
-        etl_att_st_waco_ware d
-        WHERE 1=1
-        <if test="etlRiverDataDTO.rtuCode!=null">
-            and d.ST_CODE = #{etlRiverDataDTO.rtuCode}
-        </if>
-        <if test="etlRiverDataDTO.lastTime!=null">
-            and d.TM > #{etlRiverDataDTO.lastTime}
-        </if>
-        order by d.TM desc
-        limit 1
-    </select>
-</mapper>

src/main/java/org/springblade/etl/mapper/EtlRsvrDataMapper.java

@@ -1,27 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/8/24
- */
-package org.springblade.etl.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.springblade.etl.dto.EtlRsvrDataDTO;
-import org.springblade.etl.entity.EtlRsvrDataEntity;
-
-import java.util.List;
-
-
-/***
- * Date:2022/8/24
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface EtlRsvrDataMapper extends BaseMapper<EtlRsvrDataEntity> {
-	List<EtlRsvrDataEntity> selectLastList(@Param("etlRsvrDataDTO") EtlRsvrDataDTO etlRsvrDataDTO);
-}

src/main/java/org/springblade/etl/mapper/EtlRsvrDataMapper.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.etl.mapper.EtlRsvrDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="rsvrDataEntityResultMap" type="org.springblade.etl.entity.EtlRsvrDataEntity">
-        <result column="GUID" property="guid"/>
-        <result column="ST_CODE" property="rtuCode"/>
-        <result column="TM" property="tm"/>
-        <result column="RZ" property="rz"/>
-    </resultMap>
-
-
-    <select id="selectLastList" resultMap="rsvrDataEntityResultMap">
-        SELECT
-        d.*
-        FROM
-        etl_att_st_res_ware d
-        WHERE 1=1
-        <if test="etlRsvrDataDTO.rtuCode!=null">
-            and d.ST_CODE = #{etlRsvrDataDTO.rtuCode}
-        </if>
-        <if test="etlRsvrDataDTO.lastTime!=null">
-            and d.TM > #{etlRsvrDataDTO.lastTime}
-        </if>
-        order by d.TM desc
-        limit 1
-    </select>
-</mapper>

src/main/java/org/springblade/etl/mapper/EtlRtuMapper.java

@@ -1,27 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/8/24
- */
-package org.springblade.etl.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.springblade.etl.entity.EtlAdCdEntity;
-import org.springblade.etl.entity.EtlRtuDataEntity;
-
-import java.util.List;
-
-
-/***
- * Date:2022/8/24
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface EtlRtuMapper extends BaseMapper<EtlRtuDataEntity> {
-	List<EtlRtuDataEntity> selectList(@Param("entity") EtlRtuDataEntity entity);
-}

src/main/java/org/springblade/etl/mapper/EtlRtuMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.etl.mapper.EtlRtuMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="entityResultMap" type="org.springblade.etl.entity.EtlRtuDataEntity">
-        <result column="RTU_CD" property="rtuCd"/>
-        <result column="org_code" property="orgCode"/>
-
-
-    </resultMap>
-
-    <select id="selectList" resultMap="entityResultMap">
-        SELECT
-        d.RTU_CD,d.org_code
-        FROM
-        WR_RTU_B d
-        WHERE 1=1
-    </select>
-</mapper>

src/main/java/org/springblade/etl/mapper/EtlTaskInfoMapper.java

@@ -1,24 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/8/22
- */
-package org.springblade.etl.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.etl.entity.EtlTaskInfoEntity;
-
-
-
-/***
- * Date:2022/8/22
- * Title:ETL模块-ETL任务执行信息映射
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface EtlTaskInfoMapper extends BaseMapper<EtlTaskInfoEntity> {
-
-}

src/main/java/org/springblade/etl/mapper/EtlTaskInfoMapper.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.etl.mapper.EtlTaskInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="taskInfoResultMap" type="org.springblade.etl.entity.EtlTaskInfoEntity">
-        <result column="task_type" property="taskType"/>
-        <result column="task_execute_time" property="taskExecuteTime"/>
-        <result column="task_execute_long" property="taskExecuteLong"/>
-        <result column="rtu_count" property="rtuCount"/>
-        <result column="collect_data_count" property="collectDataCount"/>
-        <result column="remark" property="remark"/>
-    </resultMap>
-
-</mapper>

src/main/java/org/springblade/etl/mapper/EtlWarningInfoMapper.java

@@ -1,22 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/8/24
- */
-package org.springblade.etl.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.etl.entity.EtlWarningInfoEntity;
-
-
-/***
- * Date:2022/8/24
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface EtlWarningInfoMapper extends BaseMapper<EtlWarningInfoEntity> {
-}

src/main/java/org/springblade/etl/mapper/EtlWarningInfoMapper.xml

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.etl.mapper.EtlWarningInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="etlWarningInfoEntityResultMap" type="org.springblade.etl.entity.EtlWarningInfoEntity">
-        <result column="id" property="id"/>
-        <result column="create_user" property="createUser"/>
-        <result column="create_time" property="createTime"/>
-        <result column="update_user" property="updateUser"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="status" property="status"/>
-        <result column="is_deleted" property="isDeleted"/>
-
-        <result column="STCD" property="stcd"/>
-        <result column="WARN_NAME" property="warnName"/>
-        <result column="WARN_TIME" property="warnTime"/>
-        <result column="WARN_LEVEL_CODE" property="warnLevelCode"/>
-        <result column="WARN_INFO" property="warnInfo"/>
-        <result column="WARN_STATUS" property="warnStatus"/>
-        <result column="REVIEW_STATUS" property="reviewStatus"/>
-        <result column="TYPE" property="type"/>
-        <result column="REMARK" property="remark"/>
-        <result column="RAIN_WARN_RATE" property="rainWarnRate"/>
-        <result column="WARN_SORT" property="warnSort"/>
-        <result column="WARN_LOCATION" property="warnLocation"/>
-        <result column="WARN_ADCD" property="warnAdcd"/>
-        <result column="USER_ADCD" property="userAdcd"/>
-        <result column="WARN_LGTD" property="warnLgtd"/>
-        <result column="WARN_LTTD" property="warnLttd"/>
-        <result column="INTV" property="intv"/>
-        <result column="DRP" property="drp"/>
-        <result column="Z" property="z"/>
-        <result column="Q" property="q"/>
-        <result column="WPTN" property="wptn"/>
-        <result column="RZ" property="rz"/>
-        <result column="RWPTN" property="rwptn"/>
-        <result column="INQ" property="inq"/>
-        <result column="REL_WARN_ID" property="relWarnId"/>
-        <result column="ORIGINAL_CREATE_USER" property="originalCreateUser"/>
-        <result column="ORIGINAL_CREATE_TIME" property="originalCreateTime"/>
-        <result column="ORIGINAL_UPDATE_USER" property="originalUpdateUser"/>
-        <result column="ORIGINAL_UPDATE_TIME" property="originalUpdateTime"/>
-    </resultMap>
-
-
-
-
-    <!--<select id="selectPage" resultMap="checkOrderInfoVOResultMap">-->
-        <!--SELECT-->
-         <!--o.*,u.real_name,i.rtu_name,p.project_name,d2.dept_name AS org_name-->
-        <!--FROM-->
-        <!--rtu_failure_check_order o-->
-        <!--LEFT JOIN rtu_info i ON i.rtu_code = o.rtu_code-->
-        <!--LEFT JOIN blade_user u ON u.id = o.update_user-->
-        <!--LEFT JOIN  project_info p ON i.project_id = p.id-->
-        <!--LEFT JOIN  blade_dept d2 ON i.org_id = d2.id-->
-        <!--WHERE-->
-        <!--o.is_deleted = 0-->
-        <!--<if test="checkOrderInfoDTO.rtuCode!=null">-->
-            <!--and o.rtu_code like concat(concat('%', #{checkOrderInfoDTO.rtuCode}), '%')-->
-        <!--</if>-->
-        <!--<if test="checkOrderInfoDTO.rtuName!=null">-->
-            <!--and i.rtu_name like concat(concat('%', #{checkOrderInfoDTO.rtuName}), '%')-->
-        <!--</if>-->
-    <!--</select>-->
-</mapper>

src/main/java/org/springblade/etl/mapper/EtlWiuMapper.java

@@ -1,27 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/8/24
- */
-package org.springblade.etl.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.springblade.etl.entity.EtlRtuDataEntity;
-import org.springblade.etl.entity.EtlWiuDataEntity;
-
-import java.util.List;
-
-
-/***
- * Date:2022/8/24
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface EtlWiuMapper extends BaseMapper<EtlWiuDataEntity> {
-	List<EtlWiuDataEntity> selectList(@Param("entity") EtlWiuDataEntity entity);
-}

src/main/java/org/springblade/etl/mapper/EtlWiuMapper.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.etl.mapper.EtlWiuMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="entityResultMap" type="org.springblade.etl.entity.EtlWiuDataEntity">
-        <result column="WIU_CD" property="wiuCd"/>
-        <result column="WIU_NM" property="wiuNm"/>
-        <result column="LR_NM" property="lrNm"/>
-        <result column="TRAD_TP" property="tradTp"/>
-        <result column="ECO_TP" property="ecoTp"/>
-        <result column="MON_G" property="mong"/>
-        <result column="WIU_TP" property="wiuTp"/>
-        <result column="ADDR" property="addr"/>
-        <result column="org_code" property="orgCode"/>
-
-
-    </resultMap>
-
-    <select id="selectList" resultMap="entityResultMap">
-        SELECT
-        d.WIU_CD,d.WIU_NM,d.LR_NM,d.TRAD_TP,d.ECO_TP,d.MON_G,d.WIU_TP,d.ADDR,d.org_code
-        FROM
-        WR_WIU_B d
-        WHERE 1=1
-    </select>
-</mapper>

src/main/java/org/springblade/etl/mapper/EtlWiuWiustMapper.java

@@ -1,27 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/8/24
- */
-package org.springblade.etl.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.springblade.etl.entity.EtlRtuDataEntity;
-import org.springblade.etl.entity.EtlWiuWiustDataEntity;
-
-import java.util.List;
-
-
-/***
- * Date:2022/8/24
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface EtlWiuWiustMapper extends BaseMapper<EtlWiuWiustDataEntity> {
-	List<EtlWiuWiustDataEntity> selectList(@Param("entity") EtlWiuWiustDataEntity entity);
-}

src/main/java/org/springblade/etl/mapper/EtlWiuWiustMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.etl.mapper.EtlWiuWiustMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="entityResultMap" type="org.springblade.etl.entity.EtlWiuWiustDataEntity">
-        <result column="WIUST_CD" property="wiustCd"/>
-        <result column="WIU_CD" property="wiuCd"/>
-
-
-    </resultMap>
-
-    <select id="selectList" resultMap="entityResultMap">
-        SELECT
-        d.WIUST_CD,d.WIU_CD
-        FROM
-        REL_WIU_WIUST d
-        WHERE 1=1
-    </select>
-</mapper>

src/main/java/org/springblade/etl/mapper/EtlWiustMapper.java

@@ -1,27 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/8/24
- */
-package org.springblade.etl.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.springblade.etl.entity.EtlWiuDataEntity;
-import org.springblade.etl.entity.EtlWiustDataEntity;
-
-import java.util.List;
-
-
-/***
- * Date:2022/8/24
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface EtlWiustMapper extends BaseMapper<EtlWiustDataEntity> {
-	List<EtlWiustDataEntity> selectList(@Param("entity") EtlWiustDataEntity entity);
-}

src/main/java/org/springblade/etl/mapper/EtlWiustMapper.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.etl.mapper.EtlWiustMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="entityResultMap" type="org.springblade.etl.entity.EtlWiustDataEntity">
-        <result column="WIUST_CD" property="wiustCd"/>
-        <result column="WIUST_NM" property="wiustNm"/>
-        <result column="WIUST_TP" property="wiustTp"/>
-        <result column="LOC" property="loc"/>
-        <result column="DAT_TP" property="datTp"/>
-        <result column="WELL_TP" property="wellTp"/>
-        <result column="EST_ST_YM" property="estStYm"/>
-
-
-    </resultMap>
-
-    <select id="selectList" resultMap="entityResultMap">
-        SELECT
-        d.WIUST_CD,d.WIUST_NM,d.WIUST_TP,d.LOC,d.DAT_TP,d.WELL_TP,d.EST_ST_YM
-        FROM
-        WR_WIUST_B d
-        WHERE 1=1
-    </select>
-</mapper>

src/main/java/org/springblade/etl/mapper/EtlWiustMpMapper.java

@@ -1,27 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/8/24
- */
-package org.springblade.etl.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.springblade.etl.entity.EtlRtuDataEntity;
-import org.springblade.etl.entity.EtlWiustMpDataEntity;
-
-import java.util.List;
-
-
-/***
- * Date:2022/8/24
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface EtlWiustMpMapper extends BaseMapper<EtlWiustMpDataEntity> {
-	List<EtlWiustMpDataEntity> selectList(@Param("entity") EtlWiustMpDataEntity entity);
-}

src/main/java/org/springblade/etl/mapper/EtlWiustMpMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.etl.mapper.EtlWiustMpMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="entityResultMap" type="org.springblade.etl.entity.EtlWiustMpDataEntity">
-        <result column="MP_CD" property="mpCd"/>
-        <result column="WIUST_CD" property="wiustCd"/>
-
-
-    </resultMap>
-
-    <select id="selectList" resultMap="entityResultMap">
-        SELECT
-        d.MP_CD,d.WIUST_CD
-        FROM
-        REL_WIUST_MP d
-        WHERE 1=1
-    </select>
-</mapper>

src/main/java/org/springblade/etl/service/IEtlGroundDataService.java

@@ -1,28 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service;
-
-import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.dto.EtlGroundDataDTO;
-import org.springblade.etl.entity.EtlGroundDataEntity;
-import org.springblade.etl.entity.EtlRainDataEntity;
-
-import java.util.List;
-
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface IEtlGroundDataService extends BaseService<EtlGroundDataEntity> {
-
-	List<EtlGroundDataEntity> selectLastList(EtlGroundDataDTO etlGroundDataDTO);
-}

src/main/java/org/springblade/etl/service/IEtlMpDataService.java

@@ -1,26 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service;
-
-import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.entity.EtlMpDataEntity;
-import org.springblade.etl.entity.EtlWiustDataEntity;
-
-import java.util.List;
-
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface IEtlMpDataService extends BaseService<EtlMpDataEntity> {
-	List<EtlMpDataEntity> selectList(EtlMpDataEntity entity);
-}

src/main/java/org/springblade/etl/service/IEtlMvAttStBaseService.java

@@ -1,26 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service;
-
-import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.entity.EtlAdCdEntity;
-import org.springblade.etl.entity.EtlMvAttStBaseEntity;
-
-import java.util.List;
-
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface IEtlMvAttStBaseService extends BaseService<EtlMvAttStBaseEntity> {
-	List<EtlMvAttStBaseEntity> selectList();
-}

src/main/java/org/springblade/etl/service/IEtlRainDataService.java

@@ -1,29 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service;
-
-import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.dto.EtlRainDataDTO;
-import org.springblade.etl.entity.EtlRainDataEntity;
-
-import java.util.List;
-
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface IEtlRainDataService extends BaseService<EtlRainDataEntity> {
-
-	List<EtlRainDataEntity> selectLastList(EtlRainDataDTO etlRainDataDTO);
-
-	boolean saveTestData(EtlRainDataEntity etlRainDataEntity);
-}

src/main/java/org/springblade/etl/service/IEtlRiverDataService.java

@@ -1,28 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service;
-
-import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.dto.EtlRiverDataDTO;
-import org.springblade.etl.entity.EtlRainDataEntity;
-import org.springblade.etl.entity.EtlRiverDataEntity;
-
-import java.util.List;
-
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface IEtlRiverDataService extends BaseService<EtlRiverDataEntity> {
-
-	List<EtlRiverDataEntity> selectLastList(EtlRiverDataDTO etlRiverDataDTO);
-}

src/main/java/org/springblade/etl/service/IEtlRsvrDataService.java

@@ -1,28 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service;
-
-import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.dto.EtlRsvrDataDTO;
-import org.springblade.etl.entity.EtlRainDataEntity;
-import org.springblade.etl.entity.EtlRsvrDataEntity;
-
-import java.util.List;
-
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface IEtlRsvrDataService extends BaseService<EtlRsvrDataEntity> {
-
-	List<EtlRsvrDataEntity> selectLastList(EtlRsvrDataDTO etlRsvrDataDTO);
-}

src/main/java/org/springblade/etl/service/IEtlRtuDataService.java

@@ -1,25 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service;
-
-import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.entity.EtlRtuDataEntity;
-
-import java.util.List;
-
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface IEtlRtuDataService extends BaseService<EtlRtuDataEntity> {
-	List<EtlRtuDataEntity> selectList(EtlRtuDataEntity entity);
-}

src/main/java/org/springblade/etl/service/IEtlTaskInfoService.java

@@ -1,24 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service;
-
-import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.entity.EtlTaskInfoEntity;
-
-
-
-/***
- * Date:2022/9/8
- * Title:ETL模块-ETL任务执行管理
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface IEtlTaskInfoService extends BaseService<EtlTaskInfoEntity> {
-
-}

src/main/java/org/springblade/etl/service/IEtlWarningService.java

@@ -1,27 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service;
-
-import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.entity.EtlWarningInfoEntity;
-
-
-import java.util.Date;
-import java.util.List;
-
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface IEtlWarningService extends BaseService<EtlWarningInfoEntity> {
-
-}

src/main/java/org/springblade/etl/service/IEtlWiuDataService.java

@@ -1,26 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service;
-
-import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.entity.EtlRtuDataEntity;
-import org.springblade.etl.entity.EtlWiuDataEntity;
-
-import java.util.List;
-
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface IEtlWiuDataService extends BaseService<EtlWiuDataEntity> {
-	List<EtlWiuDataEntity> selectList(EtlWiuDataEntity entity);
-}

src/main/java/org/springblade/etl/service/IEtlWiuWiustDataService.java

@@ -1,26 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service;
-
-import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.entity.EtlWiuDataEntity;
-import org.springblade.etl.entity.EtlWiuWiustDataEntity;
-
-import java.util.List;
-
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface IEtlWiuWiustDataService extends BaseService<EtlWiuWiustDataEntity> {
-	List<EtlWiuWiustDataEntity> selectList(EtlWiuWiustDataEntity entity);
-}

src/main/java/org/springblade/etl/service/IEtlWiustDataService.java

@@ -1,26 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service;
-
-import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.entity.EtlWiuDataEntity;
-import org.springblade.etl.entity.EtlWiustDataEntity;
-
-import java.util.List;
-
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface IEtlWiustDataService extends BaseService<EtlWiustDataEntity> {
-	List<EtlWiustDataEntity> selectList(EtlWiustDataEntity entity);
-}

src/main/java/org/springblade/etl/service/IEtlWiustMpDataService.java

@@ -1,26 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service;
-
-import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.entity.EtlWiuDataEntity;
-import org.springblade.etl.entity.EtlWiustMpDataEntity;
-
-import java.util.List;
-
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface IEtlWiustMpDataService extends BaseService<EtlWiustMpDataEntity> {
-    List<EtlWiustMpDataEntity> selectList(EtlWiustMpDataEntity entity);
-}

src/main/java/org/springblade/etl/service/impl/EtlGroundDataServiceImpl.java

@@ -1,37 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service.impl;
-
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.dto.EtlGroundDataDTO;
-import org.springblade.etl.entity.EtlGroundDataEntity;
-import org.springblade.etl.entity.EtlRainDataEntity;
-import org.springblade.etl.mapper.EtlGroundDataMapper;
-import org.springblade.etl.mapper.EtlRainDataMapper;
-import org.springblade.etl.service.IEtlGroundDataService;
-import org.springblade.etl.service.IEtlRainDataService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Service
-public class EtlGroundDataServiceImpl extends BaseServiceImpl<EtlGroundDataMapper, EtlGroundDataEntity> implements IEtlGroundDataService {
-
-	@Override
-	public List<EtlGroundDataEntity> selectLastList(EtlGroundDataDTO etlGroundDataDTO) {
-		return baseMapper.selectLastList(etlGroundDataDTO);
-	}
-}

src/main/java/org/springblade/etl/service/impl/EtlMpDatadServiceImpl.java

@@ -1,38 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service.impl;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.entity.EtlMpDataEntity;
-import org.springblade.etl.entity.EtlWiustDataEntity;
-import org.springblade.etl.mapper.EtlMpMapper;
-import org.springblade.etl.mapper.EtlWiustMapper;
-import org.springblade.etl.service.IEtlMpDataService;
-import org.springblade.etl.service.IEtlWiustDataService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Service
-@DS("sqlserver_1")
-public class EtlMpDatadServiceImpl extends BaseServiceImpl<EtlMpMapper, EtlMpDataEntity> implements IEtlMpDataService {
-
-    @Override
-    public List<EtlMpDataEntity> selectList(EtlMpDataEntity entity) {
-        return baseMapper.selectList(entity);
-    }
-}

src/main/java/org/springblade/etl/service/impl/EtlMvAttStBaseServiceImpl.java

@@ -1,37 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service.impl;
-
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.entity.EtlAdCdEntity;
-import org.springblade.etl.entity.EtlMvAttStBaseEntity;
-import org.springblade.etl.mapper.EtlAdCdMapper;
-import org.springblade.etl.mapper.EtlMvAttStBaseMapper;
-import org.springblade.etl.service.IEtlAdCdService;
-import org.springblade.etl.service.IEtlMvAttStBaseService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Service
-public class EtlMvAttStBaseServiceImpl extends BaseServiceImpl<EtlMvAttStBaseMapper, EtlMvAttStBaseEntity> implements IEtlMvAttStBaseService {
-
-
-	@Override
-	public List<EtlMvAttStBaseEntity> selectList() {
-		return this.baseMapper.selectList();
-	}
-}

src/main/java/org/springblade/etl/service/impl/EtlRainDataServiceImpl.java

@@ -1,39 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service.impl;
-
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.dto.EtlRainDataDTO;
-import org.springblade.etl.entity.EtlRainDataEntity;
-import org.springblade.etl.mapper.EtlRainDataMapper;
-import org.springblade.etl.service.IEtlRainDataService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Service
-public class EtlRainDataServiceImpl extends BaseServiceImpl<EtlRainDataMapper, EtlRainDataEntity> implements IEtlRainDataService {
-
-	@Override
-	public List<EtlRainDataEntity> selectLastList(EtlRainDataDTO etlRainDataDTO) {
-		return baseMapper.selectLastList(etlRainDataDTO);
-	}
-
-	@Override
-	public boolean saveTestData(EtlRainDataEntity etlRainDataEntity) {
-		return baseMapper.saveTestData(etlRainDataEntity);
-	}
-}

src/main/java/org/springblade/etl/service/impl/EtlRiverDataServiceImpl.java

@@ -1,37 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service.impl;
-
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.dto.EtlRiverDataDTO;
-import org.springblade.etl.entity.EtlRainDataEntity;
-import org.springblade.etl.entity.EtlRiverDataEntity;
-import org.springblade.etl.mapper.EtlRainDataMapper;
-import org.springblade.etl.mapper.EtlRiverDataMapper;
-import org.springblade.etl.service.IEtlRainDataService;
-import org.springblade.etl.service.IEtlRiverDataService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Service
-public class EtlRiverDataServiceImpl extends BaseServiceImpl<EtlRiverDataMapper, EtlRiverDataEntity> implements IEtlRiverDataService {
-
-	@Override
-	public List<EtlRiverDataEntity> selectLastList(EtlRiverDataDTO etlRiverDataDTO) {
-		return baseMapper.selectLastList(etlRiverDataDTO);
-	}
-}

src/main/java/org/springblade/etl/service/impl/EtlRsvrDataServiceImpl.java

@@ -1,34 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service.impl;
-
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.dto.EtlRsvrDataDTO;
-import org.springblade.etl.entity.EtlRsvrDataEntity;
-import org.springblade.etl.mapper.EtlRsvrDataMapper;
-import org.springblade.etl.service.IEtlRsvrDataService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Service
-public class EtlRsvrDataServiceImpl extends BaseServiceImpl<EtlRsvrDataMapper, EtlRsvrDataEntity> implements IEtlRsvrDataService {
-
-	@Override
-	public List<EtlRsvrDataEntity> selectLastList(EtlRsvrDataDTO etlRsvrDataDTO) {
-		return baseMapper.selectLastList(etlRsvrDataDTO);
-	}
-}

src/main/java/org/springblade/etl/service/impl/EtlRtuDatadServiceImpl.java

@@ -1,35 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service.impl;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.entity.EtlRtuDataEntity;
-import org.springblade.etl.mapper.EtlRtuMapper;
-import org.springblade.etl.service.IEtlRtuDataService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Service
-@DS("sqlserver_1")
-public class EtlRtuDatadServiceImpl extends BaseServiceImpl<EtlRtuMapper, EtlRtuDataEntity> implements IEtlRtuDataService {
-
-    @Override
-    public List<EtlRtuDataEntity> selectList(EtlRtuDataEntity entity) {
-        return baseMapper.selectList(entity);
-    }
-}

src/main/java/org/springblade/etl/service/impl/EtlTaskInfoServiceImpl.java

@@ -1,28 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service.impl;
-
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.entity.EtlTaskInfoEntity;
-import org.springblade.etl.mapper.EtlTaskInfoMapper;
-import org.springblade.etl.service.IEtlTaskInfoService;
-import org.springframework.stereotype.Service;
-
-
-
-/***
- * Date:2022/9/8
- * Title:ETL模块-ETL任务执行管理
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Service
-public class EtlTaskInfoServiceImpl extends BaseServiceImpl<EtlTaskInfoMapper, EtlTaskInfoEntity> implements IEtlTaskInfoService {
-
-}

src/main/java/org/springblade/etl/service/impl/EtlWarningServiceImpl.java

@@ -1,29 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service.impl;
-
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.entity.EtlWarningInfoEntity;
-import org.springblade.etl.mapper.EtlWarningInfoMapper;
-import org.springblade.etl.service.IEtlWarningService;
-
-import org.springframework.stereotype.Service;
-
-
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Service
-public class EtlWarningServiceImpl extends BaseServiceImpl<EtlWarningInfoMapper, EtlWarningInfoEntity> implements IEtlWarningService {
-
-}

src/main/java/org/springblade/etl/service/impl/EtlWiuDatadServiceImpl.java

@@ -1,35 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service.impl;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.entity.EtlWiuDataEntity;
-import org.springblade.etl.mapper.EtlWiuMapper;
-import org.springblade.etl.service.IEtlWiuDataService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Service
-@DS("sqlserver_1")
-public class EtlWiuDatadServiceImpl extends BaseServiceImpl<EtlWiuMapper, EtlWiuDataEntity> implements IEtlWiuDataService {
-
-    @Override
-    public List<EtlWiuDataEntity> selectList(EtlWiuDataEntity entity) {
-        return baseMapper.selectList(entity);
-    }
-}

src/main/java/org/springblade/etl/service/impl/EtlWiuWiustDatadServiceImpl.java

@@ -1,38 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service.impl;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.entity.EtlWiuWiustDataEntity;
-import org.springblade.etl.entity.EtlWiustDataEntity;
-import org.springblade.etl.mapper.EtlWiuWiustMapper;
-import org.springblade.etl.mapper.EtlWiustMapper;
-import org.springblade.etl.service.IEtlWiuWiustDataService;
-import org.springblade.etl.service.IEtlWiustDataService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Service
-@DS("sqlserver_1")
-public class EtlWiuWiustDatadServiceImpl extends BaseServiceImpl<EtlWiuWiustMapper, EtlWiuWiustDataEntity> implements IEtlWiuWiustDataService {
-
-    @Override
-    public List<EtlWiuWiustDataEntity> selectList(EtlWiuWiustDataEntity entity) {
-        return baseMapper.selectList(entity);
-    }
-}

src/main/java/org/springblade/etl/service/impl/EtlWiustDatadServiceImpl.java

@@ -1,38 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service.impl;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.entity.EtlWiuDataEntity;
-import org.springblade.etl.entity.EtlWiustDataEntity;
-import org.springblade.etl.mapper.EtlWiuMapper;
-import org.springblade.etl.mapper.EtlWiustMapper;
-import org.springblade.etl.service.IEtlWiuDataService;
-import org.springblade.etl.service.IEtlWiustDataService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Service
-@DS("sqlserver_1")
-public class EtlWiustDatadServiceImpl extends BaseServiceImpl<EtlWiustMapper, EtlWiustDataEntity> implements IEtlWiustDataService {
-
-    @Override
-    public List<EtlWiustDataEntity> selectList(EtlWiustDataEntity entity) {
-        return baseMapper.selectList(entity);
-    }
-}

src/main/java/org/springblade/etl/service/impl/EtlWiustMpDatadServiceImpl.java

@@ -1,38 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/8
- */
-package org.springblade.etl.service.impl;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.entity.EtlWiustDataEntity;
-import org.springblade.etl.entity.EtlWiustMpDataEntity;
-import org.springblade.etl.mapper.EtlWiustMapper;
-import org.springblade.etl.mapper.EtlWiustMpMapper;
-import org.springblade.etl.service.IEtlWiustDataService;
-import org.springblade.etl.service.IEtlWiustMpDataService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-
-/***
- * Date:2022/9/8
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Service
-@DS("sqlserver_1")
-public class EtlWiustMpDatadServiceImpl extends BaseServiceImpl<EtlWiustMpMapper, EtlWiustMpDataEntity> implements IEtlWiustMpDataService {
-
-    @Override
-    public List<EtlWiustMpDataEntity> selectList(EtlWiustMpDataEntity entity) {
-        return baseMapper.selectList(entity);
-    }
-}

src/main/java/org/springblade/jobtask/TestDataProcessor.java

@@ -1,379 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称:
- * 创建日期:2023/8/4
- */
-package org.springblade.jobtask;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.extern.slf4j.Slf4j;
-import org.glassfish.jersey.internal.guava.ThreadFactoryBuilder;
-import org.springblade.etl.entity.EtlGroundDataEntity;
-import org.springblade.etl.entity.EtlRainDataEntity;
-import org.springblade.etl.entity.EtlRiverDataEntity;
-import org.springblade.etl.entity.EtlRsvrDataEntity;
-import org.springblade.modules.baseinfo.rtu.dto.RtuInfoDTO;
-import org.springblade.modules.baseinfo.rtu.entity.RtuInfoEntity;
-import org.springblade.modules.baseinfo.rtu.service.IRtuBaseInfoService;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.*;
-
-/***
- * Date:2023/8/4
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Slf4j
-@Component
-@EnableScheduling
-public class TestDataProcessor {
-
-
-	private static ThreadFactory testDataThreadFactory = new ThreadFactoryBuilder().setNameFormat("test-data-task-thread-pool-%d").build();
-	private static ExecutorService testDataThreadPool = new ThreadPoolExecutor(1, 2,
-		0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>(1024), testDataThreadFactory, new ThreadPoolExecutor.AbortPolicy());
-
-	@Value("${spring.task-config.test-task}")
-	private boolean testTaskRun;
-
-	@Resource
-	private KafkaTemplate<String, String> kafkaTemplate;
-
-	@Resource
-	private IRtuBaseInfoService rtuBaseInfoService;
-
-	/**
-	 * 测试线程，5分钟执行一次
-	 */
-//	@Scheduled(cron = "5 0/5 * * * * ")
-	public void testMinTask() {
-		try {
-			if (testTaskRun) {
-//				Calendar calendar = Calendar.getInstance();
-//				int min = calendar.get(Calendar.MINUTE);
-//				if (min > 0) {
-//					TestDataTask warningTask = new TestDataTask(new Date());
-//					FutureTask<Integer> futureTask = new FutureTask<>(warningTask);
-//					testDataThreadPool.execute(futureTask);
-//				}
-			}
-		} catch (Exception e) {
-			log.error("{}", e.getMessage());
-		}
-	}
-
-	/**
-	 * 测试线程，1小时执行一次
-	 */
-//	@Scheduled(cron = "10 0 0/1 * * * ")
-	public void testHourTask() {
-		try {
-			if (testTaskRun) {
-//				TestDataHourTask warningTask = new TestDataHourTask(new Date());
-//				FutureTask<Integer> futureTask = new FutureTask<>(warningTask);
-//				testDataThreadPool.execute(futureTask);
-			}
-		} catch (Exception e) {
-			log.error("{}", e.getMessage());
-		}
-	}
-
-	private class TestDataTask implements Callable<Integer> {
-		private Date dt;
-
-		public TestDataTask(Date dt) {
-			this.dt = dt;
-		}
-
-		@Override
-		public Integer call() throws Exception {
-			try {
-				LambdaQueryWrapper<RtuInfoEntity> dataWrapper = Wrappers.<RtuInfoEntity>query().lambda();
-				dataWrapper.eq(RtuInfoEntity::getIsDeleted, 0);
-				List<RtuInfoEntity> list = rtuBaseInfoService.list(dataWrapper);
-				for (RtuInfoEntity entity : list) {
-					//log.info("test data {}", entity.getRtuCode());
-//					if (entity.getRtuCode().equals("01718525") || entity.getRtuCode().equals("01718530") || entity.getRtuCode().equals("01718550") || entity.getRtuCode().equals("01740030")) {
-//						continue;
-//					}
-//					if (entity.getRtuCode().equals("01740040") || entity.getRtuCode().equals("01740110") || entity.getRtuCode().equals("01740150") || entity.getRtuCode().equals("01740160")) {
-//						continue;
-//					}
-
-					if (entity.getIsRain() != null && entity.getIsRain() == 1) {
-						String topic = "topic-etl-rain-data";
-						EtlRainDataEntity lastRainDataEntity = new EtlRainDataEntity();
-						lastRainDataEntity.setRtuCode(entity.getRtuCode());
-
-						lastRainDataEntity.setDrp(1.5);
-						Calendar calendar = Calendar.getInstance();
-						calendar.setTime(dt);
-						calendar.set(Calendar.SECOND, 0);
-						//	lastRainDataEntity.setTm(calendar.getTime());
-//						if (entity.getRtuCode().equals("01740330")) {
-//							calendar.set(Calendar.SECOND, 1);
-//							lastRainDataEntity.setFromDate(calendar.getTime());
-//							calendar.set(Calendar.SECOND, 0);
-//							calendar.add(Calendar.MINUTE, -15);
-//							lastRainDataEntity.setTm(calendar.getTime());
-//						} else if (entity.getRtuCode().equals("40517675")) {
-//							calendar.set(Calendar.SECOND, 1);
-//							lastRainDataEntity.setFromDate(calendar.getTime());
-//							calendar.set(Calendar.SECOND, 0);
-//							calendar.add(Calendar.MINUTE, -20);
-//							lastRainDataEntity.setTm(calendar.getTime());
-//						} else if (entity.getRtuCode().equals("01751240")) {
-//							calendar.set(Calendar.SECOND, 1);
-//							lastRainDataEntity.setFromDate(calendar.getTime());
-//							calendar.set(Calendar.SECOND, 0);
-//							calendar.add(Calendar.MINUTE, -20);
-//							lastRainDataEntity.setTm(calendar.getTime());
-//						} else {
-						lastRainDataEntity.setTm(calendar.getTime());
-						calendar.set(Calendar.SECOND, 1);
-						lastRainDataEntity.setFromDate(calendar.getTime());
-						//}
-//						lastRainDataEntity.setTm(calendar.getTime());
-//						calendar.set(Calendar.SECOND, 1);
-//						lastRainDataEntity.setFromDate(calendar.getTime());
-
-						lastRainDataEntity.setIntv(0.05);
-						//通过KAFKA发送最新一条数据
-						String jsonText = JSONObject.toJSONString(lastRainDataEntity);
-						kafkaTemplate.send(topic, jsonText);
-					}
-					if (entity.getIsRes() != null && entity.getIsRes() == 1) {
-						String topic = "topic-etl-rsvr-data";
-						EtlRsvrDataEntity rsvrDataEntity = new EtlRsvrDataEntity();
-						rsvrDataEntity.setRtuCode(entity.getRtuCode());
-
-						rsvrDataEntity.setRz(15.0);
-						Calendar calendar = Calendar.getInstance();
-						calendar.setTime(dt);
-						calendar.set(Calendar.SECOND, 0);
-
-
-						rsvrDataEntity.setTm(calendar.getTime());
-						calendar.set(Calendar.SECOND, 1);
-						rsvrDataEntity.setFromDate(calendar.getTime());
-
-
-						//通过KAFKA发送最新一条数据
-						String jsonText = JSONObject.toJSONString(rsvrDataEntity);
-						kafkaTemplate.send(topic, jsonText);
-					}
-					if (entity.getIsRiver() != null && entity.getIsRiver() == 1) {
-						String topic = "topic-etl-river-data";
-						EtlRiverDataEntity riverDataEntity = new EtlRiverDataEntity();
-						riverDataEntity.setRtuCode(entity.getRtuCode());
-
-						riverDataEntity.setZ(1.5);
-						Calendar calendar = Calendar.getInstance();
-						calendar.setTime(dt);
-						calendar.set(Calendar.SECOND, 0);
-
-						;
-						riverDataEntity.setTm(calendar.getTime());
-						calendar.set(Calendar.SECOND, 1);
-						riverDataEntity.setFromDate(calendar.getTime());
-
-
-						//通过KAFKA发送最新一条数据
-						String jsonText = JSONObject.toJSONString(riverDataEntity);
-						kafkaTemplate.send(topic, jsonText);
-					}
-				}
-
-			} catch (Exception e) {
-				e.printStackTrace();
-				log.error("测试数据任务异常 {}", e.getMessage());
-			}
-			return 0;
-		}
-	}
-
-
-	private class TestDataHourTask implements Callable<Integer> {
-		private Date dt;
-
-		public TestDataHourTask(Date dt) {
-			this.dt = dt;
-		}
-
-		@Override
-		public Integer call() throws Exception {
-			try {
-				RtuInfoDTO dto = new RtuInfoDTO();
-				List<RtuInfoEntity> list = rtuBaseInfoService.rtuList(dto);
-				for (RtuInfoEntity entity : list) {
-//					if (entity.getRtuCode().equals("01718525") || entity.getRtuCode().equals("01718530") || entity.getRtuCode().equals("01718550") || entity.getRtuCode().equals("01740030")) {
-//						continue;
-//					}
-//					if (entity.getRtuCode().equals("01740040") || entity.getRtuCode().equals("01740110") || entity.getRtuCode().equals("01740150") || entity.getRtuCode().equals("01740160")) {
-//						continue;
-//					}
-//					if (entity.getRtuCode().equals("01717200")) {
-//						log.info("01717200");
-//					}
-					if (entity.getIsRain() != null && entity.getIsRain() == 1) {
-						String topic = "topic-etl-rain-data";
-						EtlRainDataEntity lastRainDataEntity = new EtlRainDataEntity();
-						lastRainDataEntity.setRtuCode(entity.getRtuCode());
-						lastRainDataEntity.setDrp(1.5);
-						Calendar calendar = Calendar.getInstance();
-						calendar.setTime(dt);
-						calendar.set(Calendar.SECOND, 0);
-						calendar.set(Calendar.MINUTE, 0);
-//						if (entity.getRtuCode().equals("40509005")) {
-//							calendar.set(Calendar.SECOND, 1);
-//							lastRainDataEntity.setFromDate(calendar.getTime());
-//
-//
-//							calendar.add(Calendar.HOUR_OF_DAY, -1);
-//							calendar.add(Calendar.MINUTE, -1);
-//							lastRainDataEntity.setTm(calendar.getTime());
-//
-//						} else {
-						lastRainDataEntity.setTm(calendar.getTime());
-						calendar.set(Calendar.SECOND, 1);
-						lastRainDataEntity.setFromDate(calendar.getTime());
-						//}
-						lastRainDataEntity.setIntv(1.0);
-						//通过KAFKA发送最新一条数据
-						String jsonText = JSONObject.toJSONString(lastRainDataEntity);
-						kafkaTemplate.send(topic, jsonText);
-					}
-					if (entity.getIsRes() != null && entity.getIsRes() == 1) {
-						String topic = "topic-etl-rsvr-data";
-						EtlRsvrDataEntity rsvrDataEntity = new EtlRsvrDataEntity();
-						rsvrDataEntity.setRtuCode(entity.getRtuCode());
-						rsvrDataEntity.setRz(15.0);
-						Calendar calendar = Calendar.getInstance();
-						calendar.setTime(dt);
-						calendar.set(Calendar.SECOND, 0);
-						calendar.set(Calendar.MINUTE, 0);
-//						if (entity.getRtuCode().equals("10001001")) {
-//							calendar.set(Calendar.SECOND, 1);
-//							rsvrDataEntity.setFromDate(calendar.getTime());
-//
-//							calendar.add(Calendar.HOUR_OF_DAY, -1);
-//							calendar.add(Calendar.MINUTE, -1);
-//							rsvrDataEntity.setTm(calendar.getTime());
-//
-//						}
-//						 if (entity.getRtuCode().equals("01710140")) {
-//							calendar.set(Calendar.SECOND, 1);
-//							rsvrDataEntity.setFromDate(calendar.getTime());
-//
-//							calendar.add(Calendar.HOUR_OF_DAY, -1);
-//							calendar.add(Calendar.MINUTE, -1);
-//							rsvrDataEntity.setTm(calendar.getTime());
-//
-//
-//						} else {
-						rsvrDataEntity.setTm(calendar.getTime());
-						calendar.set(Calendar.SECOND, 1);
-						rsvrDataEntity.setFromDate(calendar.getTime());
-						//}
-
-						//通过KAFKA发送最新一条数据
-						String jsonText = JSONObject.toJSONString(rsvrDataEntity);
-						kafkaTemplate.send(topic, jsonText);
-					}
-					if (entity.getIsRiver() != null && entity.getIsRiver() == 1) {
-						String topic = "topic-etl-river-data";
-						EtlRiverDataEntity riverDataEntity = new EtlRiverDataEntity();
-						riverDataEntity.setRtuCode(entity.getRtuCode());
-						riverDataEntity.setZ(1.5);
-						Calendar calendar = Calendar.getInstance();
-						calendar.setTime(dt);
-						calendar.set(Calendar.SECOND, 0);
-						calendar.set(Calendar.MINUTE, 0);
-//						if (entity.getRtuCode().equals("11300640")) {
-//							calendar.set(Calendar.SECOND, 1);
-//							riverDataEntity.setFromDate(calendar.getTime());
-//
-//
-//							calendar.add(Calendar.HOUR_OF_DAY, -1);
-//							calendar.add(Calendar.MINUTE, -1);
-//							riverDataEntity.setTm(calendar.getTime());
-//
-//						} else if (entity.getRtuCode().equals("10215700")) {
-//							calendar.set(Calendar.SECOND, 1);
-//							riverDataEntity.setFromDate(calendar.getTime());
-//
-//
-//							calendar.add(Calendar.HOUR_OF_DAY, -1);
-//							calendar.add(Calendar.MINUTE, -1);
-//							riverDataEntity.setTm(calendar.getTime());
-//
-//						} else {
-						riverDataEntity.setTm(calendar.getTime());
-						calendar.set(Calendar.SECOND, 1);
-						riverDataEntity.setFromDate(calendar.getTime());
-						//	}
-
-						//通过KAFKA发送最新一条数据
-						String jsonText = JSONObject.toJSONString(riverDataEntity);
-						kafkaTemplate.send(topic, jsonText);
-					}
-					if (entity.getIsGround() != null && entity.getIsGround() == 1) {
-						String topic = "topic-etl-ground-data";
-						EtlGroundDataEntity groundDataEntity = new EtlGroundDataEntity();
-						groundDataEntity.setRtuCode(entity.getRtuCode());
-						groundDataEntity.setMoco10cm(23.5);
-						groundDataEntity.setMoco20cm(20.5);
-						groundDataEntity.setMoco30cm(12.5);
-						groundDataEntity.setMoco40cm(11.5);
-						groundDataEntity.setMoco50cm(10.5);
-						groundDataEntity.setMoco60cm(3.5);
-						groundDataEntity.setMoco80cm(3.2);
-						groundDataEntity.setMoco100cm(3.0);
-						Calendar calendar = Calendar.getInstance();
-						calendar.setTime(dt);
-						calendar.set(Calendar.SECOND, 0);
-						calendar.set(Calendar.MINUTE, 0);
-//						if (entity.getRtuCode().equals("102A0020")) {
-//							calendar.set(Calendar.SECOND, 1);
-//							groundDataEntity.setFromDate(calendar.getTime());
-//
-//							calendar.add(Calendar.HOUR_OF_DAY, -1);
-//							calendar.add(Calendar.MINUTE, -1);
-//							groundDataEntity.setTm(calendar.getTime());
-//
-//						} else {
-						groundDataEntity.setTm(calendar.getTime());
-						calendar.set(Calendar.SECOND, 1);
-						groundDataEntity.setFromDate(calendar.getTime());
-						//	}
-
-						//通过KAFKA发送最新一条数据
-						String jsonText = JSONObject.toJSONString(groundDataEntity);
-						kafkaTemplate.send(topic, jsonText);
-					}
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-				log.error("测试数据任务异常 {}", e.getMessage());
-			}
-			return 0;
-		}
-	}
-}

src/main/java/org/springblade/modules/baseinfo/region/controller/BaseInfoRegionController.java

@@ -23,8 +23,6 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.etl.entity.EtlAdCdEntity;
-import org.springblade.etl.service.IEtlAdCdService;
 import org.springblade.modules.baseinfo.org.entity.DeptRegionEntity;
 import org.springblade.modules.baseinfo.org.service.IDeptRegionService;
 import org.springblade.modules.baseinfo.region.dto.RegionInfoDTO;
@@ -34,6 +32,8 @@ import org.springblade.modules.baseinfo.region.service.IBaseInfoRegionService;
 import org.springblade.modules.baseinfo.region.service.IOrgRegionInfoService;
 import org.springblade.modules.baseinfo.region.vo.RegionInfoVO;
 import org.springblade.modules.baseinfo.region.wrapper.RegionInfoWrapper;
+import org.springblade.modules.etl.entity.EtlAdCdEntity;
+import org.springblade.modules.etl.service.IEtlAdCdService;
 import org.springblade.modules.system.entity.Dept;
 import org.springblade.modules.system.service.IDeptService;
 import org.springframework.beans.factory.annotation.Value;

src/main/java/org/springblade/modules/baseinfo/stbase/mapper/MvAttStBaseMapper.java

@@ -7,7 +7,6 @@
 package org.springblade.modules.baseinfo.stbase.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.etl.entity.EtlMvAttStBaseEntity;
 import org.springblade.modules.baseinfo.stbase.entity.MvAttStBaseEntity;
 
 

src/main/java/org/springblade/modules/baseinfo/stbase/service/IMvAttStBaseService.java

@@ -7,7 +7,6 @@
 package org.springblade.modules.baseinfo.stbase.service;
 
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.entity.EtlMvAttStBaseEntity;
 import org.springblade.modules.baseinfo.stbase.entity.MvAttStBaseEntity;
 
 

src/main/java/org/springblade/modules/baseinfo/stbase/service/impl/MvAttStBaseServiceImpl.java

@@ -7,9 +7,6 @@
 package org.springblade.modules.baseinfo.stbase.service.impl;
 
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.entity.EtlMvAttStBaseEntity;
-import org.springblade.etl.mapper.EtlMvAttStBaseMapper;
-import org.springblade.etl.service.IEtlMvAttStBaseService;
 import org.springblade.modules.baseinfo.stbase.entity.MvAttStBaseEntity;
 import org.springblade.modules.baseinfo.stbase.mapper.MvAttStBaseMapper;
 import org.springblade.modules.baseinfo.stbase.service.IMvAttStBaseService;

src/main/java/org/springblade/modules/business/count/controller/CountController.java

@@ -199,14 +199,12 @@ public class CountController extends BladeController {
             WaterUseConsumerCountEntity entity = new WaterUseConsumerCountEntity();
             entity.setWiuCd(vo.getWiuCd());
             entity.setWaterFlowSum(vo.getMpaccq().longValue());
-
             LambdaQueryWrapper<WaterUseConsumerInfoEntity> wrapper = Wrappers.<WaterUseConsumerInfoEntity>query().lambda();
             wrapper.eq(WaterUseConsumerInfoEntity::getIsDeleted, 0);
             wrapper.eq(WaterUseConsumerInfoEntity::getWiuCd,vo.getWiuCd());
             wrapper.last("limit 1");
             WaterUseConsumerInfoEntity infoEntity = waterUseConsumerService.getOne(wrapper);
             entity.setWiuNm(infoEntity.getWiuNm());
-
             list.add(entity);
         }
         return R.data(list);

src/main/java/org/springblade/modules/business/data/service/IRtuDataGroundService.java

@@ -9,10 +9,10 @@ package org.springblade.modules.business.data.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.entity.EtlGroundDataEntity;
 import org.springblade.modules.business.data.dto.RtuDataGroundDTO;
 import org.springblade.modules.business.data.entity.RtuDataGroundEntity;
 import org.springblade.modules.business.data.vo.RtuDataGroundVO;
+import org.springblade.modules.etl.entity.EtlGroundDataEntity;
 
 /***
  * Date:2022/8/28

src/main/java/org/springblade/modules/business/data/service/IRtuDataGroundStoreService.java

@@ -7,11 +7,10 @@
 package org.springblade.modules.business.data.service;
 
 
-import org.apache.ibatis.annotations.Param;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.entity.EtlGroundDataEntity;
 import org.springblade.modules.business.data.dto.RtuDataGroundDTO;
 import org.springblade.modules.business.data.entity.RtuDataGroundStoreEntity;
+import org.springblade.modules.etl.entity.EtlGroundDataEntity;
 
 import java.util.List;
 

src/main/java/org/springblade/modules/business/data/service/IRtuDataRainService.java

@@ -9,10 +9,10 @@ package org.springblade.modules.business.data.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.entity.EtlRainDataEntity;
 import org.springblade.modules.business.data.dto.RtuDataRainDTO;
 import org.springblade.modules.business.data.entity.RtuDataRainEntity;
 import org.springblade.modules.business.data.vo.RtuDataRainVO;
+import org.springblade.modules.etl.entity.EtlRainDataEntity;
 
 /***
  * Date:2022/8/28

src/main/java/org/springblade/modules/business/data/service/IRtuDataRainStoreService.java

@@ -7,14 +7,10 @@
 package org.springblade.modules.business.data.service;
 
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.ibatis.annotations.Param;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.entity.EtlRainDataEntity;
-import org.springblade.modules.baseinfo.rtu.dto.RtuInfoDTO;
-import org.springblade.modules.baseinfo.rtu.vo.RtuInfoVO;
 import org.springblade.modules.business.data.dto.RtuDataRainDTO;
 import org.springblade.modules.business.data.entity.RtuDataRainStoreEntity;
+import org.springblade.modules.etl.entity.EtlRainDataEntity;
 
 import java.util.List;
 

src/main/java/org/springblade/modules/business/data/service/IRtuDataRiverService.java

@@ -9,10 +9,10 @@ package org.springblade.modules.business.data.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.entity.EtlRiverDataEntity;
 import org.springblade.modules.business.data.dto.RtuDataRiverDTO;
 import org.springblade.modules.business.data.entity.RtuDataRiverEntity;
 import org.springblade.modules.business.data.vo.RtuDataRiverVO;
+import org.springblade.modules.etl.entity.EtlRiverDataEntity;
 
 /***
  * Date:2022/8/28

src/main/java/org/springblade/modules/business/data/service/IRtuDataRiverStoreService.java

@@ -6,13 +6,10 @@
  */
 package org.springblade.modules.business.data.service;
 
-import org.apache.ibatis.annotations.Param;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.entity.EtlRiverDataEntity;
-import org.springblade.modules.business.data.dto.RtuDataRainDTO;
 import org.springblade.modules.business.data.dto.RtuDataRiverDTO;
-import org.springblade.modules.business.data.entity.RtuDataRainStoreEntity;
 import org.springblade.modules.business.data.entity.RtuDataRiverStoreEntity;
+import org.springblade.modules.etl.entity.EtlRiverDataEntity;
 
 import java.util.List;
 

src/main/java/org/springblade/modules/business/data/service/IRtuDataRsvrService.java

@@ -9,10 +9,10 @@ package org.springblade.modules.business.data.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.entity.EtlRsvrDataEntity;
 import org.springblade.modules.business.data.dto.RtuDataRsvrDTO;
 import org.springblade.modules.business.data.entity.RtuDataRsvrEntity;
 import org.springblade.modules.business.data.vo.RtuDataRsvrVO;
+import org.springblade.modules.etl.entity.EtlRsvrDataEntity;
 
 /***
  * Date:2022/8/28

src/main/java/org/springblade/modules/business/data/service/IRtuDataRsvrStoreService.java

@@ -6,13 +6,10 @@
  */
 package org.springblade.modules.business.data.service;
 
-import org.apache.ibatis.annotations.Param;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.entity.EtlRsvrDataEntity;
-import org.springblade.modules.business.data.dto.RtuDataRiverDTO;
 import org.springblade.modules.business.data.dto.RtuDataRsvrDTO;
-import org.springblade.modules.business.data.entity.RtuDataRiverStoreEntity;
 import org.springblade.modules.business.data.entity.RtuDataRsvrStoreEntity;
+import org.springblade.modules.etl.entity.EtlRsvrDataEntity;
 
 import java.util.List;
 

src/main/java/org/springblade/modules/business/data/service/IRtuDataWaterLevelService.java

@@ -8,11 +8,11 @@ package org.springblade.modules.business.data.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.entity.EtlRiverDataEntity;
-import org.springblade.etl.entity.EtlRsvrDataEntity;
 import org.springblade.modules.business.data.dto.RtuDataWaterLevelDTO;
 import org.springblade.modules.business.data.entity.RtuDataWaterLevelEntity;
 import org.springblade.modules.business.data.vo.RtuDataWaterLevelVO;
+import org.springblade.modules.etl.entity.EtlRiverDataEntity;
+import org.springblade.modules.etl.entity.EtlRsvrDataEntity;
 
 /***
  * Date:2023/8/22

src/main/java/org/springblade/modules/business/data/service/IRtuDataWaterLevelStoreService.java

@@ -7,10 +7,10 @@
 package org.springblade.modules.business.data.service;
 
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.entity.EtlRiverDataEntity;
-import org.springblade.etl.entity.EtlRsvrDataEntity;
 import org.springblade.modules.business.data.dto.RtuDataWaterLevelDTO;
 import org.springblade.modules.business.data.entity.RtuDataWaterLevelStoreEntity;
+import org.springblade.modules.etl.entity.EtlRiverDataEntity;
+import org.springblade.modules.etl.entity.EtlRsvrDataEntity;
 
 import java.util.List;
 

src/main/java/org/springblade/modules/business/data/service/impl/RtuDataGroundServiceImpl.java

@@ -10,12 +10,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.entity.EtlGroundDataEntity;
 import org.springblade.modules.business.data.dto.RtuDataGroundDTO;
 import org.springblade.modules.business.data.entity.RtuDataGroundEntity;
 import org.springblade.modules.business.data.mapper.RtuDataGroundMapper;
 import org.springblade.modules.business.data.service.IRtuDataGroundService;
 import org.springblade.modules.business.data.vo.RtuDataGroundVO;
+import org.springblade.modules.etl.entity.EtlGroundDataEntity;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;

src/main/java/org/springblade/modules/business/data/service/impl/RtuDataGroundStoreServiceImpl.java

@@ -7,11 +7,11 @@
 package org.springblade.modules.business.data.service.impl;
 
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.entity.EtlGroundDataEntity;
 import org.springblade.modules.business.data.dto.RtuDataGroundDTO;
 import org.springblade.modules.business.data.entity.RtuDataGroundStoreEntity;
 import org.springblade.modules.business.data.mapper.RtuDataGroundStoreMapper;
 import org.springblade.modules.business.data.service.IRtuDataGroundStoreService;
+import org.springblade.modules.etl.entity.EtlGroundDataEntity;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;

src/main/java/org/springblade/modules/business/data/service/impl/RtuDataRainServiceImpl.java

@@ -10,12 +10,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.entity.EtlRainDataEntity;
 import org.springblade.modules.business.data.dto.RtuDataRainDTO;
 import org.springblade.modules.business.data.entity.RtuDataRainEntity;
 import org.springblade.modules.business.data.mapper.RtuDataRainMapper;
 import org.springblade.modules.business.data.service.IRtuDataRainService;
 import org.springblade.modules.business.data.vo.RtuDataRainVO;
+import org.springblade.modules.etl.entity.EtlRainDataEntity;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;

src/main/java/org/springblade/modules/business/data/service/impl/RtuDataRainStoreServiceImpl.java

@@ -8,11 +8,11 @@ package org.springblade.modules.business.data.service.impl;
 
 
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.entity.EtlRainDataEntity;
 import org.springblade.modules.business.data.dto.RtuDataRainDTO;
 import org.springblade.modules.business.data.entity.RtuDataRainStoreEntity;
 import org.springblade.modules.business.data.mapper.RtuDataRainStoreMapper;
 import org.springblade.modules.business.data.service.IRtuDataRainStoreService;
+import org.springblade.modules.etl.entity.EtlRainDataEntity;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;

src/main/java/org/springblade/modules/business/data/service/impl/RtuDataRiverServiceImpl.java

@@ -11,12 +11,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.entity.EtlRiverDataEntity;
 import org.springblade.modules.business.data.dto.RtuDataRiverDTO;
 import org.springblade.modules.business.data.entity.RtuDataRiverEntity;
 import org.springblade.modules.business.data.mapper.RtuDataRiverMapper;
 import org.springblade.modules.business.data.service.IRtuDataRiverService;
 import org.springblade.modules.business.data.vo.RtuDataRiverVO;
+import org.springblade.modules.etl.entity.EtlRiverDataEntity;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;

src/main/java/org/springblade/modules/business/data/service/impl/RtuDataRiverStoreServiceImpl.java

@@ -7,11 +7,11 @@
 package org.springblade.modules.business.data.service.impl;
 
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.entity.EtlRiverDataEntity;
 import org.springblade.modules.business.data.dto.RtuDataRiverDTO;
 import org.springblade.modules.business.data.entity.RtuDataRiverStoreEntity;
 import org.springblade.modules.business.data.mapper.RtuDataRiverStoreMapper;
 import org.springblade.modules.business.data.service.IRtuDataRiverStoreService;
+import org.springblade.modules.etl.entity.EtlRiverDataEntity;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;

src/main/java/org/springblade/modules/business/data/service/impl/RtuDataRsvrServiceImpl.java

@@ -11,12 +11,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.entity.EtlRsvrDataEntity;
 import org.springblade.modules.business.data.dto.RtuDataRsvrDTO;
 import org.springblade.modules.business.data.entity.RtuDataRsvrEntity;
 import org.springblade.modules.business.data.mapper.RtuDataRsvrMapper;
 import org.springblade.modules.business.data.service.IRtuDataRsvrService;
 import org.springblade.modules.business.data.vo.RtuDataRsvrVO;
+import org.springblade.modules.etl.entity.EtlRsvrDataEntity;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;

src/main/java/org/springblade/modules/business/data/service/impl/RtuDataRsvrStoreServiceImpl.java

@@ -7,11 +7,11 @@
 package org.springblade.modules.business.data.service.impl;
 
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.entity.EtlRsvrDataEntity;
 import org.springblade.modules.business.data.dto.RtuDataRsvrDTO;
 import org.springblade.modules.business.data.entity.RtuDataRsvrStoreEntity;
 import org.springblade.modules.business.data.mapper.RtuDataRsvrStoreMapper;
 import org.springblade.modules.business.data.service.IRtuDataRsvrStoreService;
+import org.springblade.modules.etl.entity.EtlRsvrDataEntity;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;