提交版本1.3

src/main/java/org/springblade/constant/BusinessConstant.java

@@ -32,6 +32,8 @@ public class BusinessConstant {
 
 	public static final Long ORG_ADMIN_ID=1123598813738675201L;
 
+	public static final Long SYS_ADMIN_ID =1499007300681326593L;
+
 	public static final String DEPT_NM_ADCODE="150000000000000";
 
 

src/main/java/org/springblade/constant/DictBusinessConstant.java

@@ -16,6 +16,6 @@ package org.springblade.constant;
  * Remark：认为有必要的其他信息
  */
 public class DictBusinessConstant {
-
-
+	public static final  String ORDER_STATUS_CODE ="rtu_check_order_status";
+	public static final  String ORDER_FROM_CODE ="rtu_check_order_from";
 }

src/main/java/org/springblade/enums/OrderCloseEnum.java

@@ -2,9 +2,9 @@ package org.springblade.enums;
 
 public enum OrderCloseEnum {
 	/**
-	 * 正常
+	 * 进行中
 	 */
-	ACTIVE_OPEN(0, "正常"),
+	ACTIVE_OPEN(0, "进行中"),
 
 	/**
 	 * 关闭

src/main/java/org/springblade/enums/OrderStatusEnum.java

@@ -4,28 +4,28 @@ public enum OrderStatusEnum {
 	/**
 	 * 工单创建
 	 */
-	STATUS_CREATE(1, "工单创建"),
+	STATUS_CREATE("1", "工单创建"),
 
 	/**
 	 * 工单接单
 	 */
-	STATUS_CONFIRM(2, "工单接单"),
+	STATUS_CONFIRM("2", "工单接单"),
 
 	/**
 	 * 工单处理
 	 */
-	STATUS_PROCESS(3, "工单处理"),
+	STATUS_PROCESS("3", "工单处理"),
 
 	/**
 	 * 工单关闭
 	 */
-	STATUS_CLOSE(4, "工单关闭");
+	STATUS_CLOSE("4", "工单关闭");
 
-	private int code;
+	private String code;
 
 	private String name;
 
-	private OrderStatusEnum(int code, String name) {
+	private OrderStatusEnum(String code, String name) {
 		this.code = code;
 		this.name = name;
 	}
@@ -34,13 +34,14 @@ public enum OrderStatusEnum {
 	 * Function:根据code来获取对应的name
 	 * Author: Admin
 	 * Date:2021/6/26
+	 *
 	 * @param code
 	 * @return java.lang.String
 	 * @throws Exception
 	 */
-	public static String getName(int code) {
+	public static String getName(String code) {
 		for (OrderStatusEnum type : OrderStatusEnum.values()) {
-			if (type.code == code) {
+			if (type.code.equals(code)) {
 				return type.name;
 			}
 		}
@@ -51,13 +52,14 @@ public enum OrderStatusEnum {
 	 * Function:根据code来获取对应的枚举常量
 	 * Author: Admin
 	 * Date:2021/6/26
+	 *
 	 * @param code
 	 * @return com.zhgzjg.web.enums.DeleteFlag
 	 * @throws Exception
 	 */
-	public static OrderStatusEnum getEnumByCode(int code) {
+	public static OrderStatusEnum getEnumByCode(String code) {
 		for (OrderStatusEnum type : OrderStatusEnum.values()) {
-			if (type.code == code) {
+			if (type.code.equals(code)) {
 				return type;
 			}
 		}
@@ -69,6 +71,7 @@ public enum OrderStatusEnum {
 	 * Function:根据name来获取对应的枚举常量
 	 * Author: Admin
 	 * Date:2021/6/26
+	 *
 	 * @param name
 	 * @return com.zhgzjg.web.enums.DeleteFlag
 	 * @throws Exception
@@ -83,11 +86,11 @@ public enum OrderStatusEnum {
 	}
 
 
-	public int getCode() {
+	public String getCode() {
 		return code;
 	}
 
-	public void setCode(int code) {
+	public void setCode(String code) {
 		this.code = code;
 	}
 

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

@@ -10,75 +10,71 @@ 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.entity.EtlGroundDataEntity;
 import org.springblade.etl.entity.EtlRainDataEntity;
+import org.springblade.etl.entity.EtlRiverDataEntity;
+import org.springblade.etl.service.IEtlGroundDataService;
 import org.springblade.etl.service.IEtlRainDataService;
-import org.springblade.modules.business.rtu.data.entity.RtuDataRainEntity;
-import org.springblade.modules.business.rtu.data.service.IRtuDataRainService;
+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.service.IRtuDataGroundService;
+import org.springblade.modules.business.data.service.IRtuDataRainService;
+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.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.Callable;
 
 /***
  * Date:2022/5/22
- * Title: 环境辐射与气象监测系统(KRS) 模块
- * Description：MODBUS TCP 协议传输 ,读取任务
+ * Title: 墒情同步
+ * Description：
  * @author swp
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-@Slf4j
-public class EtlGroundDataTask implements Callable<Integer> {
 
-	private RedisTemplate redisTemplate;
-	private IEtlRainDataService etlRainDataService;
-	private IRtuDataRainService rtuDataRainService;
+public class EtlGroundDataTask {
 
-
-	EtlGroundDataTask(RedisTemplate redisTemplate, IEtlRainDataService rainDataService, IRtuDataRainService rtuDataRainService) {
-		this.redisTemplate = redisTemplate;
-		this.etlRainDataService = rainDataService;
-		this.rtuDataRainService = rtuDataRainService;
-	}
-
-	@Override
-	public Integer call() {
-		try {
-			HashOperations<String, String, String> opsHash = redisTemplate.opsForHash();
-			Date date = new Date();
-			if (opsHash.hasKey("etl", "rain_update_time")) {
-				String dt = opsHash.get("etl", "rain_update_time");
-				date = Func.parse(dt, ConcurrentDateFormat.of("yyyy-MM-dd"));
-			} else {
-				String dt = Func.formatDateTime(date);
-				date = Func.parse(dt, ConcurrentDateFormat.of("yyyy-MM-dd"));
+	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);
 			}
-			EtlRainDataEntity dto = new EtlRainDataEntity();
-			dto.setTm(date);
-			List<EtlRainDataEntity> list = etlRainDataService.selectLastList(dto);
-			if (list != null && list.size() > 0) {
-				for (int i = 0; i < list.size(); i++) {
-					EtlRainDataEntity entity = list.get(i);
-					LambdaQueryWrapper<RtuDataRainEntity> dataWrapper = Wrappers.<RtuDataRainEntity>query().lambda();
-					dataWrapper.eq(RtuDataRainEntity::getRtuCode, entity.getRtuCode());
-					RtuDataRainEntity rainEntity = rtuDataRainService.getOne(dataWrapper);
-					if (null == rainEntity) {
-						rainEntity = new RtuDataRainEntity();
-					}
-					rainEntity.setDrp(entity.getDrp());
-					rainEntity.setIntv(entity.getIntv());
-					rainEntity.setRtuCode(entity.getRtuCode());
-					rainEntity.setTm(entity.getTm());
-					rtuDataRainService.saveOrUpdate(rainEntity);
-				}
-			}
-		} catch (Exception e) {
-			log.error("实时数据统计任务异常 {}", e.getMessage());
+			groundDataEntity.setSlm10(entity.getSlm10());
+			groundDataEntity.setSlm20(entity.getSlm20());
+			groundDataEntity.setSlm30(entity.getSlm30());
+			groundDataEntity.setSlm40(entity.getSlm40());
+			groundDataEntity.setSlm60(entity.getSlm60());
+			groundDataEntity.setSlm80(entity.getSlm80());
+			groundDataEntity.setSlm100(entity.getSlm100());
+			groundDataEntity.setSrlslm(entity.getSrlslm());
+			groundDataEntity.setVtavslm(entity.getVtavslm());
+			groundDataEntity.setTm(entity.getTm());
+			rtuDataGroundService.saveOrUpdate(groundDataEntity);
+
+			return groundDataEntity;
 		}
-		return 0;
+		return null;
 	}
 }

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

@@ -10,18 +10,10 @@ 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.EtlMvAttStBaseEntity;
-import org.springblade.etl.entity.EtlRainDataEntity;
 import org.springblade.etl.service.IEtlMvAttStBaseService;
-import org.springblade.etl.service.IEtlRainDataService;
 import org.springblade.modules.baseinfo.stbase.entity.MvAttStBaseEntity;
 import org.springblade.modules.baseinfo.stbase.service.IMvAttStBaseService;
-import org.springblade.modules.business.rtu.data.entity.RtuDataRainEntity;
-import org.springblade.modules.business.rtu.data.service.IRtuDataRainService;
-import org.springframework.data.redis.core.HashOperations;
-import org.springframework.data.redis.core.RedisTemplate;
 
 import java.util.Date;
 import java.util.List;
@@ -49,7 +41,7 @@ public class EtlMvAttStBaseDataTask implements Callable<Integer> {
 	@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++) {
@@ -60,6 +52,7 @@ public class EtlMvAttStBaseDataTask implements Callable<Integer> {
 					if (null == baseEntity) {
 						baseEntity = new MvAttStBaseEntity();
 						baseEntity.setCreateTime(new Date());
+						baseEntity.setUpdateTime(new Date());
 						baseEntity.setStatus(1);
 						baseEntity.setIsDeleted(0);
 					}
@@ -67,8 +60,15 @@ public class EtlMvAttStBaseDataTask implements Callable<Integer> {
 					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);
 				}
 			}

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

@@ -6,79 +6,50 @@
  */
 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.dto.EtlRainDataDTO;
 import org.springblade.etl.entity.EtlRainDataEntity;
 import org.springblade.etl.service.IEtlRainDataService;
-import org.springblade.modules.business.rtu.data.entity.RtuDataRainEntity;
-import org.springblade.modules.business.rtu.data.service.IRtuDataRainService;
-import org.springframework.data.redis.core.HashOperations;
-import org.springframework.data.redis.core.RedisTemplate;
+import org.springblade.modules.business.data.entity.RtuDataRainEntity;
+import org.springblade.modules.business.data.service.IRtuDataRainService;
 
 import java.util.Date;
 import java.util.List;
-import java.util.concurrent.Callable;
+
 
 /***
  * Date:2022/5/22
- * Title: 环境辐射与气象监测系统(KRS) 模块
- * Description：MODBUS TCP 协议传输 ,读取任务
+ * Title: 降水抽取
+ * Description：每小时同步一次
  * @author swp
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-@Slf4j
-public class EtlRainDataTask implements Callable<Integer> {
-
-	private RedisTemplate redisTemplate;
-	private IEtlRainDataService etlRainDataService;
-	private IRtuDataRainService rtuDataRainService;
-
-
-	EtlRainDataTask(RedisTemplate redisTemplate, IEtlRainDataService rainDataService, IRtuDataRainService rtuDataRainService) {
-		this.redisTemplate = redisTemplate;
-		this.etlRainDataService = rainDataService;
-		this.rtuDataRainService = rtuDataRainService;
-	}
-
-	@Override
-	public Integer call() {
-		try {
-			HashOperations<String, String, String> opsHash = redisTemplate.opsForHash();
-			Date date = new Date();
-			if (opsHash.hasKey("etl", "rain_update_time")) {
-				String dt = opsHash.get("etl", "rain_update_time");
-				date = Func.parse(dt, ConcurrentDateFormat.of("yyyy-MM-dd"));
-			} else {
-				String dt = Func.formatDateTime(date);
-				date = Func.parse(dt, ConcurrentDateFormat.of("yyyy-MM-dd"));
-			}
-			EtlRainDataEntity dto = new EtlRainDataEntity();
-			dto.setTm(date);
-			List<EtlRainDataEntity> list = etlRainDataService.selectLastList(dto);
-			if (list != null && list.size() > 0) {
-				for (int i = 0; i < list.size(); i++) {
-					EtlRainDataEntity entity = list.get(i);
-					LambdaQueryWrapper<RtuDataRainEntity> dataWrapper = Wrappers.<RtuDataRainEntity>query().lambda();
-					dataWrapper.eq(RtuDataRainEntity::getRtuCode, entity.getRtuCode());
-					RtuDataRainEntity rainEntity = rtuDataRainService.getOne(dataWrapper);
-					if (null == rainEntity) {
-						rainEntity = new RtuDataRainEntity();
-					}
-					rainEntity.setDrp(entity.getDrp());
-					rainEntity.setIntv(entity.getIntv());
-					rainEntity.setRtuCode(entity.getRtuCode());
-					rainEntity.setTm(entity.getTm());
-					rtuDataRainService.saveOrUpdate(rainEntity);
-				}
+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);
 			}
-		} catch (Exception e) {
-			log.error("实时数据统计任务异常 {}", e.getMessage());
+			rainEntity.setUpdateTime(new Date());
+			rainEntity.setDrp(entity.getDrp());
+			rainEntity.setIntv(entity.getIntv());
+			rainEntity.setTm(entity.getTm());
+			rtuDataRainService.saveOrUpdate(rainEntity);
+			return rainEntity;
 		}
-		return 0;
+		return null;
 	}
 }

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

@@ -0,0 +1,65 @@
+/**
+ * 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.dto.EtlGroundDataDTO;
+import org.springblade.etl.entity.EtlAdCdEntity;
+import org.springblade.etl.entity.EtlGroundDataEntity;
+import org.springblade.etl.service.IEtlAdCdService;
+import org.springblade.modules.baseinfo.region.entity.RegionInfoEntity;
+import org.springblade.modules.baseinfo.region.service.IBaseInfoRegionService;
+import org.springblade.modules.business.data.entity.RtuDataGroundEntity;
+import org.springblade.modules.system.service.IRegionService;
+import org.springframework.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+
+import java.util.Calendar;
+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 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

@@ -10,75 +10,55 @@ 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.entity.EtlRainDataEntity;
-import org.springblade.etl.service.IEtlRainDataService;
-import org.springblade.modules.business.rtu.data.entity.RtuDataRainEntity;
-import org.springblade.modules.business.rtu.data.service.IRtuDataRainService;
+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 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.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.Callable;
 
 /***
  * Date:2022/5/22
- * Title: 环境辐射与气象监测系统(KRS) 模块
- * Description：MODBUS TCP 协议传输 ,读取任务
+ * Title: 河道水位抽取
+ * Description：
  * @author swp
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-@Slf4j
-public class EtlRiverDataTask implements Callable<Integer> {
+public class EtlRiverDataTask {
 
-	private RedisTemplate redisTemplate;
-	private IEtlRainDataService etlRainDataService;
-	private IRtuDataRainService rtuDataRainService;
-
-
-	EtlRiverDataTask(RedisTemplate redisTemplate, IEtlRainDataService rainDataService, IRtuDataRainService rtuDataRainService) {
-		this.redisTemplate = redisTemplate;
-		this.etlRainDataService = rainDataService;
-		this.rtuDataRainService = rtuDataRainService;
-	}
-
-	@Override
-	public Integer call() {
-		try {
-			HashOperations<String, String, String> opsHash = redisTemplate.opsForHash();
-			Date date = new Date();
-			if (opsHash.hasKey("etl", "rain_update_time")) {
-				String dt = opsHash.get("etl", "rain_update_time");
-				date = Func.parse(dt, ConcurrentDateFormat.of("yyyy-MM-dd"));
-			} else {
-				String dt = Func.formatDateTime(date);
-				date = Func.parse(dt, ConcurrentDateFormat.of("yyyy-MM-dd"));
-			}
-			EtlRainDataEntity dto = new EtlRainDataEntity();
-			dto.setTm(date);
-			List<EtlRainDataEntity> list = etlRainDataService.selectLastList(dto);
-			if (list != null && list.size() > 0) {
-				for (int i = 0; i < list.size(); i++) {
-					EtlRainDataEntity entity = list.get(i);
-					LambdaQueryWrapper<RtuDataRainEntity> dataWrapper = Wrappers.<RtuDataRainEntity>query().lambda();
-					dataWrapper.eq(RtuDataRainEntity::getRtuCode, entity.getRtuCode());
-					RtuDataRainEntity rainEntity = rtuDataRainService.getOne(dataWrapper);
-					if (null == rainEntity) {
-						rainEntity = new RtuDataRainEntity();
-					}
-					rainEntity.setDrp(entity.getDrp());
-					rainEntity.setIntv(entity.getIntv());
-					rainEntity.setRtuCode(entity.getRtuCode());
-					rainEntity.setTm(entity.getTm());
-					rtuDataRainService.saveOrUpdate(rainEntity);
-				}
+	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);
 			}
-		} catch (Exception e) {
-			log.error("实时数据统计任务异常 {}", e.getMessage());
+			riverEntity.setUpdateTime(new Date());
+			riverEntity.setZ(entity.getZ());
+			riverEntity.setTm(entity.getTm());
+			rtuDataRiverService.saveOrUpdate(riverEntity);
+			return riverEntity;
 		}
-		return 0;
+		return null;
 	}
 }

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

@@ -9,76 +9,47 @@ 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.EtlRainDataEntity;
-import org.springblade.etl.service.IEtlRainDataService;
-import org.springblade.modules.business.rtu.data.entity.RtuDataRainEntity;
-import org.springblade.modules.business.rtu.data.service.IRtuDataRainService;
-import org.springframework.data.redis.core.HashOperations;
-import org.springframework.data.redis.core.RedisTemplate;
+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;
-import java.util.concurrent.Callable;
 
 /***
  * Date:2022/5/22
- * Title: 环境辐射与气象监测系统(KRS) 模块
- * Description：MODBUS TCP 协议传输 ,读取任务
+ * Title: 水库水位
+ * Description：
  * @author swp
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-@Slf4j
-public class EtlRsvrDataTask implements Callable<Integer> {
-
-	private RedisTemplate redisTemplate;
-	private IEtlRainDataService etlRainDataService;
-	private IRtuDataRainService rtuDataRainService;
-
-
-	EtlRsvrDataTask(RedisTemplate redisTemplate, IEtlRainDataService rainDataService, IRtuDataRainService rtuDataRainService) {
-		this.redisTemplate = redisTemplate;
-		this.etlRainDataService = rainDataService;
-		this.rtuDataRainService = rtuDataRainService;
-	}
-
-	@Override
-	public Integer call() {
-		try {
-			HashOperations<String, String, String> opsHash = redisTemplate.opsForHash();
-			Date date = new Date();
-			if (opsHash.hasKey("etl", "rain_update_time")) {
-				String dt = opsHash.get("etl", "rain_update_time");
-				date = Func.parse(dt, ConcurrentDateFormat.of("yyyy-MM-dd"));
-			} else {
-				String dt = Func.formatDateTime(date);
-				date = Func.parse(dt, ConcurrentDateFormat.of("yyyy-MM-dd"));
-			}
-			EtlRainDataEntity dto = new EtlRainDataEntity();
-			dto.setTm(date);
-			List<EtlRainDataEntity> list = etlRainDataService.selectLastList(dto);
-			if (list != null && list.size() > 0) {
-				for (int i = 0; i < list.size(); i++) {
-					EtlRainDataEntity entity = list.get(i);
-					LambdaQueryWrapper<RtuDataRainEntity> dataWrapper = Wrappers.<RtuDataRainEntity>query().lambda();
-					dataWrapper.eq(RtuDataRainEntity::getRtuCode, entity.getRtuCode());
-					RtuDataRainEntity rainEntity = rtuDataRainService.getOne(dataWrapper);
-					if (null == rainEntity) {
-						rainEntity = new RtuDataRainEntity();
-					}
-					rainEntity.setDrp(entity.getDrp());
-					rainEntity.setIntv(entity.getIntv());
-					rainEntity.setRtuCode(entity.getRtuCode());
-					rainEntity.setTm(entity.getTm());
-					rtuDataRainService.saveOrUpdate(rainEntity);
-				}
+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);
 			}
-		} catch (Exception e) {
-			log.error("实时数据统计任务异常 {}", e.getMessage());
+			rsvrDataEntity.setRz(entity.getRz());
+			rsvrDataEntity.setTm(entity.getTm());
+			rtuDataRsvrService.saveOrUpdate(rsvrDataEntity);
+			return rsvrDataEntity;
 		}
-		return 0;
+		return null;
 	}
 }

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

@@ -9,33 +9,43 @@ package org.springblade.etl;
 
 import lombok.extern.slf4j.Slf4j;
 import org.glassfish.jersey.internal.guava.ThreadFactoryBuilder;
+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.baseinfo.stbase.service.IMvAttStBaseService;
-import org.springblade.modules.business.project.base.service.IProjectBaseInfoService;
-import org.springblade.modules.business.rtu.base.service.IRtuBaseInfoService;
-import org.springblade.modules.business.rtu.data.service.IRtuDataGroundService;
-import org.springblade.modules.business.rtu.data.service.IRtuDataRainService;
-import org.springblade.modules.business.rtu.data.service.IRtuDataRiverService;
-import org.springblade.modules.business.rtu.data.service.IRtuDataRsvrService;
-import org.springblade.modules.business.rtumanage.service.IRtuManageService;
-import org.springblade.modules.business.warning.service.IOriginalWarningService;
-import org.springblade.modules.business.warning.service.IRtuWarningService;
-import org.springblade.modules.system.service.IDictBizService;
+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.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
 import java.util.concurrent.*;
 
 /***
  * Date:2022/5/22
- * Title: 环境辐射与气象监测系统(KRS) 模块
- * Description：MODBUS TCP 协议传输 ,任务管理
+ * Title:  ETL模块
+ * Description： 定时任务管理
  * @author swp
  * @version 1.0
  * Remark：认为有必要的其他信息
@@ -48,97 +58,185 @@ public class EtlTaskManager {
 	/**
 	 * 公共线程池
 	 **/
-	private static ThreadFactory publicThreadFactory = new ThreadFactoryBuilder().setNameFormat("public-thread-pool-%d").build();
+	private static ThreadFactory publicThreadFactory = new ThreadFactoryBuilder().setNameFormat("etl-thread-pool-%d").build();
 	private static ExecutorService publicThreadPool = new ThreadPoolExecutor(1, 1,
 		0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>(1024), publicThreadFactory, new ThreadPoolExecutor.AbortPolicy());
 
-	@Resource
-	private IEtlWarningService etlWarningService;
-
-	@Resource
-	private IRtuWarningService rtuWarningService;
-
-	@Resource
-	private IRtuBaseInfoService rtuBaseInfoService;
-
-	@Resource
-	private IProjectBaseInfoService projectBaseInfoService;
-
-	@Resource
-	private IRtuDataRiverService dataRiverService;
-
-	@Resource
-	private IRtuDataRsvrService dataRsvrService;
-
-	@Resource
-	private IRtuDataRainService dataRainService;
-
-	@Resource
-	private IRtuDataGroundService dataGroundService;
 
 	@Autowired
 	private KafkaTemplate<String, String> kafkaTemplate;
 
-	@Autowired
-	private SimpMessagingTemplate messagingTemplate;
-
 	@Autowired
 	private RedisTemplate redisTemplate;
 
 	@Resource
-	private IDictBizService dictBizService;
+	private IEtlRainDataService etlRainDataService;
 
 	@Resource
-	private IRtuManageService rtuManageService;
+	private IRtuDataRainService rtuDataRainService;
 
 	@Resource
-	private IOriginalWarningService originalWarningService;
+	private IEtlRiverDataService etlRiverDataService;
 
 	@Resource
-	private IEtlRainDataService etlRainDataService;
+	private IRtuDataRiverService rtuDataRiverService;
 
 	@Resource
-	private IEtlRiverDataService etlRiverDataService;
+	private IEtlRsvrDataService etlRsvrDataService;
 
 	@Resource
-	private IEtlRsvrDataService etlRsvrDataService;
+	private IRtuDataRsvrService rtuDataRsvrService;
 
 	@Resource
 	private IEtlGroundDataService etlGroundDataService;
 
+	@Resource
+	private IRtuDataGroundService rtuDataGroundService;
+
 	@Resource
 	private IEtlMvAttStBaseService etlMvAttStBaseService;
 
 	@Resource
 	private IMvAttStBaseService mvAttStBaseService;
 
+	@Resource
+	private IRtuBaseInfoService rtuBaseInfoService;
 
-	@Scheduled(cron = "0 0/1 * * * * ")
-	public void warnTask() {
+	@Scheduled(cron = "0 1 * * * * ")
+	public void attStBaseReadTask() {
 		try {
-//			EtlMvAttStBaseDataTask task = new EtlMvAttStBaseDataTask(etlMvAttStBaseService, mvAttStBaseService);
-//			FutureTask<Integer> futureTask = new FutureTask<>(task);
-//			publicThreadPool.execute(futureTask);
-
-
-//			EtlRainDataTask task = new EtlRainDataTask(redisTemplate, etlRainDataService, dataRainService);
-//			FutureTask<Integer> futureTask = new FutureTask<>(task);
-//			publicThreadPool.execute(futureTask);
-
-
-//			TestWarnTask task2 = new TestWarnTask(redisTemplate,kafkaTemplate,messagingTemplate,etlWarningService,rtuWarningService,rtuBaseInfoService,projectBaseInfoService,dataRainService,dataRiverService,dataRsvrService,dataGroundService,originalWarningService);
-//			FutureTask<Integer> futureTask2 = new FutureTask<>(task2);
-//			publicThreadPool.execute(futureTask2);
-
-
-//			TestDataTask task = new TestDataTask(redisTemplate, kafkaTemplate, messagingTemplate, etlWarningService, rtuWarningService, rtuBaseInfoService, projectBaseInfoService, dataRainService, dataRiverService, dataRsvrService, dataGroundService, dictBizService, rtuManageService,etlRainDataService,etlRiverDataService,etlRsvrDataService,etlGroundDataService);
-//			FutureTask<Integer> futureTask = new FutureTask<>(task);
-//			publicThreadPool.execute(futureTask);
-
+			log.info("ETL-测站-定时同步任务开始执行*********************");
+			EtlMvAttStBaseDataTask mvAttStBaseDataTask = new EtlMvAttStBaseDataTask(etlMvAttStBaseService, mvAttStBaseService);
+			FutureTask<Integer> futureTask = new FutureTask<>(mvAttStBaseDataTask);
+			publicThreadPool.execute(futureTask);
+		} catch (Exception e) {
+			log.error("{}", e.getMessage());
+		}
+	}
 
+	@Scheduled(cron = "0 5 * * * * ")
+	public void rtuDataReadTask() {
+		try {
+			log.info("ETL-数据-定时同步任务开始执行*********************");
+			EtlRtuDataTask etlRtuDataTask = new EtlRtuDataTask();
+			FutureTask<Integer> futureTask = new FutureTask<>(etlRtuDataTask);
+			publicThreadPool.execute(futureTask);
 		} catch (Exception e) {
 			log.error("{}", e.getMessage());
 		}
 	}
 
+	private class EtlRtuDataTask implements Callable<Integer> {
+
+		@Override
+		public Integer call() {
+			try {
+				log.info("测站定时报数据抽取开始**************");
+				HashOperations<String, String, String> opsHash = redisTemplate.opsForHash();
+				List<RtuInfoEntity> rtuInfoEntityList = rtuBaseInfoService.list();
+				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);
+						//最后上报时间
+						if (rtuUpTm != null) {
+							if (rtuDataRainEntity.getTm().after(rtuUpTm)) {
+								rtuUpTm = rtuDataRainEntity.getTm();
+							}
+						} else {
+							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));
+					}
+				}
+			} catch (Exception e) {
+				log.error("实时数据统计任务异常 {}", e.getMessage());
+			}
+			return 0;
+		}
+	}
+
 }

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

@@ -9,14 +9,14 @@ 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 org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.messaging.simp.SimpMessagingTemplate;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -36,15 +36,11 @@ import java.util.concurrent.Callable;
 public class EtlWarningTask implements Callable<Integer> {
 
 	private RedisTemplate redisTemplate;
-	private SimpMessagingTemplate messagingTemplate;
-	private KafkaTemplate<String, String> kafkaTemplate;
 	private IEtlWarningService etlWarningService;
 	private IRtuWarningService rtuWarningService;
 
-	public EtlWarningTask(RedisTemplate redisTemplate, KafkaTemplate<String, String> kafkaTemplate , SimpMessagingTemplate messagingTemplate, IEtlWarningService etlWarningService, IRtuWarningService rtuWarningService){
+	public EtlWarningTask(RedisTemplate redisTemplate, IEtlWarningService etlWarningService, IRtuWarningService rtuWarningService){
 		this.redisTemplate=redisTemplate;
-		this.kafkaTemplate=kafkaTemplate;
-		this.messagingTemplate=messagingTemplate;
 		this.etlWarningService=etlWarningService;
 		this.rtuWarningService=rtuWarningService;
 	}
@@ -52,19 +48,15 @@ public class EtlWarningTask implements Callable<Integer> {
 	@Override
 	public Integer call()  {
 		try {
+			log.info("预警数据抽取开始**************");
 			HashOperations<String, String, String> opsHash = redisTemplate.opsForHash();
-			SimpleDateFormat timeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-			Calendar calendar = Calendar.getInstance();
-			calendar.set(Calendar.HOUR_OF_DAY, 0);
-			calendar.set(Calendar.MINUTE, 0);
-			calendar.set(Calendar.SECOND, 0);
-			Date lastProcessDate = calendar.getTime();
-			if (opsHash.hasKey("data_process_time", "warning")) {
-				String dt = opsHash.get("data_process_time", "warning");
-				lastProcessDate = timeFormat.parse(dt);
+			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,lastProcessDate);
+			wrapper.gt(EtlWarningInfoEntity::getOriginalCreateTime,date);
 			wrapper.orderByAsc(EtlWarningInfoEntity::getOriginalCreateTime);
 			List<EtlWarningInfoEntity> list = etlWarningService.list(wrapper);
 			if (null != list && list.size() > 0) {
@@ -72,10 +64,9 @@ public class EtlWarningTask implements Callable<Integer> {
 					RtuWarningInfoEntity rtuWarningInfoEntity=new RtuWarningInfoEntity();
 					rtuWarningService.save(rtuWarningInfoEntity);
 				}
-				EtlWarningInfoEntity lastwarn= list.get(list.size()-1);
-				opsHash.put("data_process_time", "warning", timeFormat.format(lastwarn.getOriginalCreateTime()));
 			}
-
+			String dt = Func.formatDateTime(date);
+			opsHash.put("etl", "warn_update_time", dt);
 		} catch (Exception e) {
 			log.error("数据任务异常 {}", e.getMessage());
 		}

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

@@ -1,259 +0,0 @@
-/**
- * Copyright
- * All right reserved.
- * 项目名称:
- * 创建日期:2022/5/22
- */
-package org.springblade.etl;
-
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.extern.slf4j.Slf4j;
-import org.springblade.common.cache.DictBizCache;
-import org.springblade.core.tool.jackson.JsonUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.enums.EquipmentStatusEnum;
-import org.springblade.enums.OrderFromEnum;
-import org.springblade.enums.WarningStatusEnum;
-import org.springblade.etl.entity.EtlRainDataEntity;
-import org.springblade.etl.entity.EtlRsvrDataEntity;
-import org.springblade.etl.entity.EtlWarningInfoEntity;
-import org.springblade.etl.service.*;
-import org.springblade.modules.business.project.base.entity.ProjectInfoEntity;
-import org.springblade.modules.business.project.base.service.IProjectBaseInfoService;
-import org.springblade.modules.business.rtu.base.entity.RtuInfoEntity;
-import org.springblade.modules.business.rtu.base.service.IRtuBaseInfoService;
-import org.springblade.modules.business.rtu.data.entity.RtuDataGroundEntity;
-import org.springblade.modules.business.rtu.data.entity.RtuDataRainEntity;
-import org.springblade.modules.business.rtu.data.entity.RtuDataRiverEntity;
-import org.springblade.modules.business.rtu.data.entity.RtuDataRsvrEntity;
-import org.springblade.modules.business.rtu.data.service.IRtuDataGroundService;
-import org.springblade.modules.business.rtu.data.service.IRtuDataRainService;
-import org.springblade.modules.business.rtu.data.service.IRtuDataRiverService;
-import org.springblade.modules.business.rtu.data.service.IRtuDataRsvrService;
-import org.springblade.modules.business.rtumanage.entity.RtuStatusEntity;
-import org.springblade.modules.business.rtumanage.service.IRtuManageService;
-import org.springblade.modules.business.warning.entity.RtuWarningInfoEntity;
-import org.springblade.modules.business.warning.service.IRtuWarningService;
-import org.springblade.modules.system.entity.DictBiz;
-import org.springblade.modules.system.service.IDictBizService;
-import org.springframework.data.redis.core.HashOperations;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.messaging.simp.SimpMessagingTemplate;
-
-import java.lang.reflect.Array;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.Callable;
-
-/***
- * Date:2022/5/22
- * Title: 环境辐射与气象监测系统(KRS) 模块
- * Description：MODBUS TCP 协议传输 ,读取任务
- * @author swp
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Slf4j
-public class TestDataTask implements Callable<Integer> {
-
-	private RedisTemplate redisTemplate;
-	private SimpMessagingTemplate messagingTemplate;
-	private KafkaTemplate<String, String> kafkaTemplate;
-
-	private IRtuWarningService rtuWarningService;
-	private IRtuBaseInfoService rtuBaseInfoService;
-	private IProjectBaseInfoService projectBaseInfoService;
-	private IRtuDataGroundService dataGroundService;
-	private IRtuDataRainService dataRainService;
-	private IRtuDataRsvrService dataRsvrService;
-	private IRtuDataRiverService dataRiverService;
-	private IDictBizService dictBizService;
-	private IRtuManageService manageService;
-
-	private IEtlWarningService etlWarningService;
-	private IEtlRainDataService etlRainDataService;
-	private IEtlRiverDataService etlRiverDataService;
-	private IEtlRsvrDataService etlRsvrDataService;
-	private IEtlGroundDataService etlGroundDataService;
-
-
-	public TestDataTask(RedisTemplate redisTemplate, KafkaTemplate<String, String> kafkaTemplate, SimpMessagingTemplate messagingTemplate, IEtlWarningService etlWarningService, IRtuWarningService rtuWarningService, IRtuBaseInfoService rtuBaseInfoService, IProjectBaseInfoService projectBaseInfoService, IRtuDataRainService dataRainService, IRtuDataRiverService dataRiverService, IRtuDataRsvrService dataRsvrService, IRtuDataGroundService dataGroundService, IDictBizService dictBizService, IRtuManageService manageService, IEtlRainDataService etlRainDataService, IEtlRiverDataService etlRiverDataService, IEtlRsvrDataService etlRsvrDataService, IEtlGroundDataService etlGroundDataService) {
-		this.redisTemplate = redisTemplate;
-		this.kafkaTemplate = kafkaTemplate;
-		this.messagingTemplate = messagingTemplate;
-		this.etlWarningService = etlWarningService;
-		this.rtuWarningService = rtuWarningService;
-		this.rtuBaseInfoService = rtuBaseInfoService;
-		this.projectBaseInfoService = projectBaseInfoService;
-		this.dataGroundService = dataGroundService;
-		this.dataRainService = dataRainService;
-		this.dataRiverService = dataRiverService;
-		this.dataRsvrService = dataRsvrService;
-		this.dictBizService = dictBizService;
-		this.manageService = manageService;
-		this.etlRainDataService = etlRainDataService;
-		this.etlRiverDataService = etlRiverDataService;
-		this.etlRsvrDataService = etlRsvrDataService;
-		this.etlGroundDataService = etlGroundDataService;
-	}
-
-	@Override
-	public Integer call() {
-		try {
-			LambdaQueryWrapper<ProjectInfoEntity> wrapper = Wrappers.<ProjectInfoEntity>query().lambda();
-			wrapper.eq(ProjectInfoEntity::getIsDeleted, 0);
-			List<ProjectInfoEntity> projectInfoEntityList = projectBaseInfoService.list(wrapper);
-			for (ProjectInfoEntity projectInfoEntity : projectInfoEntityList) {
-				LambdaQueryWrapper<RtuInfoEntity> rtuWrapper = Wrappers.<RtuInfoEntity>query().lambda();
-				rtuWrapper.eq(RtuInfoEntity::getProjectId, projectInfoEntity.getId());
-				rtuWrapper.orderByAsc(RtuInfoEntity::getRtuCode);
-				List<RtuInfoEntity> rtuInfoEntityList = rtuBaseInfoService.list(rtuWrapper);
-				if (null != rtuInfoEntityList && rtuInfoEntityList.size() > 0) {
-					List<DictBiz> kindDict = dictBizService.getList("rtu_kind");
-					//List<DictBiz> kindDict = DictBizCache.getList("rtu_kind");
-					Calendar calendar = Calendar.getInstance();
-					calendar.set(Calendar.MINUTE, 0);
-					calendar.set(Calendar.SECOND, 0);
-					//生成业务数据
-					for (RtuInfoEntity rtuInfoEntity : rtuInfoEntityList) {
-						LambdaQueryWrapper<RtuStatusEntity> statusWrapper = Wrappers.<RtuStatusEntity>query().lambda();
-						statusWrapper.eq(RtuStatusEntity::getRtuCode, rtuInfoEntity.getRtuCode());
-						RtuStatusEntity statusEntity = manageService.getOne(statusWrapper);
-						if (null == statusEntity || statusEntity.getRunStatusId() == EquipmentStatusEnum.STATUS_RUN.getCode()) {
-
-
-							String rtuKinds = rtuInfoEntity.getRtuKinds();
-							String[] kinds = rtuKinds.split(",");
-							for (String k : kinds) {
-								for (DictBiz biz : kindDict) {
-									if (biz.getId() == Func.toLong(k)) {
-										if (biz.getDictKey().equals("rain")) {
-											LambdaQueryWrapper<RtuWarningInfoEntity> warnWrapper = Wrappers.<RtuWarningInfoEntity>query().lambda();
-											warnWrapper.eq(RtuWarningInfoEntity::getRtuCode, rtuInfoEntity.getRtuCode());
-											warnWrapper.isNull(RtuWarningInfoEntity::getWarningRecoveryTime);
-											RtuWarningInfoEntity warningInfoEntity = rtuWarningService.getOne(warnWrapper);
-
-
-											LambdaQueryWrapper<RtuDataRainEntity> dataWrapper = Wrappers.<RtuDataRainEntity>query().lambda();
-											dataWrapper.eq(RtuDataRainEntity::getRtuCode, rtuInfoEntity.getRtuCode());
-											RtuDataRainEntity rainEntity = dataRainService.getOne(dataWrapper);
-											if (null == rainEntity) {
-												rainEntity = new RtuDataRainEntity();
-											}
-
-											LambdaQueryWrapper<EtlRainDataEntity> etlWrapper = Wrappers.<EtlRainDataEntity>query().lambda();
-											etlWrapper.eq(EtlRainDataEntity::getRtuCode, rtuInfoEntity.getRtuCode());
-											etlWrapper.orderByDesc(EtlRainDataEntity::getTm);
-											etlWrapper.last("limit 1");
-											//java.util.Random random = new java.util.Random();
-											//Double drp = random.nextDouble();
-											EtlRainDataEntity etlRainDataEntity = etlRainDataService.getOne(etlWrapper);
-											if (etlRainDataEntity != null) {
-												rainEntity.setDrp(etlRainDataEntity.getDrp());
-												rainEntity.setRtuCode(rtuInfoEntity.getRtuCode());
-												rainEntity.setTm(calendar.getTime());
-												dataRainService.saveOrUpdate(rainEntity);
-											}
-
-
-										} else if (biz.getDictKey().equals("ground")) {
-											LambdaQueryWrapper<RtuDataGroundEntity> dataWrapper = Wrappers.<RtuDataGroundEntity>query().lambda();
-											dataWrapper.eq(RtuDataGroundEntity::getRtuCode, rtuInfoEntity.getRtuCode());
-											RtuDataGroundEntity groundEntity = dataGroundService.getOne(dataWrapper);
-											if (null == groundEntity) {
-												groundEntity = new RtuDataGroundEntity();
-											}
-
-
-											groundEntity.setRtuCode(rtuInfoEntity.getRtuCode());
-											java.util.Random random = new java.util.Random();
-											groundEntity.setSrlslm(random.nextDouble());
-											groundEntity.setVtavslm(random.nextDouble());
-											groundEntity.setSlm10(random.nextDouble());
-											groundEntity.setSlm20(random.nextDouble());
-											groundEntity.setSlm30(random.nextDouble());
-											groundEntity.setSlm40(random.nextDouble());
-											groundEntity.setSlm60(random.nextDouble());
-											groundEntity.setSlm80(random.nextDouble());
-											groundEntity.setSlm100(random.nextDouble());
-
-											groundEntity.setTm(calendar.getTime());
-											//	dataGroundService.saveOrUpdate(groundEntity);
-
-
-										} else if (biz.getDictKey().equals("river")) {
-											LambdaQueryWrapper<RtuDataRiverEntity> dataWrapper = Wrappers.<RtuDataRiverEntity>query().lambda();
-											dataWrapper.eq(RtuDataRiverEntity::getRtuCode, rtuInfoEntity.getRtuCode());
-											RtuDataRiverEntity riverEntity = dataRiverService.getOne(dataWrapper);
-											if (null == riverEntity) {
-												riverEntity = new RtuDataRiverEntity();
-											}
-
-
-											riverEntity.setRtuCode(rtuInfoEntity.getRtuCode());
-											java.util.Random random = new java.util.Random();
-											riverEntity.setZ(random.nextDouble());
-											riverEntity.setTm(calendar.getTime());
-											//	dataRiverService.saveOrUpdate(riverEntity);
-
-
-										} else if (biz.getDictKey().equals("rsvr")) {
-											LambdaQueryWrapper<RtuDataRsvrEntity> dataWrapper = Wrappers.<RtuDataRsvrEntity>query().lambda();
-											dataWrapper.eq(RtuDataRsvrEntity::getRtuCode, rtuInfoEntity.getRtuCode());
-											RtuDataRsvrEntity rsvrEntity = dataRsvrService.getOne(dataWrapper);
-											if (null == rsvrEntity) {
-												rsvrEntity = new RtuDataRsvrEntity();
-											}
-
-											rsvrEntity.setRtuCode(rtuInfoEntity.getRtuCode());
-
-
-											//	java.util.Random random = new java.util.Random();
-											//	rsvrEntity.setRz(random.nextDouble());
-
-											LambdaQueryWrapper<EtlRsvrDataEntity> etlWrapper = Wrappers.<EtlRsvrDataEntity>query().lambda();
-											etlWrapper.eq(EtlRsvrDataEntity::getRtuCode, rtuInfoEntity.getRtuCode());
-											etlWrapper.orderByDesc(EtlRsvrDataEntity::getTm);
-											etlWrapper.last("limit 1");
-											//java.util.Random random = new java.util.Random();
-											//Double drp = random.nextDouble();
-											EtlRsvrDataEntity etlRsvrDataEntity = etlRsvrDataService.getOne(etlWrapper);
-											if (etlRsvrDataEntity != null) {
-												rsvrEntity.setRz(etlRsvrDataEntity.getRz());
-												rsvrEntity.setTm(calendar.getTime());
-												dataRsvrService.saveOrUpdate(rsvrEntity);
-											}
-
-
-										}
-										break;
-									}
-								}
-							}
-
-							RtuStatusEntity newStatus = new RtuStatusEntity();
-							newStatus.setRunStatusId(EquipmentStatusEnum.STATUS_RUN.getCode());
-							newStatus.setRtuCode(rtuInfoEntity.getRtuCode());
-							newStatus.setLastUpTime(calendar.getTime());
-							kafkaTemplate.send("ywxt.rtu.status", JsonUtil.toJson(newStatus));
-
-						}
-					}
-				}
-			}
-			String timeStartText = DateUtil.format(new Date(), "yyyy年MM月dd日 HH时mm分ss秒");
-			log.info("模似数据生成{}", timeStartText);
-
-		} catch (Exception e) {
-			log.error("模似数据任务异常 {}", e.getMessage());
-		}
-		return 0;
-	}
-}

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

@@ -1,169 +0,0 @@
-/**
- * Copyright
- * All right reserved.
- * 项目名称:
- * 创建日期:2022/5/22
- */
-package org.springblade.etl;
-
-import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.extern.slf4j.Slf4j;
-import org.springblade.common.cache.DictBizCache;
-import org.springblade.core.tool.jackson.JsonUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.enums.WarningStatusEnum;
-import org.springblade.etl.service.IEtlWarningService;
-import org.springblade.modules.business.project.base.entity.ProjectInfoEntity;
-import org.springblade.modules.business.project.base.service.IProjectBaseInfoService;
-import org.springblade.modules.business.rtu.base.entity.RtuInfoEntity;
-import org.springblade.modules.business.rtu.base.service.IRtuBaseInfoService;
-import org.springblade.modules.business.rtu.data.entity.RtuDataGroundEntity;
-import org.springblade.modules.business.rtu.data.entity.RtuDataRainEntity;
-import org.springblade.modules.business.rtu.data.entity.RtuDataRiverEntity;
-import org.springblade.modules.business.rtu.data.entity.RtuDataRsvrEntity;
-import org.springblade.modules.business.rtu.data.service.IRtuDataGroundService;
-import org.springblade.modules.business.rtu.data.service.IRtuDataRainService;
-import org.springblade.modules.business.rtu.data.service.IRtuDataRiverService;
-import org.springblade.modules.business.rtu.data.service.IRtuDataRsvrService;
-import org.springblade.modules.business.warning.entity.OriginalWarningInfoEntity;
-import org.springblade.modules.business.warning.entity.RtuWarningInfoEntity;
-import org.springblade.modules.business.warning.service.IOriginalWarningService;
-import org.springblade.modules.business.warning.service.IRtuWarningService;
-import org.springblade.modules.system.entity.DictBiz;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.messaging.simp.SimpMessagingTemplate;
-
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.Callable;
-
-/***
- * Date:2022/5/22
- * Title: 环境辐射与气象监测系统(KRS) 模块
- * Description：MODBUS TCP 协议传输 ,读取任务
- * @author swp
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Slf4j
-public class TestWarnTask implements Callable<Integer> {
-
-	private RedisTemplate redisTemplate;
-	private SimpMessagingTemplate messagingTemplate;
-	private KafkaTemplate<String, String> kafkaTemplate;
-	private IEtlWarningService etlWarningService;
-	private IRtuWarningService rtuWarningService;
-	private IRtuBaseInfoService rtuBaseInfoService;
-	private IProjectBaseInfoService projectBaseInfoService;
-	private IRtuDataGroundService dataGroundService;
-	private IRtuDataRainService dataRainService;
-	private IRtuDataRsvrService dataRsvrService;
-	private IRtuDataRiverService dataRiverService;
-	private IOriginalWarningService originalWarningService;
-
-	public TestWarnTask(RedisTemplate redisTemplate, KafkaTemplate<String, String> kafkaTemplate, SimpMessagingTemplate messagingTemplate, IEtlWarningService etlWarningService, IRtuWarningService rtuWarningService, IRtuBaseInfoService rtuBaseInfoService, IProjectBaseInfoService projectBaseInfoService, IRtuDataRainService dataRainService, IRtuDataRiverService dataRiverService, IRtuDataRsvrService dataRsvrService, IRtuDataGroundService dataGroundService,IOriginalWarningService originalWarningService) {
-		this.redisTemplate = redisTemplate;
-		this.kafkaTemplate = kafkaTemplate;
-		this.messagingTemplate = messagingTemplate;
-		this.etlWarningService = etlWarningService;
-		this.rtuWarningService = rtuWarningService;
-		this.rtuBaseInfoService = rtuBaseInfoService;
-		this.projectBaseInfoService = projectBaseInfoService;
-		this.dataGroundService = dataGroundService;
-		this.dataRainService = dataRainService;
-		this.dataRiverService = dataRiverService;
-		this.dataRsvrService = dataRsvrService;
-		this.originalWarningService=originalWarningService;
-	}
-
-	@Override
-	public Integer call() {
-		try {
-			LambdaQueryWrapper<ProjectInfoEntity> wrapper = Wrappers.<ProjectInfoEntity>query().lambda();
-			wrapper.eq(ProjectInfoEntity::getIsDeleted, 0);
-			List<ProjectInfoEntity> projectInfoEntityList = projectBaseInfoService.list(wrapper);
-			for (ProjectInfoEntity projectInfoEntity : projectInfoEntityList) {
-				LambdaQueryWrapper<RtuInfoEntity> rtuWrapper = Wrappers.<RtuInfoEntity>query().lambda();
-				rtuWrapper.eq(RtuInfoEntity::getProjectId, projectInfoEntity.getId());
-				rtuWrapper.orderByAsc(RtuInfoEntity::getRtuCode);
-				List<RtuInfoEntity> rtuInfoEntityList = rtuBaseInfoService.list(rtuWrapper);
-				if (null != rtuInfoEntityList && rtuInfoEntityList.size() > 0) {
-					//生成预警信息
-					while (true) {
-						java.util.Random random = new java.util.Random();
-						int index = random.nextInt(rtuInfoEntityList.size());
-						RtuInfoEntity toWarnRtuEntity = rtuInfoEntityList.get(index);
-
-						LambdaQueryWrapper<RtuWarningInfoEntity> warnWrapper = Wrappers.<RtuWarningInfoEntity>query().lambda();
-						warnWrapper.eq(RtuWarningInfoEntity::getRtuCode, toWarnRtuEntity.getRtuCode());
-						warnWrapper.eq(RtuWarningInfoEntity::getIsDeleted, 0);
-						warnWrapper.isNull(RtuWarningInfoEntity::getWarningRecoveryTime);
-
-						RtuWarningInfoEntity entity = rtuWarningService.getOne(warnWrapper);
-						if (null == entity) {
-
-							OriginalWarningInfoEntity originalWarningInfoEntity=new OriginalWarningInfoEntity();
-							originalWarningInfoEntity.setRtuCode(toWarnRtuEntity.getRtuCode());
-							originalWarningInfoEntity.setWarnName(toWarnRtuEntity.getRtuName()+"-预警");
-							originalWarningInfoEntity.setWarnTime(new Date());
-							originalWarningInfoEntity.setWarnLevelCode("严重");
-							originalWarningInfoEntity.setWarnInfo("降水量超限预警");
-							originalWarningInfoEntity.setWarnStatus(5);
-							originalWarningInfoEntity.setReviewStatus("2");
-							originalWarningInfoEntity.setType("1");
-							originalWarningInfoEntity.setRainWarnRate(1);
-							originalWarningInfoEntity.setWarnSort("监测雨量");
-							originalWarningInfoEntity.setWarnLocation("全市");
-							originalWarningInfoEntity.setWarnAdcd("全市");
-							originalWarningInfoEntity.setUserAdcd("全市");
-							originalWarningInfoEntity.setWarnLgtd("116.727371");
-							originalWarningInfoEntity.setWarnLttd("39.906744");
-							originalWarningInfoEntity.setIntv("1小时");
-
-
-
-
-							originalWarningInfoEntity.setDrp(random.nextDouble());
-							originalWarningInfoEntity.setZ(random.nextDouble());
-							originalWarningInfoEntity.setQ(random.nextDouble());
-							originalWarningInfoEntity.setWptn("水势");
-							originalWarningInfoEntity.setRz(random.nextDouble());
-
-							originalWarningInfoEntity.setRwptn("水势");
-
-							originalWarningInfoEntity.setInq(random.nextDouble());
-
-							originalWarningService.save(originalWarningInfoEntity);
-
-							RtuWarningInfoEntity rtuWarningInfoEntity = new RtuWarningInfoEntity();
-							rtuWarningInfoEntity.setWarningKind("监测雨量");
-							rtuWarningInfoEntity.setWarningDesc("降水量超限预警");
-							rtuWarningInfoEntity.setRtuCode(toWarnRtuEntity.getRtuCode());
-							rtuWarningInfoEntity.setWarningHappenTime(new Date());
-							rtuWarningInfoEntity.setDataFromId(originalWarningInfoEntity.getId());
-							rtuWarningInfoEntity.setWarningStatus(WarningStatusEnum.STATUS_HAPPEN.getCode());
-
-							rtuWarningService.save(rtuWarningInfoEntity);
-
-							kafkaTemplate.send("ywxt.warning", JsonUtil.toJson(rtuWarningInfoEntity));
-
-
-							break;
-						}
-					}
-
-				}
-
-			}
-			String timeStartText = DateUtil.format(new Date(), "yyyy年MM月dd日 HH时mm分ss秒");
-			log.info("模似预警生成{}", timeStartText);
-
-		} catch (Exception e) {
-			log.error("模似预警务异常 {}", e.getMessage());
-		}
-		return 0;
-	}
-}

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

@@ -0,0 +1,92 @@
+/**
+ * Copyright 2019 DH
+ * All right reserved.
+ * 项目名称: 大恒泰山系统
+ * 创建日期:2022/8/22
+ */
+package org.springblade.etl.controller;
+
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.jackson.JsonUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.enums.EquipmentStatusEnum;
+import org.springblade.etl.entity.EtlRainDataEntity;
+import org.springblade.etl.entity.EtlRsvrDataEntity;
+import org.springblade.etl.service.IEtlRainDataService;
+import org.springblade.modules.baseinfo.org.service.IBaseInfoOrgService;
+import org.springblade.modules.baseinfo.project.entity.ProjectInfoEntity;
+import org.springblade.modules.baseinfo.project.vo.ProjectInfoVO;
+import org.springblade.modules.baseinfo.project.wrapper.ProjectInfoWrapper;
+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.rtumanage.entity.RtuStatusEntity;
+import org.springblade.modules.business.warning.entity.RtuWarningInfoEntity;
+import org.springblade.modules.system.entity.DictBiz;
+import org.springblade.modules.system.service.IDeptService;
+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 java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+
+/***
+ * Date:2022/8/22
+ * Title:行政区划管理
+ * Description：对本文件的详细描述，原则上不能少于30字
+ * @author dylan
+ * @version 1.0
+ * Remark：认为有必要的其他信息
+ */
+@RestController
+@RequestMapping("galaxy-test/test")
+@AllArgsConstructor
+@Api(value = "业务字典", tags = "业务字典")
+@Slf4j
+public class TestController extends BladeController {
+	private final IRtuBaseInfoService rtuBaseInfoService;
+	private final IEtlRainDataService etlRainDataService;
+
+	@GetMapping("/data/rain")
+	@ApiOperationSupport(order = 1)
+	public R<String> addRain(@RequestParam(name = "rtuCode") String rtuCode) {
+		Calendar calendar = Calendar.getInstance();
+//		calendar.set(Calendar.MINUTE, 0);
+//		calendar.set(Calendar.SECOND, 0);
+		LambdaQueryWrapper<RtuInfoEntity> wrapper = Wrappers.<RtuInfoEntity>query().lambda();
+		wrapper.eq(RtuInfoEntity::getRtuCode, rtuCode);
+		wrapper.eq(RtuInfoEntity::getIsDeleted, 0);
+		RtuInfoEntity rtuInfoEntity = rtuBaseInfoService.getOne(wrapper);
+		if (rtuInfoEntity.getIsRain() == 1) {
+			EtlRainDataEntity etlRainDataEntity = new EtlRainDataEntity();
+			etlRainDataEntity.setGuid(Func.randomUUID());
+			java.util.Random random = new java.util.Random();
+			Double drp = random.nextDouble();
+			etlRainDataEntity.setDrp(drp);
+			etlRainDataEntity.setRtuCode(rtuInfoEntity.getRtuCode());
+			etlRainDataEntity.setTm(calendar.getTime());
+			etlRainDataEntity.setIntv(1.0);
+			etlRainDataService.saveTestData(etlRainDataEntity);
+		}
+		String timeStartText = DateUtil.format(new Date(), "yyyy年MM月dd日 HH时mm分ss秒");
+		log.info("模似数据生成{}", timeStartText);
+		return R.data("ok");
+	}
+}

src/main/java/org/springblade/realData/Entity/RealDataHomeInfoEntity.java → src/main/java/org/springblade/etl/dto/EtlAdCdDTO.java

@@ -2,16 +2,18 @@
  * Copyright 2019 DH
  * All right reserved.
  * 项目名称: 大恒泰山系统
- * 创建日期:2022/8/27
+ * 创建日期:2022/9/8
  */
-package org.springblade.realData.Entity;
+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/8/27
+ * Date:2022/9/8
  * Title:文件所属模块（必须填写）
  * Description：对本文件的详细描述，原则上不能少于30字
  * @author dylan
@@ -20,5 +22,7 @@ import org.springblade.core.mp.base.BaseEntity;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class RealDataHomeInfoEntity extends BaseEntity {
+public class EtlAdCdDTO extends BaseEntity {
+
+
 }

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

@@ -0,0 +1,49 @@
+/**
+ * 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/modules/business/rtu/base/dto/RtuInfoDTO.java → src/main/java/org/springblade/etl/dto/EtlMvAttStBaseDTO.java

@@ -2,17 +2,18 @@
  * Copyright 2019 DH
  * All right reserved.
  * 项目名称: 大恒泰山系统
- * 创建日期:2022/9/7
+ * 创建日期:2022/9/8
  */
-package org.springblade.modules.business.rtu.base.dto;
+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.modules.business.rtu.base.entity.RtuInfoEntity;
+import org.springblade.core.mp.base.BaseEntity;
 
 /***
- * Date:2022/9/7
+ * Date:2022/9/8
  * Title:文件所属模块（必须填写）
  * Description：对本文件的详细描述，原则上不能少于30字
  * @author dylan
@@ -21,13 +22,6 @@ import org.springblade.modules.business.rtu.base.entity.RtuInfoEntity;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class RtuInfoDTO extends RtuInfoEntity {
-	/**
-	 * 项目名称
-	 */
-	@ApiModelProperty(value = "项目名称")
-	private String projectName;
+public class EtlMvAttStBaseDTO extends BaseEntity {
 
-	@ApiModelProperty(value = "行政区划编码")
-	private String adCode;
 }

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

@@ -0,0 +1,49 @@
+/**
+ * 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

@@ -0,0 +1,48 @@
+/**
+ * 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

@@ -0,0 +1,49 @@
+/**
+ * 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

@@ -0,0 +1,31 @@
+/**
+ * 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/EtlMvAttStBaseEntity.java

@@ -25,16 +25,45 @@ import org.springblade.core.mp.base.BaseEntity;
 @TableName("etl_mv_att_st_base")
 public class EtlMvAttStBaseEntity extends BaseEntity {
 	private static final long serialVersionUID = 1L;
-
 	@ApiModelProperty("测站编码")
 	private String stCode;
 
 	@ApiModelProperty("测站名称")
 	private String stName;
 
+	@ApiModelProperty("类型")
+	private String stType;
+
+	@ApiModelProperty("经度")
+	private Double stLong;
+
+	@ApiModelProperty("纬度")
+	private Double stLat;
+
+	@ApiModelProperty("站址")
+	private String stSite;
+
 	@ApiModelProperty("行政区划代码")
 	private String adCode;
 
 	@ApiModelProperty("行政区划名称")
 	private String adName;
+
+	@ApiModelProperty("流域代码")
+	private String rvCode;
+
+	@ApiModelProperty("流域名称")
+	private String rvName;
+
+	@ApiModelProperty("是否雨情站")
+	private Integer isRain;
+
+	@ApiModelProperty("是否河道")
+	private Integer isRiver;
+
+	@ApiModelProperty("是否水库")
+	private Integer isRes;
+
+	@ApiModelProperty("雨量站类型(QX, SH, SW)")
+	private String rainStType;
 }

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

@@ -8,6 +8,7 @@ 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;
 
 
@@ -23,5 +24,5 @@ import java.util.List;
  * Remark：认为有必要的其他信息
  */
 public interface EtlGroundDataMapper extends BaseMapper<EtlGroundDataEntity> {
-	List<EtlGroundDataEntity> selectLastList(@Param("etlGroundDataEntity") EtlGroundDataEntity etlGroundDataEntity);
+	List<EtlGroundDataEntity> selectLastList(@Param("etlGroundDataDTO") EtlGroundDataDTO etlGroundDataDTO);
 }

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

@@ -25,9 +25,13 @@
         FROM
         etl_att_st_somo d
         WHERE 1=1
-        <if test="etlGroundDataEntity.tm!=null">
-            and d.tm > #{etlGroundDataEntity.tm}
+        <if test="etlGroundDataDTO.rtuCode!=null">
+            and d.ST_CODE = #{etlGroundDataDTO.rtuCode}
         </if>
-        order  by d.tm asc
+        <if test="etlGroundDataDTO.lastTime!=null">
+            and d.TM > #{etlGroundDataDTO.lastTime}
+        </if>
+        order  by d.tm desc
+        limit 1
     </select>
 </mapper>

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

@@ -8,7 +8,16 @@
         <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>
 
 

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

@@ -8,6 +8,7 @@ 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;
@@ -22,5 +23,7 @@ import java.util.List;
  * Remark：认为有必要的其他信息
  */
 public interface EtlRainDataMapper extends BaseMapper<EtlRainDataEntity> {
-	List<EtlRainDataEntity> selectLastList(@Param("etlRainDataEntity") EtlRainDataEntity etlRainDataEntity);
+	List<EtlRainDataEntity> selectLastList(@Param("etlRainDataDTO") EtlRainDataDTO etlRainDataDTO);
+
+	boolean saveTestData(@Param("etlRainDataEntity") EtlRainDataEntity etlRainDataEntity);
 }

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

@@ -21,9 +21,17 @@
         FROM
         etl_att_st_prec d
         WHERE 1=1
-        <if test="etlRainDataEntity.tm!=null">
-            and d.tm > #{etlRainDataEntity.tm}
+        <if test="etlRainDataDTO.rtuCode!=null">
+            and d.ST_CODE = #{etlRainDataDTO.rtuCode}
         </if>
-        order  by d.tm asc
+        <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

@@ -8,6 +8,7 @@ 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;
 
@@ -23,5 +24,5 @@ import java.util.List;
  * Remark：认为有必要的其他信息
  */
 public interface EtlRiverDataMapper extends BaseMapper<EtlRiverDataEntity> {
-	List<EtlRiverDataEntity> selectLastList(@Param("etlRiverDataEntity") EtlRiverDataEntity etlRiverDataEntity);
+	List<EtlRiverDataEntity> selectLastList(@Param("etlRiverDataDTO") EtlRiverDataDTO etlRiverDataDTO);
 }

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

@@ -18,9 +18,13 @@
         FROM
         etl_att_st_waco_ware d
         WHERE 1=1
-        <if test="etlRiverDataEntity.tm!=null">
-            and d.tm > #{etlRiverDataEntity.tm}
+        <if test="etlRiverDataDTO.rtuCode!=null">
+            and d.ST_CODE = #{etlRiverDataDTO.rtuCode}
         </if>
-        order  by d.tm asc
+        <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

@@ -8,6 +8,7 @@ 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;
@@ -22,5 +23,5 @@ import java.util.List;
  * Remark：认为有必要的其他信息
  */
 public interface EtlRsvrDataMapper extends BaseMapper<EtlRsvrDataEntity> {
-	List<EtlRsvrDataEntity> selectLastList(@Param("etlRsvrDataEntity") EtlRsvrDataEntity etlRsvrDataEntity);
+	List<EtlRsvrDataEntity> selectLastList(@Param("etlRsvrDataDTO") EtlRsvrDataDTO etlRsvrDataDTO);
 }

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

@@ -15,11 +15,15 @@
         SELECT
         d.*
         FROM
-        etl_att_st_prec d
+        etl_att_st_res_ware d
         WHERE 1=1
-        <if test="etlRsvrDataEntity.tm!=null">
-            and d.tm > #{etlRsvrDataEntity.tm}
+        <if test="etlRsvrDataDTO.rtuCode!=null">
+            and d.ST_CODE = #{etlRsvrDataDTO.rtuCode}
         </if>
-        order  by d.tm asc
+        <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/service/IEtlGroundDataService.java

@@ -7,6 +7,7 @@
 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;
 
@@ -23,5 +24,5 @@ import java.util.List;
  */
 public interface IEtlGroundDataService extends BaseService<EtlGroundDataEntity> {
 
-	List<EtlGroundDataEntity> selectLastList(EtlGroundDataEntity etlGroundDataEntity);
+	List<EtlGroundDataEntity> selectLastList(EtlGroundDataDTO etlGroundDataDTO);
 }

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

@@ -7,6 +7,7 @@
 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;
@@ -22,5 +23,7 @@ import java.util.List;
  */
 public interface IEtlRainDataService extends BaseService<EtlRainDataEntity> {
 
-	List<EtlRainDataEntity> selectLastList(EtlRainDataEntity etlRainDataEntity);
+	List<EtlRainDataEntity> selectLastList(EtlRainDataDTO etlRainDataDTO);
+
+	boolean saveTestData(EtlRainDataEntity etlRainDataEntity);
 }

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

@@ -7,6 +7,7 @@
 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;
 
@@ -23,5 +24,5 @@ import java.util.List;
  */
 public interface IEtlRiverDataService extends BaseService<EtlRiverDataEntity> {
 
-	List<EtlRiverDataEntity> selectLastList(EtlRiverDataEntity etlRiverDataEntity);
+	List<EtlRiverDataEntity> selectLastList(EtlRiverDataDTO etlRiverDataDTO);
 }

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

@@ -7,6 +7,7 @@
 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;
 
@@ -23,5 +24,5 @@ import java.util.List;
  */
 public interface IEtlRsvrDataService extends BaseService<EtlRsvrDataEntity> {
 
-	List<EtlRsvrDataEntity> selectLastList(EtlRsvrDataEntity etlRsvrDataEntity);
+	List<EtlRsvrDataEntity> selectLastList(EtlRsvrDataDTO etlRsvrDataDTO);
 }

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

@@ -7,6 +7,7 @@
 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;
@@ -30,7 +31,7 @@ import java.util.List;
 public class EtlGroundDataServiceImpl extends BaseServiceImpl<EtlGroundDataMapper, EtlGroundDataEntity> implements IEtlGroundDataService {
 
 	@Override
-	public List<EtlGroundDataEntity> selectLastList(EtlGroundDataEntity etlGroundDataEntity) {
-		return baseMapper.selectLastList(etlGroundDataEntity);
+	public List<EtlGroundDataEntity> selectLastList(EtlGroundDataDTO etlGroundDataDTO) {
+		return baseMapper.selectLastList(etlGroundDataDTO);
 	}
 }

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

@@ -7,6 +7,7 @@
 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;
@@ -27,7 +28,12 @@ import java.util.List;
 public class EtlRainDataServiceImpl extends BaseServiceImpl<EtlRainDataMapper, EtlRainDataEntity> implements IEtlRainDataService {
 
 	@Override
-	public List<EtlRainDataEntity> selectLastList(EtlRainDataEntity etlRainDataEntity) {
-		return baseMapper.selectLastList(etlRainDataEntity);
+	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

@@ -7,6 +7,7 @@
 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;
@@ -30,7 +31,7 @@ import java.util.List;
 public class EtlRiverDataServiceImpl extends BaseServiceImpl<EtlRiverDataMapper, EtlRiverDataEntity> implements IEtlRiverDataService {
 
 	@Override
-	public List<EtlRiverDataEntity> selectLastList(EtlRiverDataEntity etlRiverDataEntity) {
-		return baseMapper.selectLastList(etlRiverDataEntity);
+	public List<EtlRiverDataEntity> selectLastList(EtlRiverDataDTO etlRiverDataDTO) {
+		return baseMapper.selectLastList(etlRiverDataDTO);
 	}
 }

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

@@ -7,6 +7,7 @@
 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;
@@ -27,7 +28,7 @@ import java.util.List;
 public class EtlRsvrDataServiceImpl extends BaseServiceImpl<EtlRsvrDataMapper, EtlRsvrDataEntity> implements IEtlRsvrDataService {
 
 	@Override
-	public List<EtlRsvrDataEntity> selectLastList(EtlRsvrDataEntity etlRsvrDataEntity) {
-		return baseMapper.selectLastList(etlRsvrDataEntity);
+	public List<EtlRsvrDataEntity> selectLastList(EtlRsvrDataDTO etlRsvrDataDTO) {
+		return baseMapper.selectLastList(etlRsvrDataDTO);
 	}
 }

src/main/java/org/springblade/modules/baseinfo/dict/controller/BaseInfoDictController.java

@@ -0,0 +1,50 @@
+/**
+ * Copyright 2019 DH
+ * All right reserved.
+ * 项目名称: 大恒泰山系统
+ * 创建日期:2022/8/22
+ */
+package org.springblade.modules.baseinfo.dict.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.constant.BusinessConstant;
+import org.springblade.core.boot.ctrl.BladeController;
+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.modules.baseinfo.org.service.IBaseInfoOrgService;
+import org.springblade.modules.baseinfo.org.vo.OrgInfoVO;
+import org.springblade.modules.baseinfo.org.wrapper.OrgInfoWrapper;
+import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.service.IDeptService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.LinkedList;
+import java.util.List;
+
+
+/***
+ * Date:2022/8/22
+ * Title:行政区划管理
+ * Description：对本文件的详细描述，原则上不能少于30字
+ * @author dylan
+ * @version 1.0
+ * Remark：认为有必要的其他信息
+ */
+@RestController
+@RequestMapping("galaxy-business/baseinfo/dict")
+@AllArgsConstructor
+@Api(value = "业务字典", tags = "业务字典")
+public class BaseInfoDictController extends BladeController {
+	private final IBaseInfoOrgService orgService;
+	private final IDeptService deptService;
+
+}

src/main/java/org/springblade/modules/baseinfo/dict/entity/DictInfoEntity.java

@@ -0,0 +1,75 @@
+/**
+ * Copyright
+ * All right reserved.
+ * 项目名称:
+ * 创建日期:2022/3/9
+ */
+package org.springblade.modules.baseinfo.dict.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;
+
+
+/**
+ * 运维单位实体
+ *
+ * @author swp
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("blade_dict_biz")
+public class DictInfoEntity extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户ID
+	 */
+	@ApiModelProperty("租户ID")
+	private String tenantId;
+
+	/**
+	 * 父主键
+	 */
+	@ApiModelProperty(value = "父主键")
+	private Long parentId;
+
+	/**
+	 * 字典码
+	 */
+	@ApiModelProperty(value = "字典码")
+	private String code;
+
+	/**
+	 * 排序
+	 */
+	@ApiModelProperty(value = "排序")
+	private Integer sort;
+
+	/**
+	 * 是否已封存
+	 */
+	@ApiModelProperty(value = "是否已封存")
+	private Integer isSealed;
+
+	/**
+	 * 字典值
+	 */
+	@ApiModelProperty(value = "字典值")
+	private String dictKey;
+
+	/**
+	 * 字典名称
+	 */
+	@ApiModelProperty(value = "字典名称")
+	private String dictValue;
+
+	/**
+	 * 部门全称
+	 */
+	@ApiModelProperty(value = "部门全称")
+	private String remark;
+}

src/main/java/org/springblade/modules/baseinfo/dict/mapper/DictInfoMapper.java

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

src/main/java/org/springblade/modules/baseinfo/dict/mapper/DictInfoMapper.xml

@@ -0,0 +1,34 @@
+<?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.modules.baseinfo.dict.mapper.DictInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="baseinfoDictResultMap" type="org.springblade.modules.baseinfo.dict.entity.DictInfoEntity">
+        <result column="id" property="id"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="parent_id" property="parentId"/>
+        <result column="code" property="code"/>
+        <result column="dict_key" property="dictKey"/>
+        <result column="dict_value" property="dictValue"/>
+        <result column="sort" property="sort"/>
+        <result column="remark" property="remark"/>
+        <result column="is_sealed" property="isSealed"/>
+    </resultMap>
+
+    <select id="getDict" resultMap="baseinfoDictResultMap">
+        SELECT
+        n.*
+        FROM
+        blade_dict_biz n
+        WHERE
+        n.is_deleted = 0
+        <if test="code!=null">
+            and n.code = #{code}
+        </if>
+        <if test="key!=null">
+            and n.dict_key = #{key}
+        </if>
+        limit 1
+
+    </select>
+</mapper>

src/main/java/org/springblade/modules/baseinfo/dict/service/IBaseInfoDictService.java

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

src/main/java/org/springblade/modules/baseinfo/dict/service/impl/BaseInfoDictServiceImpl.java

@@ -0,0 +1,34 @@
+/**
+ * Copyright 2019 DH
+ * All right reserved.
+ * 项目名称: 大恒泰山系统
+ * 创建日期:2022/8/22
+ */
+package org.springblade.modules.baseinfo.dict.service.impl;
+
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.baseinfo.dict.entity.DictInfoEntity;
+import org.springblade.modules.baseinfo.dict.mapper.DictInfoMapper;
+import org.springblade.modules.baseinfo.dict.service.IBaseInfoDictService;
+import org.springblade.modules.baseinfo.org.entity.OrgInfoEntity;
+import org.springblade.modules.baseinfo.org.mapper.OrgInfoMapper;
+import org.springblade.modules.baseinfo.org.service.IBaseInfoOrgService;
+import org.springblade.modules.system.entity.DictBiz;
+import org.springframework.stereotype.Service;
+
+/***
+ * Date:2022/8/22
+ * Title:文件所属模块（必须填写）
+ * Description：对本文件的详细描述，原则上不能少于30字
+ * @author dylan
+ * @version 1.0
+ * Remark：认为有必要的其他信息
+ */
+@Service
+public class BaseInfoDictServiceImpl extends BaseServiceImpl<DictInfoMapper, DictInfoEntity> implements IBaseInfoDictService {
+
+	@Override
+	public DictInfoEntity getDict(String code, String key) {
+		return this.baseMapper.getDict(code,key);
+	}
+}

src/main/java/org/springblade/modules/business/project/base/controller/ProjectBaseInfoController.java → src/main/java/org/springblade/modules/baseinfo/project/controller/ProjectBaseInfoController.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/22
  */
-package org.springblade.modules.business.project.base.controller;
+package org.springblade.modules.baseinfo.project.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -15,30 +15,24 @@ import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import org.springblade.constant.BusinessConstant;
 import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 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.modules.business.check.order.entity.CheckOrderInfoEntity;
-import org.springblade.modules.business.desk.entity.NoticeEntity;
-import org.springblade.modules.business.project.base.entity.ProjectInfoEntity;
-import org.springblade.modules.business.project.base.entity.ProjectTreeNodeEntity;
-import org.springblade.modules.business.project.base.entity.ProjectWarningSettingEntity;
-import org.springblade.modules.business.project.base.service.IProjectBaseInfoService;
-import org.springblade.modules.business.project.base.service.IProjectWarningSettingService;
-import org.springblade.modules.business.project.base.vo.ProjectInfoVO;
-import org.springblade.modules.business.project.base.wrapper.ProjectInfoWrapper;
+import org.springblade.modules.baseinfo.project.entity.ProjectInfoEntity;
+import org.springblade.modules.baseinfo.project.entity.ProjectTreeNodeEntity;
+import org.springblade.modules.baseinfo.project.service.IProjectBaseInfoService;
+import org.springblade.modules.baseinfo.project.service.IProjectWarningSettingService;
+import org.springblade.modules.baseinfo.project.vo.ProjectInfoVO;
+import org.springblade.modules.baseinfo.project.wrapper.ProjectInfoWrapper;
 import org.springblade.modules.system.entity.Dept;
-import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.service.IDeptService;
 import org.springblade.modules.system.service.IUserService;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
-import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 

src/main/java/org/springblade/modules/business/project/base/entity/ProjectInfoEntity.java → src/main/java/org/springblade/modules/baseinfo/project/entity/ProjectInfoEntity.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/22
  */
-package org.springblade.modules.business.project.base.entity;
+package org.springblade.modules.baseinfo.project.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -25,7 +25,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("project_info")
-public class ProjectInfoEntity  extends BaseEntity {
+public class ProjectInfoEntity extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
 	/**

src/main/java/org/springblade/modules/business/project/base/entity/ProjectTreeNodeEntity.java → src/main/java/org/springblade/modules/baseinfo/project/entity/ProjectTreeNodeEntity.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/28
  */
-package org.springblade.modules.business.project.base.entity;
+package org.springblade.modules.baseinfo.project.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/org/springblade/modules/business/project/base/entity/ProjectWarningSettingEntity.java → src/main/java/org/springblade/modules/baseinfo/project/entity/ProjectWarningSettingEntity.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/23
  */
-package org.springblade.modules.business.project.base.entity;
+package org.springblade.modules.baseinfo.project.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/org/springblade/modules/business/project/base/mapper/ProjectInfoMapper.java → src/main/java/org/springblade/modules/baseinfo/project/mapper/ProjectInfoMapper.java

@@ -4,13 +4,13 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/22
  */
-package org.springblade.modules.business.project.base.mapper;
+package org.springblade.modules.baseinfo.project.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.modules.business.project.base.entity.ProjectInfoEntity;
-import org.springblade.modules.business.project.base.vo.ProjectInfoVO;
+import org.springblade.modules.baseinfo.project.entity.ProjectInfoEntity;
+import org.springblade.modules.baseinfo.project.vo.ProjectInfoVO;
 
 
 import java.util.List;

src/main/java/org/springblade/modules/business/project/base/mapper/ProjectInfoMapper.xml → src/main/java/org/springblade/modules/baseinfo/project/mapper/ProjectInfoMapper.xml

@@ -1,9 +1,9 @@
 <?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.modules.business.project.base.mapper.ProjectInfoMapper">
+<mapper namespace="org.springblade.modules.baseinfo.project.mapper.ProjectInfoMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="projectInfoResultMap" type="org.springblade.modules.business.project.base.entity.ProjectInfoEntity">
+    <resultMap id="projectInfoResultMap" type="org.springblade.modules.baseinfo.project.entity.ProjectInfoEntity">
         <result column="id" property="id"/>
         <result column="create_user" property="createUser"/>
         <result column="create_time" property="createTime"/>
@@ -25,7 +25,7 @@
     </resultMap>
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="projectInfoVOResultMap" type="org.springblade.modules.business.project.base.vo.ProjectInfoVO">
+    <resultMap id="projectInfoVOResultMap" type="org.springblade.modules.baseinfo.project.vo.ProjectInfoVO">
         <result column="id" property="id"/>
         <result column="create_user" property="createUser"/>
         <result column="create_time" property="createTime"/>

src/main/java/org/springblade/modules/business/project/base/mapper/ProjectWarningSettingMapper.java → src/main/java/org/springblade/modules/baseinfo/project/mapper/ProjectWarningSettingMapper.java

@@ -4,10 +4,11 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/23
  */
-package org.springblade.modules.business.project.base.mapper;
+package org.springblade.modules.baseinfo.project.mapper;
+
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.modules.business.project.base.entity.ProjectWarningSettingEntity;
+import org.springblade.modules.baseinfo.project.entity.ProjectWarningSettingEntity;
 
 /***
  * Date:2022/8/23

src/main/java/org/springblade/modules/business/project/base/mapper/ProjectWarningSettingMapper.xml → src/main/java/org/springblade/modules/baseinfo/project/mapper/ProjectWarningSettingMapper.xml

@@ -1,9 +1,9 @@
 <?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.modules.business.project.base.mapper.ProjectWarningSettingMapper">
+<mapper namespace="org.springblade.modules.baseinfo.project.mapper.ProjectWarningSettingMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="projectInfoResultMap" type="org.springblade.modules.business.project.base.entity.ProjectWarningSettingEntity">
+    <resultMap id="projectInfoResultMap" type="org.springblade.modules.baseinfo.project.entity.ProjectWarningSettingEntity">
         <result column="id" property="id"/>
         <result column="create_user" property="createUser"/>
         <result column="create_time" property="createTime"/>

src/main/java/org/springblade/modules/business/project/base/service/IProjectBaseInfoService.java → src/main/java/org/springblade/modules/baseinfo/project/service/IProjectBaseInfoService.java

@@ -4,13 +4,13 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/22
  */
-package org.springblade.modules.business.project.base.service;
+package org.springblade.modules.baseinfo.project.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.modules.business.project.base.entity.ProjectInfoEntity;
-import org.springblade.modules.business.project.base.entity.ProjectWarningSettingEntity;
-import org.springblade.modules.business.project.base.vo.ProjectInfoVO;
+import org.springblade.modules.baseinfo.project.entity.ProjectInfoEntity;
+import org.springblade.modules.baseinfo.project.entity.ProjectWarningSettingEntity;
+import org.springblade.modules.baseinfo.project.vo.ProjectInfoVO;
 
 import java.util.Date;
 
@@ -29,7 +29,7 @@ public interface IProjectBaseInfoService extends BaseService<ProjectInfoEntity>
 	 * @param page
 	 * @return
 	 */
-	IPage<ProjectInfoVO> selectPage(ProjectInfoEntity entity,IPage<ProjectInfoVO> page);
+	IPage<ProjectInfoVO> selectPage(ProjectInfoEntity entity, IPage<ProjectInfoVO> page);
 
 	/**
 	 * 项目预警配置
@@ -43,6 +43,6 @@ public interface IProjectBaseInfoService extends BaseService<ProjectInfoEntity>
 	 * @param date
 	 * @return
 	 */
-	boolean  updateImportTime(Long projectId,Date date);
+	boolean  updateImportTime(Long projectId, Date date);
 
 }

src/main/java/org/springblade/modules/business/project/base/service/IProjectWarningSettingService.java → src/main/java/org/springblade/modules/baseinfo/project/service/IProjectWarningSettingService.java

@@ -4,10 +4,11 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/23
  */
-package org.springblade.modules.business.project.base.service;
+package org.springblade.modules.baseinfo.project.service;
+
 
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.modules.business.project.base.entity.ProjectWarningSettingEntity;
+import org.springblade.modules.baseinfo.project.entity.ProjectWarningSettingEntity;
 
 /***
  * Date:2022/8/23
@@ -17,5 +18,5 @@ import org.springblade.modules.business.project.base.entity.ProjectWarningSettin
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public interface IProjectWarningSettingService  extends BaseService<ProjectWarningSettingEntity> {
+public interface IProjectWarningSettingService extends BaseService<ProjectWarningSettingEntity> {
 }

src/main/java/org/springblade/modules/business/project/base/service/impl/ProjectBaseInfoServiceImpl.java → src/main/java/org/springblade/modules/baseinfo/project/service/impl/ProjectBaseInfoServiceImpl.java

@@ -4,18 +4,17 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/22
  */
-package org.springblade.modules.business.project.base.service.impl;
+package org.springblade.modules.baseinfo.project.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.modules.business.project.base.entity.ProjectInfoEntity;
-import org.springblade.modules.business.project.base.entity.ProjectWarningSettingEntity;
-import org.springblade.modules.business.project.base.mapper.ProjectInfoMapper;
-import org.springblade.modules.business.project.base.service.IProjectBaseInfoService;
-import org.springblade.modules.business.project.base.vo.ProjectInfoVO;
+import org.springblade.modules.baseinfo.project.entity.ProjectInfoEntity;
+import org.springblade.modules.baseinfo.project.entity.ProjectWarningSettingEntity;
+import org.springblade.modules.baseinfo.project.mapper.ProjectInfoMapper;
+import org.springblade.modules.baseinfo.project.service.IProjectBaseInfoService;
+import org.springblade.modules.baseinfo.project.vo.ProjectInfoVO;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -29,9 +28,9 @@ import java.util.Date;
  * Remark：认为有必要的其他信息
  */
 @Service
-public class ProjectBaseInfoServiceImpl  extends BaseServiceImpl<ProjectInfoMapper, ProjectInfoEntity> implements IProjectBaseInfoService {
+public class ProjectBaseInfoServiceImpl extends BaseServiceImpl<ProjectInfoMapper, ProjectInfoEntity> implements IProjectBaseInfoService {
 	@Override
-	public IPage<ProjectInfoVO> selectPage(ProjectInfoEntity entity,IPage<ProjectInfoVO> page) {
+	public IPage<ProjectInfoVO> selectPage(ProjectInfoEntity entity, IPage<ProjectInfoVO> page) {
 		return page.setRecords(baseMapper.selectPage(entity,page));
 	}
 

src/main/java/org/springblade/modules/business/project/base/service/impl/ProjectWarningSettingServiceImpl.java → src/main/java/org/springblade/modules/baseinfo/project/service/impl/ProjectWarningSettingServiceImpl.java

@@ -4,12 +4,12 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/23
  */
-package org.springblade.modules.business.project.base.service.impl;
+package org.springblade.modules.baseinfo.project.service.impl;
 
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.modules.business.project.base.entity.ProjectWarningSettingEntity;
-import org.springblade.modules.business.project.base.mapper.ProjectWarningSettingMapper;
-import org.springblade.modules.business.project.base.service.IProjectWarningSettingService;
+import org.springblade.modules.baseinfo.project.entity.ProjectWarningSettingEntity;
+import org.springblade.modules.baseinfo.project.mapper.ProjectWarningSettingMapper;
+import org.springblade.modules.baseinfo.project.service.IProjectWarningSettingService;
 import org.springframework.stereotype.Service;
 
 /***

src/main/java/org/springblade/modules/business/project/base/vo/ProjectInfoVO.java → src/main/java/org/springblade/modules/baseinfo/project/vo/ProjectInfoVO.java

@@ -4,14 +4,13 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/22
  */
-package org.springblade.modules.business.project.base.vo;
+package org.springblade.modules.baseinfo.project.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.modules.business.project.base.entity.ProjectInfoEntity;
+import org.springblade.modules.baseinfo.project.entity.ProjectInfoEntity;
 
-import java.util.Date;
 
 /***
  * Date:2022/8/22

src/main/java/org/springblade/modules/business/project/base/wrapper/ProjectInfoWrapper.java → src/main/java/org/springblade/modules/baseinfo/project/wrapper/ProjectInfoWrapper.java

@@ -4,19 +4,13 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/22
  */
-package org.springblade.modules.business.project.base.wrapper;
+package org.springblade.modules.baseinfo.project.wrapper;
 
 import org.springblade.common.cache.DictBizCache;
-import org.springblade.common.cache.DictCache;
-import org.springblade.common.enums.DictBizEnum;
-import org.springblade.common.enums.DictEnum;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.modules.business.desk.entity.NoticeEntity;
-import org.springblade.modules.business.desk.vo.NoticeVO;
-import org.springblade.modules.business.desk.wrapper.NoticeWrapper;
-import org.springblade.modules.business.project.base.entity.ProjectInfoEntity;
-import org.springblade.modules.business.project.base.vo.ProjectInfoVO;
+import org.springblade.modules.baseinfo.project.entity.ProjectInfoEntity;
+import org.springblade.modules.baseinfo.project.vo.ProjectInfoVO;
 import org.springblade.modules.system.entity.DictBiz;
 
 import java.util.Objects;

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

@@ -16,7 +16,6 @@ import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import org.springblade.constant.BusinessConstant;
 import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -31,10 +30,11 @@ import org.springblade.modules.baseinfo.region.entity.RegionTreeNodeEntity;
 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.RegionInfoNodeWrapper;
 import org.springblade.modules.baseinfo.region.wrapper.RegionInfoWrapper;
+import org.springblade.modules.manage.task.DataTaskManager;
 import org.springblade.modules.system.service.IDeptService;
 import org.springblade.modules.system.service.IRegionService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.web.bind.annotation.*;
@@ -43,7 +43,6 @@ import springfox.documentation.annotations.ApiIgnore;
 import javax.annotation.Resource;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Objects;
 
 
 /***
@@ -64,8 +63,10 @@ public class BaseInfoRegionController extends BladeController {
 	private final IRegionService regionService;
 	private final IEtlAdCdService etlAdCdService;
 	private final IOrgRegionInfoService iOrgRegionInfoService;
-	@Resource
+	@Autowired
 	private RedisTemplate redisTemplate;
+	@Autowired
+	private DataTaskManager dataTaskManager;
 
 	@GetMapping("/lazy-tree")
 	@ApiImplicitParams({
@@ -129,8 +130,9 @@ public class BaseInfoRegionController extends BladeController {
 		if (BusinessConstant.ROLE_ORG_ADMIN.equals(user.getRoleName()) || BusinessConstant.ROLE_ORG_SERVICE_PERSON.equals(user.getRoleName())) {
 			String regionJson = opsHash.get("region." + user.getDeptId());
 			if (null != regionJson) {
-				nodeEntities = JSON.parseObject(regionJson,new TypeReference<List<RegionTreeNodeEntity>>() {});
-			}else {
+				nodeEntities = JSON.parseObject(regionJson, new TypeReference<List<RegionTreeNodeEntity>>() {
+				});
+			} else {
 				LambdaQueryWrapper<OrgRegionInfoEntity> queryWrapper = Wrappers.<OrgRegionInfoEntity>query().lambda();
 				queryWrapper.eq(OrgRegionInfoEntity::getParentCode, "00");
 				queryWrapper.eq(OrgRegionInfoEntity::getDeptId, Func.toLong(user.getDeptId()));
@@ -156,8 +158,9 @@ public class BaseInfoRegionController extends BladeController {
 		} else {
 			String regionJson = opsHash.get("region.admin");
 			if (null != regionJson) {
-				nodeEntities = JSON.parseObject(regionJson,new TypeReference<List<RegionTreeNodeEntity>>() {});
-			}else {
+				nodeEntities = JSON.parseObject(regionJson, new TypeReference<List<RegionTreeNodeEntity>>() {
+				});
+			} else {
 				LambdaQueryWrapper<RegionInfoEntity> queryWrapper = Wrappers.<RegionInfoEntity>query().lambda();
 				queryWrapper.eq(RegionInfoEntity::getParentCode, "00");
 				List<RegionInfoEntity> list = iBaseInfoRegionService.list(queryWrapper);
@@ -241,57 +244,6 @@ public class BaseInfoRegionController extends BladeController {
 		return true;
 	}
 
-
-	/**
-	 * 多表联合查询列表，不分页
-	 */
-//	@GetMapping("/list")
-//	@ApiOperationSupport(order = 2)
-//	@ApiOperation(value = "不分页")
-//	public R<IPage<RtuInfoVO>> list(Query query) {
-//		LambdaQueryWrapper<RtuInfoEntity> wrapper = Wrappers.<RtuInfoEntity>query().lambda();
-//		BladeUser user = AuthUtil.getUser();
-//		if (BusinessConstant.ROLE_ADMIN.equals(user.getRoleName())) {
-//		} else if (BusinessConstant.ROLE_ORG_ADMIN.equals(user.getRoleName()) || BusinessConstant.ROLE_ORG_SERVICE_PERSON.equals(user.getRoleName())) {
-//			wrapper.eq(RtuInfoEntity::getOrgId,user.getDeptId());
-//		}
-//		wrapper.eq(RtuInfoEntity::getIsDeleted,0);
-//		wrapper.orderByAsc(RtuInfoEntity::getOrgId);
-//		wrapper.orderByAsc(RtuInfoEntity::getProjectId);
-//		wrapper.orderByAsc(RtuInfoEntity::getRtuCode);
-//
-//		IPage<RegionInfoEntity> pages = baseInfoRegionService.page(Condition.getPage(query),wrapper);
-//		return R.data(RegionInfoNodeWrapper.build().pageVO(pages));
-//	}
-
-	/**
-	 * 多表联合查询自定义分页
-	 */
-//	@GetMapping("/page")
-//	@ApiImplicitParams({
-//		@ApiImplicitParam(name = "projectName", value = "项目名称", paramType = "query", dataType = "long"),
-//		@ApiImplicitParam(name = "rtuName", value = "测站名称", paramType = "query", dataType = "string"),
-//		@ApiImplicitParam(name = "rtuCode", value = "测站编码", paramType = "query", dataType = "string"),
-//	})
-//	@ApiOperationSupport(order = 3)
-//	@ApiOperation(value = "分页")
-//	public R<IPage<RtuInfoVO>> page(@ApiIgnore RtuInfoDTO rtuInfoDTO, Query query) {
-//
-//		BladeUser user = AuthUtil.getUser();
-//		if (BusinessConstant.ROLE_ADMIN.equals(user.getRoleName())) {
-//		} else if (BusinessConstant.ROLE_ORG_ADMIN.equals(user.getRoleName()) || BusinessConstant.ROLE_ORG_SERVICE_PERSON.equals(user.getRoleName())) {
-//			rtuInfoDTO.setOrgId(Func.toLong(user.getDeptId()));
-//		}
-//
-//		IPage<RtuInfoVO> pages = rtuBaseInfoService.selectPage(Condition.getPage(query),rtuInfoDTO);
-//		List<RtuInfoVO> list = pages.getRecords();
-//		for (RtuInfoVO rtuInfoVO : list) {
-//			RtuInfoWrapper.build().appendInfo(rtuInfoVO);
-//		}
-//		return R.data(pages);
-//	}
-
-
 	/**
 	 * 详情
 	 */
@@ -305,27 +257,6 @@ public class BaseInfoRegionController extends BladeController {
 		return R.data(RegionInfoWrapper.build().entityVO(detail));
 	}
 
-
-	/**
-	 * 新增
-	 */
-//	@PostMapping("/save")
-//	@ApiOperationSupport(order = 4)
-//	@ApiOperation(value = "新增", notes = "传入rtuInfoEntity")
-//	public R save(@RequestBody RtuInfoEntity rtuInfoEntity) {
-//		return R.status(rtuBaseInfoService.save(rtuInfoEntity));
-//	}
-
-	/**
-	 * 修改
-	 */
-//	@PostMapping("/update")
-//	@ApiOperationSupport(order = 5)
-//	@ApiOperation(value = "修改", notes = "传入rtuInfoEntity")
-//	public R update(@RequestBody RtuInfoEntity rtuInfoEntity) {
-//		return R.status(rtuBaseInfoService.updateById(rtuInfoEntity));
-//	}
-
 	/**
 	 * 新增或修改
 	 */
@@ -333,18 +264,17 @@ public class BaseInfoRegionController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入RegionInfoDTO")
 	public R submit(@RequestBody RegionInfoDTO regionInfoDTO) {
-
 		LambdaQueryWrapper<RegionInfoEntity> queryWrapper = Wrappers.<RegionInfoEntity>query().lambda();
 		queryWrapper.eq(RegionInfoEntity::getAdcd, regionInfoDTO.getCode());
 		queryWrapper.eq(RegionInfoEntity::getIsDeleted, 0);
 		RegionInfoEntity entity = iBaseInfoRegionService.getOne(queryWrapper);
-
+		boolean status = false;
 		if (entity != null) {
 			entity.setAdcd(regionInfoDTO.getCode());
 			entity.setAdnm(regionInfoDTO.getName());
 			entity.setStatus(1);
 			entity.setIsDeleted(0);
-			return R.status(iBaseInfoRegionService.updateById(entity));
+			status = iBaseInfoRegionService.updateById(entity);
 		} else {
 			entity = new RegionInfoEntity();
 			entity.setAdcd(regionInfoDTO.getCode());
@@ -352,11 +282,11 @@ public class BaseInfoRegionController extends BladeController {
 			entity.setParentCode(regionInfoDTO.getParentCode());
 			entity.setStatus(1);
 			entity.setIsDeleted(0);
-
 			entity.setAncestors(regionInfoDTO.getAncestors() + "," + regionInfoDTO.getParentCode());
-			return R.status(iBaseInfoRegionService.save(entity));
+			status = iBaseInfoRegionService.save(entity);
 		}
-
+		dataTaskManager.deptUpdateTask();
+		return R.status(status);
 	}
 
 	/**
@@ -369,55 +299,12 @@ public class BaseInfoRegionController extends BladeController {
 		LambdaUpdateWrapper<RegionInfoEntity> queryWrapper = Wrappers.<RegionInfoEntity>update().lambda();
 		queryWrapper.eq(RegionInfoEntity::getAdcd, id);
 		boolean temp = iBaseInfoRegionService.remove(queryWrapper);
+		dataTaskManager.deptUpdateTask();
 		return R.status(temp);
 	}
 
-//	@GetMapping("/dict/list")
-//	@ApiOperationSupport(order = 2)
-//	@ApiOperation(value = "分页")
-//	public R<List<DictBiz>> dictList(@RequestParam String code) {
-//		List<DictBiz> dicts = DictBizCache.getList(code);
-//
-//		return R.data(dicts);
-//	}
-
-
 	/**
-	 * 按机构统计测站信息
-	 * @return
-	 */
-//	@GetMapping("/statistics")
-//	@ApiOperationSupport(order = 2)
-//	@ApiOperation(value = "分页")
-//	public R<List<RtuStatisticsInfoVO>> rtuStatistics() {
-//		List<RtuStatisticsInfoVO> list = new LinkedList<>();
-//		BladeUser user = AuthUtil.getUser();
-//		List<Dept> root = this.deptService.getDeptChild(Func.toLong(user.getDeptId()));
-//
-//		for (Dept dept : root) {
-//			RtuStatisticsInfoVO rtuStatisticsInfoVO = new RtuStatisticsInfoVO();
-//			rtuStatisticsInfoVO.setId(dept.getId());
-//			rtuStatisticsInfoVO.setOrgName(dept.getDeptName());
-//			LambdaQueryWrapper<RtuInfoEntity> wrapper = Wrappers.<RtuInfoEntity>query().lambda();
-//			wrapper.eq(RtuInfoEntity::getOrgId,dept.getId());
-//			wrapper.eq(RtuInfoEntity::getIsDeleted,0);
-//			Long rtus =rtuBaseInfoService.count(wrapper);
-//			rtuStatisticsInfoVO.setRtuCount(rtus);
-//
-//			RtuWarningInfoDTO rtuWarningInfoDTO=new RtuWarningInfoDTO();
-//			rtuWarningInfoDTO.setOrgId(dept.getId());
-//			Long warningRtus = rtuWarningService.warningRtuCount(rtuWarningInfoDTO);
-//			rtuStatisticsInfoVO.setWarningRtuCount(warningRtus);
-//
-//			list.add(rtuStatisticsInfoVO);
-//		}
-//
-//		return R.data(list);
-	//}
-
-
-	/**
-	 * 新增或修改
+	 * 从宏图数据导入
 	 */
 	@PostMapping("/import")
 	@ApiImplicitParams({
@@ -433,12 +320,8 @@ public class BaseInfoRegionController extends BladeController {
 			updateWrapper.eq(RegionInfoEntity::getIsDeleted, 0);
 			iBaseInfoRegionService.remove(updateWrapper);
 		}
-		//	LambdaQueryWrapper<EtlAdCdEntity> wrapper = Wrappers.<EtlAdCdEntity>query().lambda();
-		//wrapper.eq(EtlAdCdEntity::getSuperioradcd, "0");
 		List<EtlAdCdEntity> list = etlAdCdService.selectList("0");
-
 		if (null != list && list.size() == 1) {
-
 			String code = list.get(0).getAdcd();
 			LambdaQueryWrapper<RegionInfoEntity> requestWrapper = Wrappers.<RegionInfoEntity>query().lambda();
 			requestWrapper.eq(RegionInfoEntity::getAdcd, code);
@@ -459,6 +342,7 @@ public class BaseInfoRegionController extends BladeController {
 			}
 			importAdcd(regionInfoDTO.getRegionLevel(), 2, code, "00," + code);
 		}
+		dataTaskManager.deptUpdateTask();
 		return R.status(true);
 	}
 
@@ -466,12 +350,8 @@ public class BaseInfoRegionController extends BladeController {
 		if (currLevel > level) {
 			return true;
 		}
-//		LambdaQueryWrapper<EtlAdCdEntity> wrapper = Wrappers.<EtlAdCdEntity>query().lambda();
-//		wrapper.eq(EtlAdCdEntity::getSuperioradcd, parentCode);
 		List<EtlAdCdEntity> list = etlAdCdService.selectList(parentCode);
-
 		if (null != list && list.size() > 0) {
-
 			for (EtlAdCdEntity adCdEntity : list) {
 				LambdaQueryWrapper<RegionInfoEntity> requestWrapper = Wrappers.<RegionInfoEntity>query().lambda();
 				requestWrapper.eq(RegionInfoEntity::getAdcd, adCdEntity.getAdcd());
@@ -490,11 +370,8 @@ public class BaseInfoRegionController extends BladeController {
 					regionInfoEntity.setIsDeleted(0);
 					iBaseInfoRegionService.save(regionInfoEntity);
 				}
-
 				importAdcd(level, currLevel + 1, adCdEntity.getAdcd(), ancestors + "," + adCdEntity.getAdcd());
-
 			}
-
 		}
 		return true;
 	}

src/main/java/org/springblade/modules/baseinfo/region/entity/OrgRegionInfoEntity.java

@@ -8,7 +8,6 @@ package org.springblade.modules.baseinfo.region.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;

src/main/java/org/springblade/modules/baseinfo/region/mapper/RegionInfoMapper.java

@@ -7,14 +7,8 @@
 package org.springblade.modules.baseinfo.region.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.ibatis.annotations.Param;
 import org.springblade.modules.baseinfo.region.entity.RegionInfoEntity;
-import org.springblade.modules.business.rtu.base.dto.RtuInfoDTO;
-import org.springblade.modules.business.rtu.base.entity.RtuInfoEntity;
-import org.springblade.modules.business.rtu.base.vo.RtuInfoVO;
 
-import java.util.List;
 
 /***
  * Date:2022/8/22

src/main/java/org/springblade/modules/baseinfo/region/service/IBaseInfoRegionService.java

@@ -6,12 +6,10 @@
  */
 package org.springblade.modules.baseinfo.region.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
+
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.modules.baseinfo.region.entity.RegionInfoEntity;
-import org.springblade.modules.business.rtu.base.dto.RtuInfoDTO;
-import org.springblade.modules.business.rtu.base.entity.RtuInfoEntity;
-import org.springblade.modules.business.rtu.base.vo.RtuInfoVO;
+
 
 /***
  * Date:2022/8/22

src/main/java/org/springblade/modules/baseinfo/region/wrapper/RegionInfoWrapper.java

@@ -13,10 +13,9 @@ import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.modules.baseinfo.region.entity.RegionInfoEntity;
-import org.springblade.modules.baseinfo.region.entity.RegionTreeNodeEntity;
 import org.springblade.modules.baseinfo.region.service.IBaseInfoRegionService;
 import org.springblade.modules.baseinfo.region.vo.RegionInfoVO;
-import org.springblade.modules.business.desk.vo.NoticeVO;
+
 
 import java.util.Objects;
 

src/main/java/org/springblade/modules/business/project/servicePerson/controller/ProjectServicePersonController.java → src/main/java/org/springblade/modules/baseinfo/servicePerson/controller/ProjectServicePersonController.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/22
  */
-package org.springblade.modules.business.project.servicePerson.controller;
+package org.springblade.modules.baseinfo.servicePerson.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -12,11 +12,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
-import org.flowable.idm.engine.impl.persistence.entity.UserEntity;
-import org.flowable.spring.security.UserDto;
 import org.springblade.constant.BusinessConstant;
 import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -24,18 +21,16 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DigestUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.business.project.base.entity.ProjectInfoEntity;
-import org.springblade.modules.business.project.servicePerson.entity.ServicePersonEntity;
-import org.springblade.modules.business.project.servicePerson.service.IProjectServicePersonService;
-import org.springblade.modules.business.project.servicePerson.vo.OrgPersonContactVO;
-import org.springblade.modules.business.project.servicePerson.vo.ServicePersonVO;
-import org.springblade.modules.business.project.servicePerson.wrapper.ProjectServicePersonWrapper;
-import org.springblade.modules.business.rtu.base.dto.RtuInfoDTO;
+import org.springblade.modules.baseinfo.project.entity.ProjectInfoEntity;
+import org.springblade.modules.baseinfo.servicePerson.entity.ServicePersonEntity;
+import org.springblade.modules.baseinfo.servicePerson.service.IProjectServicePersonService;
+import org.springblade.modules.baseinfo.servicePerson.vo.OrgPersonContactVO;
+import org.springblade.modules.baseinfo.servicePerson.vo.ServicePersonVO;
+import org.springblade.modules.baseinfo.servicePerson.wrapper.ProjectServicePersonWrapper;
 import org.springblade.modules.system.entity.Dept;
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.service.IDeptService;
 import org.springblade.modules.system.service.IUserService;
-import org.springframework.util.DigestUtils;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -185,17 +180,29 @@ public class ProjectServicePersonController extends BladeController {
 	@ApiOperation(value = "通讯录")
 	public R<List<OrgPersonContactVO>> contact() {
 		BladeUser user = AuthUtil.getUser();
-		List<Dept> root = this.deptService.getDeptChild(Func.toLong(user.getDeptId()));
 		List<OrgPersonContactVO> list = new LinkedList<>();
-		for (Dept dept : root) {
+		if (BusinessConstant.ROLE_ORG_ADMIN.equals(user.getRoleName()) || BusinessConstant.ROLE_ORG_SERVICE_PERSON.equals(user.getRoleName())) {
 			OrgPersonContactVO contactVO = new OrgPersonContactVO();
-			contactVO.setId(dept.getId());
+			contactVO.setId(Func.toLong(user.getDeptId()));
+			Dept dept = this.deptService.getById(contactVO.getId());
 			contactVO.setOrgName(dept.getDeptName());
 			ServicePersonEntity personEntity = new ServicePersonEntity();
 			personEntity.setOrgId(contactVO.getId());
 			List<ServicePersonVO> personVOList = this.servicePersonService.selectAllList(personEntity);
 			contactVO.setServicePersonVOList(personVOList);
 			list.add(contactVO);
+		} else {
+			List<Dept> root = this.deptService.getDeptChild(Func.toLong(user.getDeptId()));
+			for (Dept dept : root) {
+				OrgPersonContactVO contactVO = new OrgPersonContactVO();
+				contactVO.setId(dept.getId());
+				contactVO.setOrgName(dept.getDeptName());
+				ServicePersonEntity personEntity = new ServicePersonEntity();
+				personEntity.setOrgId(contactVO.getId());
+				List<ServicePersonVO> personVOList = this.servicePersonService.selectAllList(personEntity);
+				contactVO.setServicePersonVOList(personVOList);
+				list.add(contactVO);
+			}
 		}
 		return R.data(list);
 	}

src/main/java/org/springblade/modules/business/project/servicePerson/entity/ServicePersonEntity.java → src/main/java/org/springblade/modules/baseinfo/servicePerson/entity/ServicePersonEntity.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/22
  */
-package org.springblade.modules.business.project.servicePerson.entity;
+package org.springblade.modules.baseinfo.servicePerson.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/org/springblade/modules/business/project/servicePerson/mapper/ProjectServicePersonMapper.java → src/main/java/org/springblade/modules/baseinfo/servicePerson/mapper/ProjectServicePersonMapper.java

@@ -4,13 +4,15 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/22
  */
-package org.springblade.modules.business.project.servicePerson.mapper;
+package org.springblade.modules.baseinfo.servicePerson.mapper;
+
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.modules.business.project.servicePerson.entity.ServicePersonEntity;
-import org.springblade.modules.business.project.servicePerson.vo.ServicePersonVO;
+import org.springblade.modules.baseinfo.servicePerson.entity.ServicePersonEntity;
+import org.springblade.modules.baseinfo.servicePerson.vo.ServicePersonVO;
+
 
 import java.util.List;
 

src/main/java/org/springblade/modules/business/project/servicePerson/mapper/ProjectServicePersonMapper.xml → src/main/java/org/springblade/modules/baseinfo/servicePerson/mapper/ProjectServicePersonMapper.xml

@@ -1,9 +1,9 @@
 <?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.modules.business.project.servicePerson.mapper.ProjectServicePersonMapper">
+<mapper namespace="org.springblade.modules.baseinfo.servicePerson.mapper.ProjectServicePersonMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="servicePersonResultMap" type="org.springblade.modules.business.project.servicePerson.entity.ServicePersonEntity">
+    <resultMap id="servicePersonResultMap" type="org.springblade.modules.baseinfo.servicePerson.entity.ServicePersonEntity">
         <result column="id" property="id"/>
         <result column="create_user" property="createUser"/>
         <result column="create_time" property="createTime"/>
@@ -19,7 +19,7 @@
         <result column="user_account" property="userAccount"/>
     </resultMap>
 
-    <resultMap id="servicePersonVOResultMap" type="org.springblade.modules.business.project.servicePerson.vo.ServicePersonVO">
+    <resultMap id="servicePersonVOResultMap" type="org.springblade.modules.baseinfo.servicePerson.vo.ServicePersonVO">
         <result column="id" property="id"/>
         <result column="create_user" property="createUser"/>
         <result column="create_time" property="createTime"/>
@@ -69,11 +69,11 @@
         r.role_name,d.dept_name
         FROM
         blade_user u
-        LEFT JOIN project_service_person p ON u.id = p.user_id and u.is_deleted = 0
+        LEFT JOIN project_service_person p ON u.id = p.user_id and p.is_deleted = 0
         LEFT JOIN blade_role r ON r.id = u.role_id and r.is_deleted = 0
         LEFT JOIN blade_dept d ON u.dept_id = d.id and d.is_deleted = 0
         WHERE
-        p.is_deleted = 0
+        u.is_deleted = 0
         <if test="entity.personName!=null">
             and p.person_name like concat(concat('%', #{entity.personName}), '%')
         </if>
@@ -84,6 +84,6 @@
             and u.dept_id =#{entity.orgId}
         </if>
         ORDER BY
-        p.person_name
+        u.name,u.real_name
     </select>
 </mapper>

src/main/java/org/springblade/modules/business/project/servicePerson/service/IProjectServicePersonService.java → src/main/java/org/springblade/modules/baseinfo/servicePerson/service/IProjectServicePersonService.java

@@ -4,13 +4,13 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/22
  */
-package org.springblade.modules.business.project.servicePerson.service;
+package org.springblade.modules.baseinfo.servicePerson.service;
+
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.modules.business.project.servicePerson.entity.ServicePersonEntity;
-import org.springblade.modules.business.project.servicePerson.vo.ServicePersonVO;
-import org.springblade.modules.business.rtu.base.vo.RtuInfoVO;
+import org.springblade.modules.baseinfo.servicePerson.entity.ServicePersonEntity;
+import org.springblade.modules.baseinfo.servicePerson.vo.ServicePersonVO;
 
 import java.util.List;
 
@@ -24,5 +24,5 @@ import java.util.List;
  */
 public interface IProjectServicePersonService extends BaseService<ServicePersonEntity> {
 	IPage<ServicePersonVO> selectPage(IPage<ServicePersonVO> page, ServicePersonEntity entity);
-	List<ServicePersonVO> selectAllList( ServicePersonEntity entity);
+	List<ServicePersonVO> selectAllList(ServicePersonEntity entity);
 }

src/main/java/org/springblade/modules/business/project/servicePerson/service/impl/ProjectServicePersonServiceImpl.java → src/main/java/org/springblade/modules/baseinfo/servicePerson/service/impl/ProjectServicePersonServiceImpl.java

@@ -4,18 +4,19 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/22
  */
-package org.springblade.modules.business.project.servicePerson.service.impl;
+package org.springblade.modules.baseinfo.servicePerson.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.modules.business.project.servicePerson.entity.ServicePersonEntity;
-import org.springblade.modules.business.project.servicePerson.mapper.ProjectServicePersonMapper;
-import org.springblade.modules.business.project.servicePerson.service.IProjectServicePersonService;
-import org.springblade.modules.business.project.servicePerson.vo.ServicePersonVO;
+import org.springblade.modules.baseinfo.servicePerson.entity.ServicePersonEntity;
+import org.springblade.modules.baseinfo.servicePerson.mapper.ProjectServicePersonMapper;
+import org.springblade.modules.baseinfo.servicePerson.service.IProjectServicePersonService;
+import org.springblade.modules.baseinfo.servicePerson.vo.ServicePersonVO;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
+
 /***
  * Date:2022/8/22
  * Title:文件所属模块（必须填写）
@@ -25,7 +26,7 @@ import java.util.List;
  * Remark：认为有必要的其他信息
  */
 @Service
-public class ProjectServicePersonServiceImpl  extends BaseServiceImpl<ProjectServicePersonMapper,ServicePersonEntity> implements IProjectServicePersonService {
+public class ProjectServicePersonServiceImpl extends BaseServiceImpl<ProjectServicePersonMapper, ServicePersonEntity> implements IProjectServicePersonService {
 
 
 	@Override

src/main/java/org/springblade/modules/business/project/servicePerson/vo/OrgPersonContactVO.java → src/main/java/org/springblade/modules/baseinfo/servicePerson/vo/OrgPersonContactVO.java

@@ -4,13 +4,13 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/22
  */
-package org.springblade.modules.business.project.servicePerson.vo;
+package org.springblade.modules.baseinfo.servicePerson.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.modules.business.project.servicePerson.entity.ServicePersonEntity;
+
 
 import java.util.List;
 

src/main/java/org/springblade/modules/business/project/servicePerson/vo/ServicePersonVO.java → src/main/java/org/springblade/modules/baseinfo/servicePerson/vo/ServicePersonVO.java

@@ -4,12 +4,13 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/22
  */
-package org.springblade.modules.business.project.servicePerson.vo;
+package org.springblade.modules.baseinfo.servicePerson.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.modules.business.project.servicePerson.entity.ServicePersonEntity;
+import org.springblade.modules.baseinfo.servicePerson.entity.ServicePersonEntity;
+
 
 /***
  * Date:2022/8/22

src/main/java/org/springblade/modules/business/project/servicePerson/wrapper/ProjectServicePersonWrapper.java → src/main/java/org/springblade/modules/baseinfo/servicePerson/wrapper/ProjectServicePersonWrapper.java

@@ -4,12 +4,13 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/22
  */
-package org.springblade.modules.business.project.servicePerson.wrapper;
+package org.springblade.modules.baseinfo.servicePerson.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.modules.business.project.servicePerson.entity.ServicePersonEntity;
-import org.springblade.modules.business.project.servicePerson.vo.ServicePersonVO;
+import org.springblade.modules.baseinfo.servicePerson.entity.ServicePersonEntity;
+import org.springblade.modules.baseinfo.servicePerson.vo.ServicePersonVO;
+
 
 import java.util.Objects;
 

src/main/java/org/springblade/modules/baseinfo/stbase/entity/MvAttStBaseEntity.java

@@ -8,6 +8,7 @@ package org.springblade.modules.baseinfo.stbase.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
@@ -32,9 +33,40 @@ public class MvAttStBaseEntity extends BaseEntity {
 	@ApiModelProperty("测站名称")
 	private String stName;
 
+	@ApiModelProperty("类型")
+	private String stType;
+
+	@ApiModelProperty("经度")
+	private Double stLong;
+
+	@ApiModelProperty("纬度")
+	private Double stLat;
+
+	@ApiModelProperty("站址")
+	private String stSite;
+
 	@ApiModelProperty("行政区划代码")
 	private String adCode;
 
 	@ApiModelProperty("行政区划名称")
 	private String adName;
+
+	@ApiModelProperty("流域代码")
+	private String rvCode;
+
+	@ApiModelProperty("流域名称")
+	private String rvName;
+
+	@ApiModelProperty("是否雨情站")
+	private Integer isRain;
+
+	@ApiModelProperty("是否河道")
+	private Integer isRiver;
+
+	@ApiModelProperty("是否水库")
+	private Integer isRes;
+
+	@ApiModelProperty("雨量站类型(QX, SH, SW)")
+	private String rainStType;
+
 }

src/main/java/org/springblade/modules/business/check/order/controller/RtuCheckOrderController.java

@@ -7,7 +7,6 @@
 package org.springblade.modules.business.check.order.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -15,8 +14,8 @@ import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import org.springblade.common.cache.DictBizCache;
 import org.springblade.constant.BusinessConstant;
+import org.springblade.constant.DictBusinessConstant;
 import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -25,10 +24,13 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.ConcurrentDateFormat;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.enums.*;
+import org.springblade.modules.baseinfo.dict.entity.DictInfoEntity;
+import org.springblade.modules.baseinfo.dict.service.IBaseInfoDictService;
+import org.springblade.modules.baseinfo.rtu.entity.RtuInfoEntity;
+import org.springblade.modules.baseinfo.rtu.service.IRtuBaseInfoService;
 import org.springblade.modules.baseinfo.stbase.service.IMvAttStBaseService;
 import org.springblade.modules.business.check.order.dto.CheckOrderInfoDTO;
 import org.springblade.modules.business.check.order.entity.CheckOrderInfoEntity;
-import org.springblade.modules.business.check.order.mapper.RtuCheckOrderMapper;
 import org.springblade.modules.business.check.order.service.IRtuCheckOrderService;
 import org.springblade.modules.business.check.order.vo.CheckOrderCountVO;
 import org.springblade.modules.business.check.order.vo.CheckOrderInfoVO;
@@ -36,23 +38,15 @@ import org.springblade.modules.business.check.order.vo.OrgCheckOrderCountVO;
 import org.springblade.modules.business.check.order.wrapper.RtuCheckOrderWrapper;
 import org.springblade.modules.business.check.process.entity.OrderProcessInfoEntity;
 import org.springblade.modules.business.check.process.service.IRtuOrderProcessService;
-import org.springblade.modules.business.check.process.vo.OrderProcessInfoVO;
-import org.springblade.modules.business.check.process.wrapper.RtuOrderProcessWrapper;
-import org.springblade.modules.business.equipment.inspection.plan.entity.EquipmentInspectionPlanEntity;
-import org.springblade.modules.business.project.base.entity.ProjectTreeNodeEntity;
-import org.springblade.modules.business.rtu.base.entity.RtuInfoEntity;
-import org.springblade.modules.business.rtu.base.service.IRtuBaseInfoService;
-import org.springblade.modules.business.rtu.base.vo.RtuStatisticsInfoVO;
-import org.springblade.modules.business.rtu.data.entity.RtuDataRainEntity;
-import org.springblade.modules.business.rtu.data.entity.RtuDataRiverEntity;
-import org.springblade.modules.business.rtu.data.entity.RtuDataRsvrEntity;
-import org.springblade.modules.business.rtu.data.service.IRtuDataGroundService;
-import org.springblade.modules.business.rtu.data.service.IRtuDataRainService;
-import org.springblade.modules.business.rtu.data.service.IRtuDataRiverService;
-import org.springblade.modules.business.rtu.data.service.IRtuDataRsvrService;
+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.springblade.modules.business.rtumanage.service.IRtuManageService;
-import org.springblade.modules.business.warning.dto.RtuWarningInfoDTO;
 import org.springblade.modules.business.warning.entity.RtuWarningInfoEntity;
 import org.springblade.modules.business.warning.service.IRtuWarningService;
 import org.springblade.modules.system.entity.Dept;
@@ -96,6 +90,7 @@ public class RtuCheckOrderController extends BladeController {
 	private final IRtuDataRsvrService iRtuDataRsvrService;
 	private final IRtuDataGroundService iRtuDataGroundService;
 	private final IRtuManageService iRtuManageService;
+	private final IBaseInfoDictService dictService;
 
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 3)
@@ -291,14 +286,8 @@ public class RtuCheckOrderController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入checkOrderInfoEntity")
 	public R save(@RequestBody CheckOrderInfoEntity checkOrderInfoEntity) {
-		List<DictBiz> statusdicts = DictBizCache.getList("rtu_check_order_status");
-		for (DictBiz biz : statusdicts) {
-			if (biz.getDictKey().equals("" + OrderStatusEnum.STATUS_CREATE.getCode())) {
-				checkOrderInfoEntity.setOrderStatusKey(biz.getId());
-				break;
-			}
-		}
-
+		DictInfoEntity dictInfoEntity=dictService.getDict(DictBusinessConstant.ORDER_STATUS_CODE,OrderStatusEnum.STATUS_CREATE.getCode());
+		checkOrderInfoEntity.setOrderStatusKey(dictInfoEntity.getId());
 		checkOrderService.save(checkOrderInfoEntity);
 		OrderProcessInfoEntity processInfoEntity = new OrderProcessInfoEntity();
 		processInfoEntity.setOrderId(checkOrderInfoEntity.getId());
@@ -353,26 +342,22 @@ public class RtuCheckOrderController extends BladeController {
 	@ApiOperation(value = "工单关闭", notes = "传入checkOrderInfoEntity")
 	public R orderClose(@ApiIgnore CheckOrderInfoEntity checkOrderInfoEntity) {
 		BladeUser user = AuthUtil.getUser();
-		List<DictBiz> statusdicts = dictBizService.getList("rtu_check_order_status");
-		for (DictBiz biz : statusdicts) {
-			if (biz.getDictKey().equals("" + OrderStatusEnum.STATUS_CLOSE.getCode())) {
-				checkOrderInfoEntity.setOrderStatusKey(biz.getId());
-				break;
-			}
-		}
+		DictInfoEntity dictInfoEntity=dictService.getDict(DictBusinessConstant.ORDER_STATUS_CODE,OrderStatusEnum.STATUS_CLOSE.getCode());
+		checkOrderInfoEntity.setOrderStatusKey(dictInfoEntity.getId());
 		CheckOrderInfoEntity detail = this.checkOrderService.getById(checkOrderInfoEntity.getId());
 		if (null == detail || detail.getOrderClose() == OrderCloseEnum.ACTIVE_CLOSE.getCode()) {
 			return R.status(false);
 		}
 		detail.setOrderStatusKey(checkOrderInfoEntity.getOrderStatusKey());
 		detail.setOrderClose(OrderCloseEnum.ACTIVE_CLOSE.getCode());
+		detail.setOrderConfirm(OrderConfirmEnum.ACTIVE_CONFIRM.getCode());
 		detail.setUpdateTime(new Date());
 		detail.setUpdateUser(user.getUserId());
 		checkOrderService.updateById(detail);
 		OrderProcessInfoEntity processInfoEntity = new OrderProcessInfoEntity();
 		processInfoEntity.setOrderId(detail.getId());
 		processInfoEntity.setOrderStatusKey(detail.getOrderStatusKey());
-		processInfoEntity.setProcessDesc(checkOrderInfoEntity.getOrderDesc());
+		processInfoEntity.setProcessDesc("由["+user.getNickName()+"]人工关闭维修任务:"+checkOrderInfoEntity.getOrderDesc());
 		processInfoEntity.setCreateUser(user.getUserId());
 		processInfoEntity.setUpdateUser(user.getUserId());
 		processService.save(processInfoEntity);
@@ -424,32 +409,24 @@ public class RtuCheckOrderController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "工单确认", notes = "传入checkOrderInfoEntity")
 	public R orderConfirm(@RequestBody CheckOrderInfoEntity checkOrderInfoEntity) {
-		List<DictBiz> statusdicts = DictBizCache.getList("rtu_check_order_status");
-		for (DictBiz biz : statusdicts) {
-			if (biz.getDictKey().equals("" + OrderStatusEnum.STATUS_CONFIRM.getCode())) {
-				checkOrderInfoEntity.setOrderStatusKey(biz.getId());
-				break;
-			}
-		}
+		DictInfoEntity dictInfoEntity=dictService.getDict(DictBusinessConstant.ORDER_STATUS_CODE,OrderStatusEnum.STATUS_CONFIRM.getCode());
+		checkOrderInfoEntity.setOrderStatusKey(dictInfoEntity.getId());
 		BladeUser user = AuthUtil.getUser();
 		User userInfo = userService.getById(user.getUserId());
-
 		CheckOrderInfoEntity detail = this.checkOrderService.getById(checkOrderInfoEntity.getId());
 		if (null == detail || null != detail.getOrderConfirmUser()) {
 			return R.status(false);
 		}
-
 		detail.setOrderConfirm(OrderConfirmEnum.ACTIVE_CONFIRM.getCode());
 		detail.setOrderStatusKey(checkOrderInfoEntity.getOrderStatusKey());
 		detail.setOrderConfirmUser(user.getUserId());
 		detail.setOrderConfirmTime(new Date());
 		detail.setUpdateTime(new Date());
 		checkOrderService.updateById(detail);
-
 		OrderProcessInfoEntity processInfoEntity = new OrderProcessInfoEntity();
 		processInfoEntity.setOrderId(checkOrderInfoEntity.getId());
 		processInfoEntity.setOrderStatusKey(checkOrderInfoEntity.getOrderStatusKey());
-		processInfoEntity.setProcessDesc("工单确认: " + userInfo.getRealName());
+		processInfoEntity.setProcessDesc("维修任务由[" + userInfo.getRealName()+"]确认");
 		return R.status(processService.save(processInfoEntity));
 	}
 

src/main/java/org/springblade/modules/business/check/order/service/IRtuCheckOrderService.java

@@ -7,16 +7,12 @@
 package org.springblade.modules.business.check.order.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.ibatis.annotations.Param;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.modules.business.check.order.dto.CheckOrderInfoDTO;
 import org.springblade.modules.business.check.order.entity.CheckOrderInfoEntity;
 import org.springblade.modules.business.check.order.vo.CheckOrderCountVO;
 import org.springblade.modules.business.check.order.vo.CheckOrderInfoVO;
-import org.springblade.modules.business.check.process.entity.OrderProcessInfoEntity;
-import org.springblade.modules.business.project.base.entity.ProjectInfoEntity;
-import org.springblade.modules.business.rtu.base.entity.RtuInfoEntity;
-import org.springblade.modules.business.rtumanage.vo.RtuStatusVO;
+
 
 import java.util.List;
 

src/main/java/org/springblade/modules/business/check/order/wrapper/RtuCheckOrderWrapper.java

@@ -12,10 +12,6 @@ import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.business.check.order.entity.CheckOrderInfoEntity;
 import org.springblade.modules.business.check.order.vo.CheckOrderInfoVO;
-import org.springblade.modules.business.project.base.entity.ProjectInfoEntity;
-import org.springblade.modules.business.project.base.vo.ProjectInfoVO;
-import org.springblade.modules.business.project.base.wrapper.ProjectInfoWrapper;
-import org.springblade.modules.business.rtu.base.vo.RtuInfoVO;
 import org.springblade.modules.system.entity.DictBiz;
 
 import java.time.Duration;

src/main/java/org/springblade/modules/business/check/process/controller/RtuOrderProcessController.java

@@ -15,6 +15,7 @@ import lombok.AllArgsConstructor;
 import org.apache.poi.ss.usermodel.DataFormatter;
 import org.springblade.common.cache.DictBizCache;
 import org.springblade.constant.BusinessConstant;
+import org.springblade.constant.DictBusinessConstant;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.mp.support.Condition;
@@ -25,6 +26,8 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.ConcurrentDateFormat;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.enums.OrderStatusEnum;
+import org.springblade.modules.baseinfo.dict.entity.DictInfoEntity;
+import org.springblade.modules.baseinfo.dict.service.IBaseInfoDictService;
 import org.springblade.modules.business.check.order.dto.CheckOrderInfoDTO;
 import org.springblade.modules.business.check.order.entity.CheckOrderInfoEntity;
 import org.springblade.modules.business.check.order.service.IRtuCheckOrderService;
@@ -61,7 +64,7 @@ public class RtuOrderProcessController extends BladeController {
 	private final IRtuOrderProcessService rtuOrderProcessService;
 	private final IRtuCheckOrderService checkOrderService;
 	private final IUserService userService;
-
+    private final IBaseInfoDictService dictService;
 	/**
 	 * 分页
 	 */
@@ -154,14 +157,8 @@ public class RtuOrderProcessController extends BladeController {
 	public R save(@RequestBody OrderProcessInfoEntity orderProcessInfoEntity) {
 		CheckOrderInfoEntity checkOrderInfoEntity = new CheckOrderInfoEntity();
 		checkOrderInfoEntity.setId(orderProcessInfoEntity.getOrderId());
-		List<DictBiz> statusdicts = DictBizCache.getList("rtu_check_order_status");
-		for (DictBiz biz : statusdicts) {
-			if (biz.getDictKey().equals("" + OrderStatusEnum.STATUS_PROCESS.getCode())) {
-				checkOrderInfoEntity.setOrderStatusKey(biz.getId());
-				break;
-			}
-		}
-
+		DictInfoEntity dictInfoEntity=dictService.getDict(DictBusinessConstant.ORDER_STATUS_CODE,OrderStatusEnum.STATUS_PROCESS.getCode());
+		checkOrderInfoEntity.setOrderStatusKey(dictInfoEntity.getId());
 		checkOrderInfoEntity.setOrderDesc(orderProcessInfoEntity.getProcessDesc());
 		checkOrderService.updateOrderStatus(checkOrderInfoEntity);
 

src/main/java/org/springblade/modules/business/check/process/entity/OrderProcessInfoEntity.java

@@ -48,28 +48,52 @@ public class OrderProcessInfoEntity extends BaseEntity {
 	private String processDesc;
 
 	/**
-	 * 图片一是否拍摄
+	 * 维修前图片一是否拍摄
 	 */
-	@ApiModelProperty("图片一是否拍摄")
-	private Integer basePhoto1Take;
+	@ApiModelProperty("维修前图片一是否拍摄")
+	private Integer baseBeforePhoto1Take;
 
 	/**
-	 * 图片一路径
+	 * 维修前图片一路径
 	 */
-	@ApiModelProperty("图片一路径")
-	private String basePhoto1Url;
+	@ApiModelProperty("维修前图片一路径")
+	private String baseBeforePhoto1Url;
 
 	/**
-	 * 图片二是否拍摄
+	 * 维修前图片二是否拍摄
 	 */
-	@ApiModelProperty("图片二是否拍摄")
-	private Integer basePhoto2Take;
+	@ApiModelProperty("维修前图片二是否拍摄")
+	private Integer baseBeforePhoto2Take;
 
 	/**
-	 * 图片二路径
+	 * 维修前图片二路径
 	 */
-	@ApiModelProperty("图片二路径")
-	private String basePhoto2Url;
+	@ApiModelProperty("维修前图片二路径")
+	private String baseBeforePhoto2Url;
+
+	/**
+	 * 维修后图片一是否拍摄
+	 */
+	@ApiModelProperty("维修后图片一是否拍摄")
+	private Integer baseAfterPhoto1Take;
+
+	/**
+	 * 维修后图片一路径
+	 */
+	@ApiModelProperty("维修后图片一路径")
+	private String baseAfterPhoto1Url;
+
+	/**
+	 * 维修后图片二是否拍摄
+	 */
+	@ApiModelProperty("维修后图片二是否拍摄")
+	private Integer baseAfterPhoto2Take;
+
+	/**
+	 * 维修后图片二路径
+	 */
+	@ApiModelProperty("维修后图片二路径")
+	private String baseAfterPhoto2Url;
 
 	/**
 	 * 工单状态，字典
@@ -108,6 +132,18 @@ public class OrderProcessInfoEntity extends BaseEntity {
 	@ApiModelProperty("测站运行状态")
 	private Integer rtuStatus;
 
+	/**
+	 * RTU品牌
+	 */
+	@ApiModelProperty("RTU品牌")
+	private String rtuBrand;
+
+	/**
+	 * RTU型号
+	 */
+	@ApiModelProperty("RTU型号")
+	private String rtuModel;
+
 	/**
 	 * 翻斗式雨量计是否更换:0 否，1更换
 	 */
@@ -145,6 +181,18 @@ public class OrderProcessInfoEntity extends BaseEntity {
 	@ApiModelProperty("雨量计图片路径")
 	private String rainSensorPhotoUrl;
 
+	/**
+	 * 翻斗式雨量计品牌
+	 */
+	@ApiModelProperty("翻斗式雨量计品牌")
+	private String rainSensorBrand;
+
+	/**
+	 * 翻斗式雨量计型号
+	 */
+	@ApiModelProperty("翻斗式雨量计型号")
+	private String rainSensorModel;
+
 	/**
 	 * 水位计是否更换:0 否，1更换
 	 */
@@ -181,6 +229,18 @@ public class OrderProcessInfoEntity extends BaseEntity {
 	@ApiModelProperty("水位计图片路径")
 	private String waterSensorPhotoUrl;
 
+	/**
+	 * 水位计品牌
+	 */
+	@ApiModelProperty("水位计品牌")
+	private String waterSensorBrand;
+
+	/**
+	 * 水位计型号
+	 */
+	@ApiModelProperty("水位计型号")
+	private String waterSensorModel;
+
 	/**
 	 * 墒情传感器是否更换:0 否，1更换
 	 */
@@ -216,6 +276,18 @@ public class OrderProcessInfoEntity extends BaseEntity {
 	@ApiModelProperty("墒情图片路径")
 	private String groundSensorPhotoUrl;
 
+	/**
+	 * 墒情传感器品牌
+	 */
+	@ApiModelProperty("墒情传感器品牌")
+	private String groundSensorBrand;
+
+	/**
+	 * 墒情传感器型号
+	 */
+	@ApiModelProperty("墒情传感器型号")
+	private String groundSensorModel;
+
 	/**
 	 *  蓄电池是否更换:0 否，1更换
 	 */

src/main/java/org/springblade/modules/business/check/process/mapper/RtuOrderProcessMapper.xml

@@ -20,22 +20,26 @@
         <result column="rtu_replace" property="rtuReplace"/>
         <result column="rtu_desc" property="rtuDesc"/>
         <result column="rtu_status" property="rtuStatus"/>
-
+        <result column="rtu_brand" property="rtuBrand"/>
+        <result column="rtu_model" property="rtuModel"/>
         <result column="rain_sensor_replace" property="rainSensorReplace"/>
         <result column="rain_sensor_desc" property="rainSensorDesc"/>
         <result column="rain_sensor_status" property="rainSensorStatus"/>
         <result column="rain_sensor_active" property="rainSensorActive"/>
-
+        <result column="rain_sensor_brand" property="rainSensorBrand"/>
+        <result column="rain_sensor_model" property="rainSensorModel"/>
         <result column="water_sensor_replace" property="waterSensorReplace"/>
         <result column="water_sensor_desc" property="waterSensorDesc"/>
         <result column="water_level_sensor_status" property="waterLevelSensorStatus"/>
         <result column="water_level_sensor_active" property="waterLevelSensorActive"/>
-
+        <result column="water_sensor_brand" property="waterSensorBrand"/>
+        <result column="water_sensor_model" property="waterSensorModel"/>
         <result column="ground_sensor_replace_date" property="groundSensorReplace"/>
         <result column="ground_sensor_desc" property="groundSensorDesc"/>
         <result column="ground_water_sensor_status" property="groundWaterSensorStatus"/>
         <result column="ground_water_sensor_active" property="groundWaterSensorActive"/>
-
+        <result column="ground_sensor_brand" property="groundSensorBrand"/>
+        <result column="ground_sensor_model" property="groundSensorModel"/>
         <result column="battery_replace" property="batteryReplace"/>
         <result column="sun_power_replace" property="sunPowerReplace"/>
         <result column="power_desc" property="powerDesc"/>
@@ -50,11 +54,15 @@
         <result column="satellite_status" property="satelliteStatus"/>
         <result column="satellite_active" property="satelliteActive"/>
 
+        <result column="base_before_photo1_take" property="baseBeforePhoto1Take"/>
+        <result column="base_before_photo1_url" property="baseBeforePhoto1Url"/>
+        <result column="base_before_photo2_take" property="baseBeforePhoto2Take"/>
+        <result column="base_before_photo2_url" property="baseBeforePhoto2Url"/>
+        <result column="base_after_photo1_take" property="baseAfterPhoto1Take"/>
+        <result column="base_after_photo1_url" property="baseAfterPhoto1Url"/>
+        <result column="base_after_photo2_take" property="baseAfterPhoto2Take"/>
+        <result column="base_after_photo2_url" property="baseAfterPhoto2Url"/>
 
-        <result column="base_photo1_take" property="basePhoto1Take"/>
-        <result column="base_photo1_url" property="basePhoto1Url"/>
-        <result column="base_photo2_take" property="basePhoto2Take"/>
-        <result column="base_photo2_url" property="basePhoto2Url"/>
         <result column="rtu_photo_take" property="rtuPhotoTake"/>
         <result column="rtu_photo_url" property="rtuPhotoUrl"/>
         <result column="rain_sensor_photo_take" property="rainSensorPhotoTake"/>
@@ -85,18 +93,26 @@
         <result column="rtu_replace" property="rtuReplace"/>
         <result column="rtu_desc" property="rtuDesc"/>
         <result column="rtu_status" property="rtuStatus"/>
+        <result column="rtu_brand" property="rtuBrand"/>
+        <result column="rtu_model" property="rtuModel"/>
         <result column="rain_sensor_replace" property="rainSensorReplace"/>
         <result column="rain_sensor_desc" property="rainSensorDesc"/>
         <result column="rain_sensor_status" property="rainSensorStatus"/>
         <result column="rain_sensor_active" property="rainSensorActive"/>
+        <result column="rain_sensor_brand" property="rainSensorBrand"/>
+        <result column="rain_sensor_model" property="rainSensorModel"/>
         <result column="water_sensor_replace" property="waterSensorReplace"/>
         <result column="water_sensor_desc" property="waterSensorDesc"/>
         <result column="water_level_sensor_status" property="waterLevelSensorStatus"/>
         <result column="water_level_sensor_active" property="waterLevelSensorActive"/>
+        <result column="water_sensor_brand" property="waterSensorBrand"/>
+        <result column="water_sensor_model" property="waterSensorModel"/>
         <result column="ground_sensor_replace_date" property="groundSensorReplace"/>
         <result column="ground_sensor_desc" property="groundSensorDesc"/>
         <result column="ground_water_sensor_status" property="groundWaterSensorStatus"/>
         <result column="ground_water_sensor_active" property="groundWaterSensorActive"/>
+        <result column="ground_sensor_brand" property="groundSensorBrand"/>
+        <result column="ground_sensor_model" property="groundSensorModel"/>
         <result column="battery_replace" property="batteryReplace"/>
         <result column="sun_power_replace" property="sunPowerReplace"/>
         <result column="power_desc" property="powerDesc"/>
@@ -108,10 +124,14 @@
         <result column="satellite_desc" property="satelliteDesc"/>
         <result column="satellite_status" property="satelliteStatus"/>
         <result column="satellite_active" property="satelliteActive"/>
-        <result column="base_photo1_take" property="basePhoto1Take"/>
-        <result column="base_photo1_url" property="basePhoto1Url"/>
-        <result column="base_photo2_take" property="basePhoto2Take"/>
-        <result column="base_photo2_url" property="basePhoto2Url"/>
+        <result column="base_before_photo1_take" property="baseBeforePhoto1Take"/>
+        <result column="base_before_photo1_url" property="baseBeforePhoto1Url"/>
+        <result column="base_before_photo2_take" property="baseBeforePhoto2Take"/>
+        <result column="base_before_photo2_url" property="baseBeforePhoto2Url"/>
+        <result column="base_after_photo1_take" property="baseAfterPhoto1Take"/>
+        <result column="base_after_photo1_url" property="baseAfterPhoto1Url"/>
+        <result column="base_after_photo2_take" property="baseAfterPhoto2Take"/>
+        <result column="base_after_photo2_url" property="baseAfterPhoto2Url"/>
         <result column="rtu_photo_take" property="rtuPhotoTake"/>
         <result column="rtu_photo_url" property="rtuPhotoUrl"/>
         <result column="rain_sensor_photo_take" property="rainSensorPhotoTake"/>
@@ -142,9 +162,7 @@
         <if test="checkOrderInfoDTO.id!=null">
             and p.order_id =#{checkOrderInfoDTO.id}
         </if>
-
         order by p.create_time desc
-
     </select>
 
     <select id="selectTodayProcessList" resultMap="orderProcessInfoVOResultMap">
@@ -161,13 +179,10 @@
         <if test="processInfoDTO.orgId!=null">
             and r.org_id =#{processInfoDTO.orgId}
         </if>
-
         <if test="processInfoDTO.createTime!=null">
             and p.create_time >= #{processInfoDTO.createTime}
         </if>
-
         order by p.create_time desc
-
     </select>
 
 </mapper>

src/main/java/org/springblade/modules/business/check/process/wrapper/RtuOrderProcessWrapper.java

@@ -9,12 +9,8 @@ package org.springblade.modules.business.check.process.wrapper;
 import org.springblade.common.cache.DictBizCache;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.modules.business.check.order.vo.CheckOrderInfoVO;
 import org.springblade.modules.business.check.process.entity.OrderProcessInfoEntity;
 import org.springblade.modules.business.check.process.vo.OrderProcessInfoVO;
-import org.springblade.modules.business.project.base.entity.ProjectInfoEntity;
-import org.springblade.modules.business.project.base.vo.ProjectInfoVO;
-import org.springblade.modules.business.project.base.wrapper.ProjectInfoWrapper;
 import org.springblade.modules.system.entity.DictBiz;
 
 import java.util.Objects;

src/main/java/org/springblade/modules/business/rtu/data/controller/RtuDataGroundController.java → src/main/java/org/springblade/modules/business/data/controller/RtuDataGroundController.java

@@ -4,7 +4,8 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/28
  */
-package org.springblade.modules.business.rtu.data.controller;
+package org.springblade.modules.business.data.controller;
+
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -15,21 +16,17 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.constant.BusinessConstant;
 import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 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.modules.business.equipment.inspection.plan.entity.EquipmentInspectionPlanEntity;
-import org.springblade.modules.business.rtu.base.vo.RtuInfoVO;
-import org.springblade.modules.business.rtu.base.wrapper.RtuInfoWrapper;
-import org.springblade.modules.business.rtu.data.dto.RtuDataGroundDTO;
-import org.springblade.modules.business.rtu.data.entity.RtuDataGroundEntity;
-import org.springblade.modules.business.rtu.data.service.IRtuDataGroundService;
-import org.springblade.modules.business.rtu.data.vo.RtuDataGroundVO;
-import org.springblade.modules.business.rtu.data.wrapper.RtuDataGroundWrapper;
+import org.springblade.modules.business.data.dto.RtuDataGroundDTO;
+import org.springblade.modules.business.data.entity.RtuDataGroundEntity;
+import org.springblade.modules.business.data.service.IRtuDataGroundService;
+import org.springblade.modules.business.data.vo.RtuDataGroundVO;
+import org.springblade.modules.business.data.wrapper.RtuDataGroundWrapper;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/org/springblade/modules/business/rtu/data/controller/RtuDataRainController.java → src/main/java/org/springblade/modules/business/data/controller/RtuDataRainController.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/28
  */
-package org.springblade.modules.business.rtu.data.controller;
+package org.springblade.modules.business.data.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -15,19 +15,16 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.constant.BusinessConstant;
 import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 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.modules.business.rtu.data.dto.RtuDataRainDTO;
-import org.springblade.modules.business.rtu.data.service.IRtuDataRainService;
-import org.springblade.modules.business.rtu.data.vo.RtuDataGroundVO;
-import org.springblade.modules.business.rtu.data.vo.RtuDataRainVO;
-import org.springblade.modules.business.rtu.data.wrapper.RtuDataGroundWrapper;
-import org.springblade.modules.business.rtu.data.wrapper.RtuDataRainWrapper;
+import org.springblade.modules.business.data.dto.RtuDataRainDTO;
+import org.springblade.modules.business.data.service.IRtuDataRainService;
+import org.springblade.modules.business.data.vo.RtuDataRainVO;
+import org.springblade.modules.business.data.wrapper.RtuDataRainWrapper;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/org/springblade/modules/business/rtu/data/controller/RtuDataRiverController.java → src/main/java/org/springblade/modules/business/data/controller/RtuDataRiverController.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/28
  */
-package org.springblade.modules.business.rtu.data.controller;
+package org.springblade.modules.business.data.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -15,19 +15,16 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.constant.BusinessConstant;
 import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 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.modules.business.rtu.data.dto.RtuDataRiverDTO;
-import org.springblade.modules.business.rtu.data.service.IRtuDataRiverService;
-import org.springblade.modules.business.rtu.data.vo.RtuDataRainVO;
-import org.springblade.modules.business.rtu.data.vo.RtuDataRiverVO;
-import org.springblade.modules.business.rtu.data.wrapper.RtuDataRainWrapper;
-import org.springblade.modules.business.rtu.data.wrapper.RtuDataRiverWrapper;
+import org.springblade.modules.business.data.dto.RtuDataRiverDTO;
+import org.springblade.modules.business.data.service.IRtuDataRiverService;
+import org.springblade.modules.business.data.vo.RtuDataRiverVO;
+import org.springblade.modules.business.data.wrapper.RtuDataRiverWrapper;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -35,6 +32,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 
+
 /***
  * Date:2022/8/28
  * Title:文件所属模块（必须填写）

src/main/java/org/springblade/modules/business/rtu/data/controller/RtuDataRsvrController.java → src/main/java/org/springblade/modules/business/data/controller/RtuDataRsvrController.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/28
  */
-package org.springblade.modules.business.rtu.data.controller;
+package org.springblade.modules.business.data.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -15,19 +15,16 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.constant.BusinessConstant;
 import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 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.modules.business.rtu.data.dto.RtuDataRsvrDTO;
-import org.springblade.modules.business.rtu.data.service.IRtuDataRsvrService;
-import org.springblade.modules.business.rtu.data.vo.RtuDataRiverVO;
-import org.springblade.modules.business.rtu.data.vo.RtuDataRsvrVO;
-import org.springblade.modules.business.rtu.data.wrapper.RtuDataRiverWrapper;
-import org.springblade.modules.business.rtu.data.wrapper.RtuDataRsvrWrapper;
+import org.springblade.modules.business.data.dto.RtuDataRsvrDTO;
+import org.springblade.modules.business.data.service.IRtuDataRsvrService;
+import org.springblade.modules.business.data.vo.RtuDataRsvrVO;
+import org.springblade.modules.business.data.wrapper.RtuDataRsvrWrapper;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/org/springblade/modules/business/rtu/data/dto/RtuDataGroundDTO.java → src/main/java/org/springblade/modules/business/data/dto/RtuDataGroundDTO.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/30
  */
-package org.springblade.modules.business.rtu.data.dto;
+package org.springblade.modules.business.data.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/org/springblade/modules/business/rtu/data/dto/RtuDataRainDTO.java → src/main/java/org/springblade/modules/business/data/dto/RtuDataRainDTO.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/30
  */
-package org.springblade.modules.business.rtu.data.dto;
+package org.springblade.modules.business.data.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/org/springblade/modules/business/rtu/data/dto/RtuDataRiverDTO.java → src/main/java/org/springblade/modules/business/data/dto/RtuDataRiverDTO.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/30
  */
-package org.springblade.modules.business.rtu.data.dto;
+package org.springblade.modules.business.data.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/org/springblade/modules/business/rtu/data/dto/RtuDataRsvrDTO.java → src/main/java/org/springblade/modules/business/data/dto/RtuDataRsvrDTO.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/30
  */
-package org.springblade.modules.business.rtu.data.dto;
+package org.springblade.modules.business.data.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/org/springblade/modules/business/rtu/data/entity/RtuDataGroundEntity.java → src/main/java/org/springblade/modules/business/data/entity/RtuDataGroundEntity.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/28
  */
-package org.springblade.modules.business.rtu.data.entity;
+package org.springblade.modules.business.data.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

src/main/java/org/springblade/modules/business/rtu/data/entity/RtuDataRainEntity.java → src/main/java/org/springblade/modules/business/data/entity/RtuDataRainEntity.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/28
  */
-package org.springblade.modules.business.rtu.data.entity;
+package org.springblade.modules.business.data.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

src/main/java/org/springblade/modules/business/rtu/data/entity/RtuDataRiverEntity.java → src/main/java/org/springblade/modules/business/data/entity/RtuDataRiverEntity.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/28
  */
-package org.springblade.modules.business.rtu.data.entity;
+package org.springblade.modules.business.data.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

src/main/java/org/springblade/modules/business/rtu/data/entity/RtuDataRsvrEntity.java → src/main/java/org/springblade/modules/business/data/entity/RtuDataRsvrEntity.java

@@ -4,7 +4,7 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/28
  */
-package org.springblade.modules.business.rtu.data.entity;
+package org.springblade.modules.business.data.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

src/main/java/org/springblade/modules/business/data/manage/deptCache/DeptCacheTaskManager.java

@@ -1,240 +0,0 @@
-/**
- * Copyright
- * All right reserved.
- * 项目名称:
- * 创建日期:2022/5/23
- */
-package org.springblade.modules.business.data.manage.deptCache;
-
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.extern.slf4j.Slf4j;
-import org.glassfish.jersey.internal.guava.ThreadFactoryBuilder;
-import org.springblade.constant.BusinessConstant;
-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.modules.baseinfo.region.entity.OrgRegionInfoEntity;
-import org.springblade.modules.baseinfo.region.entity.RegionTreeNodeEntity;
-import org.springblade.modules.baseinfo.region.service.IOrgRegionInfoService;
-import org.springblade.modules.baseinfo.region.entity.RegionInfoEntity;
-import org.springblade.modules.baseinfo.region.service.IBaseInfoRegionService;
-import org.springblade.modules.business.rtu.base.service.IRtuBaseInfoService;
-import org.springblade.modules.system.entity.Dept;
-import org.springblade.modules.system.service.IDeptService;
-import org.springframework.data.redis.core.HashOperations;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ValueOperations;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.*;
-
-/***
- * Date:2022/5/22
- * Title: 环境辐射与气象监测系统(KRS) 模块
- * Description：MODBUS TCP 协议传输 ,任务管理
- * @author swp
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Slf4j
-@Component
-@EnableScheduling
-public class DeptCacheTaskManager {
-
-	/**
-	 * 公共线程池
-	 **/
-	private static ThreadFactory publicThreadFactory = new ThreadFactoryBuilder().setNameFormat("public-thread-pool-%d").build();
-	private static ExecutorService publicThreadPool = new ThreadPoolExecutor(1, 1,
-		0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>(1024), publicThreadFactory, new ThreadPoolExecutor.AbortPolicy());
-
-	@Resource
-	private IRtuBaseInfoService iRtuBaseInfoService;
-
-	@Resource
-	private RedisTemplate redisTemplate;
-
-	@Resource
-	private IDeptService iDeptService;
-
-	@Resource
-	private IOrgRegionInfoService iOrgRegionInfoService;
-
-	@Resource
-	private IBaseInfoRegionService iBaseInfoRegionService;
-
-
-	@Scheduled(cron = "0 0 0 * * * ")
-	public void deptUpdateTask() {
-		try {
-			DeptUpdateTask task = new DeptUpdateTask();
-			FutureTask<Integer> futureTask = new FutureTask<>(task);
-			publicThreadPool.execute(futureTask);
-		} catch (Exception e) {
-			log.error("{}", e.getMessage());
-		}
-	}
-
-	private class DeptUpdateTask implements Callable<Integer> {
-
-		@Override
-		public Integer call() {
-			try {
-				log.info("组织机构下的行政区划数据处理");
-				ValueOperations<String, String> opsHash = redisTemplate.opsForValue();
-				//把机构区划表所有记录更新到删除状态
-				LambdaUpdateWrapper<OrgRegionInfoEntity> wrapper = Wrappers.<OrgRegionInfoEntity>update().lambda();
-				wrapper.set(OrgRegionInfoEntity::getRegionActive, 0);
-				iOrgRegionInfoService.update(wrapper);
-				//取所有组织机构信息
-				List<Dept> depts = iDeptService.getDeptChild(BusinessConstant.ORG_ADMIN_ID);
-				if (null != depts && depts.size() > 0) {
-					//取最新的行政区划信息
-					List<RegionInfoEntity> regions = iBaseInfoRegionService.list();
-					for (Dept dept : depts) {
-						for (RegionInfoEntity regionInfoEntity : regions) {
-							//计算地区下的测站数量
-							Long rtuCount = iRtuBaseInfoService.rtuCount(dept.getId(), regionInfoEntity.getAdcd());
-							//更新
-							OrgRegionInfoEntity orgRegionInfoEntity = iOrgRegionInfoService.getOrgRegionInfo(dept.getId(), regionInfoEntity.getAdcd());
-							if (null == orgRegionInfoEntity) {
-								orgRegionInfoEntity = new OrgRegionInfoEntity();
-								orgRegionInfoEntity.setDeptId(dept.getId());
-								orgRegionInfoEntity.setAdcd(regionInfoEntity.getAdcd());
-							}
-							orgRegionInfoEntity.setAdnm(regionInfoEntity.getAdnm());
-							orgRegionInfoEntity.setAncestors(regionInfoEntity.getAncestors());
-							orgRegionInfoEntity.setAddType(regionInfoEntity.getAddType());
-							orgRegionInfoEntity.setParentCode(regionInfoEntity.getParentCode());
-							orgRegionInfoEntity.setRegionActive(1);
-							orgRegionInfoEntity.setRtuCount(rtuCount);
-							iOrgRegionInfoService.saveOrUpdate(orgRegionInfoEntity);
-						}
-						//更新机构行政区划到缓存
-						List<RegionTreeNodeEntity> nodeEntities = new LinkedList<>();
-						LambdaQueryWrapper<OrgRegionInfoEntity> queryWrapper = Wrappers.<OrgRegionInfoEntity>query().lambda();
-						queryWrapper.eq(OrgRegionInfoEntity::getParentCode, "00");
-						queryWrapper.eq(OrgRegionInfoEntity::getDeptId, dept.getId());
-						queryWrapper.eq(OrgRegionInfoEntity::getRegionActive, 1);
-						List<OrgRegionInfoEntity> list = iOrgRegionInfoService.list(queryWrapper);
-						for (OrgRegionInfoEntity entity : list) {
-							RegionTreeNodeEntity nodeEntity = new RegionTreeNodeEntity();
-							nodeEntity.setId(entity.getAdcd());
-							nodeEntity.setValue(entity.getAdcd());
-							nodeEntity.setTitle(entity.getAdnm());
-							nodeEntity.setText(entity.getAdnm());
-							nodeEntity.setKey(entity.getAdcd());
-							nodeEntity.setParentId(entity.getParentCode());
-							getChildren(nodeEntity, entity);
-							if (nodeEntity.getChildren() != null && nodeEntity.getChildren().size() > 0) {
-								nodeEntity.setHasChildren(true);
-							} else {
-								nodeEntity.setHasChildren(false);
-							}
-							nodeEntities.add(nodeEntity);
-						}
-						String regionString = JSON.toJSONString(nodeEntities);
-						opsHash.set("region."+Func.toStr(dept.getId()), regionString);
-						log.info("机构 "+dept.getDeptName()+" 行政区划已更新到缓存");
-					}
-				}
-				//更新管理员行政区划到缓存
-				List<RegionTreeNodeEntity> adminNodeEntities = new LinkedList<>();
-				LambdaQueryWrapper<RegionInfoEntity> queryWrapper = Wrappers.<RegionInfoEntity>query().lambda();
-				queryWrapper.eq(RegionInfoEntity::getParentCode, "00");
-				List<RegionInfoEntity> list = iBaseInfoRegionService.list(queryWrapper);
-				for (RegionInfoEntity entity : list) {
-					RegionTreeNodeEntity nodeEntity = new RegionTreeNodeEntity();
-					nodeEntity.setId(entity.getAdcd());
-					nodeEntity.setValue(entity.getAdcd());
-					nodeEntity.setTitle(entity.getAdnm());
-					nodeEntity.setText(entity.getAdnm());
-					nodeEntity.setKey(entity.getAdcd());
-					nodeEntity.setParentId(entity.getParentCode());
-					getChildren(nodeEntity, entity);
-					if (nodeEntity.getChildren() != null && nodeEntity.getChildren().size() > 0) {
-						nodeEntity.setHasChildren(true);
-					} else {
-						nodeEntity.setHasChildren(false);
-					}
-					adminNodeEntities.add(nodeEntity);
-				}
-				String regionString = JSON.toJSONString(adminNodeEntities);
-				opsHash.set("region.admin", regionString);
-				log.info("管理员行政区划已更新到缓存");
-			} catch (Exception e) {
-				log.error("数据任务异常 {}", e.getMessage());
-			}
-			return 0;
-		}
-
-		private boolean getChildren(RegionTreeNodeEntity nodeEntity, OrgRegionInfoEntity regionInfoEntity) {
-			LambdaQueryWrapper<OrgRegionInfoEntity> queryWrapper = Wrappers.<OrgRegionInfoEntity>query().lambda();
-			queryWrapper.eq(OrgRegionInfoEntity::getParentCode, regionInfoEntity.getAdcd());
-			queryWrapper.eq(OrgRegionInfoEntity::getDeptId, regionInfoEntity.getDeptId());
-			queryWrapper.eq(OrgRegionInfoEntity::getRegionActive, 1);
-			List<OrgRegionInfoEntity> list = iOrgRegionInfoService.list(queryWrapper);
-			if (null != list && list.size() > 0) {
-				List<RegionTreeNodeEntity> nodeEntities = new LinkedList<>();
-				for (OrgRegionInfoEntity entity : list) {
-					if (entity.getRtuCount() > 0) {
-						RegionTreeNodeEntity node = new RegionTreeNodeEntity();
-						node.setId(entity.getAdcd());
-						node.setValue(entity.getAdcd());
-						node.setTitle(entity.getAdnm());
-						node.setText(entity.getAdnm());
-						node.setKey(entity.getAdcd());
-						node.setParentId(entity.getParentCode());
-						getChildren(node, entity);
-						if (node.getChildren() != null && node.getChildren().size() > 0) {
-							node.setHasChildren(true);
-						} else {
-							node.setHasChildren(false);
-						}
-						nodeEntities.add(node);
-					}
-				}
-				nodeEntity.setChildren(nodeEntities);
-			}
-			return true;
-		}
-
-		private boolean getChildren(RegionTreeNodeEntity nodeEntity, RegionInfoEntity regionInfoEntity) {
-			LambdaQueryWrapper<RegionInfoEntity> queryWrapper = Wrappers.<RegionInfoEntity>query().lambda();
-			queryWrapper.eq(RegionInfoEntity::getParentCode, regionInfoEntity.getAdcd());
-			List<RegionInfoEntity> list = iBaseInfoRegionService.list(queryWrapper);
-			if (null != list && list.size() > 0) {
-				List<RegionTreeNodeEntity> nodeEntities = new LinkedList<>();
-				for (RegionInfoEntity entity : list) {
-					RegionTreeNodeEntity node = new RegionTreeNodeEntity();
-					node.setId(entity.getAdcd());
-					node.setValue(entity.getAdcd());
-					node.setTitle(entity.getAdnm());
-					node.setText(entity.getAdnm());
-					node.setKey(entity.getAdcd());
-					node.setParentId(entity.getParentCode());
-					getChildren(node, entity);
-					if (node.getChildren() != null && node.getChildren().size() > 0) {
-						node.setHasChildren(true);
-					} else {
-						node.setHasChildren(false);
-					}
-					nodeEntities.add(node);
-				}
-				nodeEntity.setChildren(nodeEntities);
-			}
-			return true;
-		}
-	}
-}

src/main/java/org/springblade/modules/business/data/manage/service/IRtuImportRecordService.java

@@ -1,32 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/8/22
- */
-package org.springblade.modules.business.data.manage.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.mp.base.BaseService;
-import org.springblade.modules.business.data.manage.entity.RtuImportRecordEntity;
-import org.springblade.modules.business.project.base.entity.ProjectInfoEntity;
-import org.springblade.modules.business.project.base.entity.ProjectWarningSettingEntity;
-import org.springblade.modules.business.project.base.vo.ProjectInfoVO;
-import org.springblade.modules.business.rtu.base.dto.RtuInfoDTO;
-import org.springblade.modules.business.rtu.base.vo.RtuInfoVO;
-
-import java.util.Date;
-import java.util.List;
-
-
-/***
- * Date:2022/8/22
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-public interface IRtuImportRecordService extends BaseService<RtuImportRecordEntity> {
-
-}

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

@@ -1,42 +0,0 @@
-/**
- * Copyright 2019 DH
- * All right reserved.
- * 项目名称: 大恒泰山系统
- * 创建日期:2022/8/22
- */
-package org.springblade.modules.business.data.manage.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.business.data.manage.entity.RtuImportRecordEntity;
-import org.springblade.modules.business.data.manage.mapper.RtuImportRecordMapper;
-import org.springblade.modules.business.data.manage.service.IRtuImportRecordService;
-import org.springblade.modules.business.project.base.entity.ProjectInfoEntity;
-import org.springblade.modules.business.project.base.entity.ProjectWarningSettingEntity;
-import org.springblade.modules.business.project.base.mapper.ProjectInfoMapper;
-import org.springblade.modules.business.project.base.service.IProjectBaseInfoService;
-import org.springblade.modules.business.project.base.vo.ProjectInfoVO;
-import org.springblade.modules.system.entity.Dept;
-import org.springblade.modules.system.service.IDeptService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-
-/***
- * Date:2022/8/22
- * Title:文件所属模块（必须填写）
- * Description：对本文件的详细描述，原则上不能少于30字
- * @author dylan
- * @version 1.0
- * Remark：认为有必要的其他信息
- */
-@Service
-public class RtuImportRecordServiceImpl extends BaseServiceImpl<RtuImportRecordMapper, RtuImportRecordEntity> implements IRtuImportRecordService {
-
-}

src/main/java/org/springblade/modules/business/rtu/data/mapper/RtuDataGroundMapper.java → src/main/java/org/springblade/modules/business/data/mapper/RtuDataGroundMapper.java

@@ -4,16 +4,15 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/28
  */
-package org.springblade.modules.business.rtu.data.mapper;
+package org.springblade.modules.business.data.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.modules.business.rtu.data.dto.RtuDataGroundDTO;
-import org.springblade.modules.business.rtu.data.entity.RtuDataGroundEntity;
-import org.springblade.modules.business.rtu.data.entity.RtuDataRainEntity;
-import org.springblade.modules.business.rtu.data.vo.RtuDataGroundVO;
-import org.springblade.modules.business.rtu.data.vo.RtuDataRainVO;
+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 java.util.List;
 
@@ -32,5 +31,5 @@ public interface RtuDataGroundMapper extends BaseMapper<RtuDataGroundEntity> {
 	 * @param page 分页
 	 * @return List<RtuInfoVO>
 	 */
-	List<RtuDataGroundVO> selectPage(IPage page, @Param("groundDTO")RtuDataGroundDTO groundDTO);
+	List<RtuDataGroundVO> selectPage(IPage page, @Param("groundDTO") RtuDataGroundDTO groundDTO);
 }

src/main/java/org/springblade/modules/business/rtu/data/mapper/RtuDataGroundMapper.xml → src/main/java/org/springblade/modules/business/data/mapper/RtuDataGroundMapper.xml

@@ -1,9 +1,9 @@
 <?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.modules.business.rtu.data.mapper.RtuDataGroundMapper">
+<mapper namespace="org.springblade.modules.business.data.mapper.RtuDataGroundMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="rtuGroundDataResultMap" type="org.springblade.modules.business.rtu.data.entity.RtuDataGroundEntity">
+    <resultMap id="rtuGroundDataResultMap" type="org.springblade.modules.business.data.entity.RtuDataGroundEntity">
         <result column="id" property="id"/>
         <result column="create_user" property="createUser"/>
         <result column="create_time" property="createTime"/>
@@ -26,7 +26,7 @@
     </resultMap>
 
 
-    <resultMap id="rtuGroundDataVOResultMap" type="org.springblade.modules.business.rtu.data.vo.RtuDataGroundVO">
+    <resultMap id="rtuGroundDataVOResultMap" type="org.springblade.modules.business.data.vo.RtuDataGroundVO">
         <result column="id" property="id"/>
         <result column="create_user" property="createUser"/>
         <result column="create_time" property="createTime"/>

src/main/java/org/springblade/modules/business/rtu/data/mapper/RtuDataRainMapper.java → src/main/java/org/springblade/modules/business/data/mapper/RtuDataRainMapper.java

@@ -4,15 +4,14 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/28
  */
-package org.springblade.modules.business.rtu.data.mapper;
+package org.springblade.modules.business.data.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.modules.business.rtu.base.vo.RtuInfoVO;
-import org.springblade.modules.business.rtu.data.dto.RtuDataRainDTO;
-import org.springblade.modules.business.rtu.data.entity.RtuDataRainEntity;
-import org.springblade.modules.business.rtu.data.vo.RtuDataRainVO;
+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 java.util.List;
 
@@ -31,5 +30,5 @@ public interface RtuDataRainMapper extends BaseMapper<RtuDataRainEntity> {
 	 * @param page 分页
 	 * @return List<RtuInfoVO>
 	 */
-	List<RtuDataRainVO> selectPage(IPage page, @Param("rtuDataRainDTO")RtuDataRainDTO rtuDataRainDTO);
+	List<RtuDataRainVO> selectPage(IPage page, @Param("rtuDataRainDTO") RtuDataRainDTO rtuDataRainDTO);
 }