泰山运维系统-数据服务

.gitignore

@@ -0,0 +1,2 @@
+.idea
+target

pom.xml

@@ -216,7 +216,6 @@
                 <exclusion>
                     <groupId>com.lowagie</groupId>
                     <artifactId>itext</artifactId>
-
                 </exclusion>
             </exclusions>
         </dependency>

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

@@ -21,5 +21,219 @@ public class RtuDataInfoConstant {
 	 */
 	public static final  String RTU_DATA_RTUCODE_KEY ="rtuCode";
 
+    public static final  String RTU_DATA_COLLECT_TIME_KEY ="collectTime";
 
+    public static final  String RTU_DATA_UP_TIME_KEY ="upTime";
+
+    public static final  String RTU_DATA_PICK_TIME_KEY ="pickTime";
+
+    /**
+     * 降水量
+     */
+    public static final  String RTU_DATA_RAIN_DRP_KEY ="drp";
+    /**
+     * 累计降水量
+     */
+    public static final  String RTU_DATA_RAIN_PT_KEY ="pt";
+    /**
+     * 时段长
+     */
+    public static final  String RTU_DATA_RAIN_INTV_KEY ="intv";
+    /**
+     * 降水历时,格式 HH.NN
+     */
+    public static final  String RTU_DATA_RAIN_PDR_KEY ="pdr";
+    /**
+     * 日降水量,前一天8时到当前8时，24小时降水量
+     */
+    public static final  String RTU_DATA_RAIN_DYP_KEY ="dyp";
+    /**
+     * 天气状况
+     */
+    public static final  String RTU_DATA_RAIN_WTH_KEY ="wth";
+
+
+    /**
+     * 河道水位
+     */
+    public static final  String RTU_DATA_RIVER_Z_KEY ="z";
+    /**
+     * 流量
+     */
+    public static final  String RTU_DATA_RIVER_Q_KEY ="q";
+    /**
+     * 断面过水面积
+     */
+    public static final  String RTU_DATA_RIVER_XSA_KEY ="xsa";
+    /**
+     * 断面平均流速
+     */
+    public static final  String RTU_DATA_RIVER_XSAVV_KEY ="xsavv";
+    /**
+     * 断面最大流速
+     */
+    public static final  String RTU_DATA_RIVER_XSNXV_KEY ="xsnxv";
+    /**
+     * 河水特征码
+     */
+    public static final  String RTU_DATA_RAIN_PLWCHRCD_KEY ="plwchrcd";
+    /**
+     * 水势
+     */
+    public static final  String RTU_DATA_RAIN_WPTN_KEY ="wptn";
+    /**
+     * 测流方法
+     */
+    public static final  String RTU_DATA_RAIN_MSQMT_KEY ="msqmt";
+    /**
+     * 测积方法
+     */
+    public static final  String RTU_DATA_RAIN_PMSAMT_KEY ="msamt";
+    /**
+     * 测速方法
+     */
+    public static final  String RTU_DATA_RAIN_MSVMT_KEY ="msvmt";
+
+    /**
+     * 库上水位
+     */
+    public static final  String RTU_DATA_RSVR_RZ_KEY ="rz";
+    /**
+     * 蓄水量
+     */
+    public static final  String RTU_DATA_RSVR_W_KEY ="w";
+    /**
+     * 入库流量
+     */
+    public static final  String RTU_DATA_RSVR_INQ_KEY ="inq";
+    /**
+     * 库下水位
+     */
+    public static final  String RTU_DATA_RSVR_BLRZ_KEY ="blrz";
+    /**
+     * 出库流量
+     */
+    public static final  String RTU_DATA_RSVR_OTQ_KEY ="otq";
+    /**
+     * 库水特征码
+     */
+    public static final  String RTU_DATA_RSVR_RWCHRCD_KEY ="rwchrcd";
+    /**
+     * 库水水势
+     */
+    public static final  String RTU_DATA_RSVR_RWPTN_KEY ="rwptn";
+
+    /**
+     * 入流时段长
+     */
+    public static final  String RTU_DATA_RSVR_INQDR_KEY ="inqdr";
+    /**
+     * 测流方法
+     */
+    public static final  String RTU_DATA_RSVR_MSQMT_KEY ="msqmt";
+
+    /**
+     * 信号强度
+     */
+    public static final  String RTU_STATUS_DTU_SIGNAL_KEY ="dtu_signal";
+    /**
+     * 电源电压
+     */
+    public static final  String RTU_STATUS_VOLTAGE_KEY ="voltage";
+    /**
+     *RTU温度
+     */
+    public static final  String RTU_STATUS_TEMPERATURE_KEY ="temperature";
+    /**
+     * 唯一识别码
+     */
+    public static final  String RTU_STATUS_UUID_KEY ="uuid";
+    /**
+     * 物联卡CCID
+     */
+    public static final  String RTU_STATUS_CCID_KEY ="ccid";
+    /**
+     * 设备状态 0,SD  ,1正常
+     */
+    public static final  String RTU_STATUS_RTU_STATUS_KEY ="rtu_status";
+    /**
+     * 异常值
+     */
+    public static final  String RTU_STATUS_RTU_ERROR_KEY ="rtu_error";
+    /**
+     * 报文发送索引
+     */
+    public static final  String RTU_STATUS_DATAGRAM_CHANNEL_INDEX_KEY ="datagram_channel_index";
+    /**
+     * 电池状态
+     */
+    public static final  String RTU_STATUS_BATTERY_STATUS_KEY ="battery_status";
+    /**
+     * 充电状态
+     */
+    public static final  String RTU_STATUS_BATTERY_IN_KEY ="battery_battery_in";
+    /**
+     * 放电状态
+     */
+    public static final  String RTU_STATUS_BATTERY_OUT_KEY ="battery_battery_out";
+    /**
+     * 电池电量 ,百分比
+     */
+    public static final  String RTU_STATUS_BATTERY_POWER_KEY ="battery_power";
+    /**
+     * 电池温度
+     */
+    public static final  String RTU_STATUS_BATTERY_TEMP_KEY ="battery_temperature";
+    /**
+     * 太阳能电压
+     */
+    public static final  String RTU_STATUS_SUN_POWER_VOLTAGE_KEY ="sun_power_voltage";
+    /**
+     * 太阳能电流
+     */
+    public static final  String RTU_STATUS_SUN_POWER_ELECTRIC_KEY ="sun_power_electric";
+    /**
+     * 水位计状态
+     */
+    public static final  String RTU_STATUS_WATER_SENSOR_STATUS_KEY ="water_sensor_status";
+    /**
+     * 电池电压报警 0 正常 ，1报警
+     */
+    public static final  String RTU_STATUS_BATTERY_VOLTAGE_WARN_KEY ="battery_voltage_warning";
+    /**
+     * 交流电充电报警 0 正常 ，1停电
+     */
+    public static final  String RTU_STATUS_AC_CHARGE_WARN_KEY ="ac_charge_warning";
+
+    public final static String  BASE_KEY_RTU ="rtuCode";
+    public final static String  BASE_KEY_AGREEMENT ="agreement";
+    public final static String  BASE_KEY_DATAGRAM ="datagram";
+    public final static String  BASE_KEY_DATAGRAM_PICK_TM ="datagramPickTime";
+
+
+    /**
+     * 水资源河道水位
+     */
+    public static final  String RTU_DATA_SZY_RIVER_HIGH="HIGH";
+    /**
+     * 水资源河道流速
+     */
+    public static final  String RTU_DATA_SZY_RIVER_SPEED="SPEED";
+
+    /**
+     * 瞬时流量1组
+     */
+    public static final  String RTU_DATA_SZY_MP_Q_R_FIRST_FLOWRATE="instantFlowrateFirst";
+    /**
+     * 累计流量1组
+     */
+    public static final  String RTU_DATA_SZY_MP_Q_R_FIRST_ACC_FLOWRATE="accFlowrateFirst";
+    /**
+     * 瞬时流量2组
+     */
+    public static final  String RTU_DATA_SZY_MP_Q_R_SECOND_FLOWRATE="instantFlowrateSecond";
+    /**
+     * 累计流量2组
+     */
+    public static final  String RTU_DATA_SZY_MP_Q_R_SECOND_ACC_FLOWRATE="accFlowrateSecond";
 }

src/main/java/org/springblade/modules/business/data/controller/RtuDataWeatherController.java

@@ -6,35 +6,27 @@
  */
 package org.springblade.modules.business.data.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springblade.constant.BusinessConstant;
+import org.springblade.constant.RtuDataInfoConstant;
 import org.springblade.core.boot.ctrl.BladeController;
-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.baseinfo.org.entity.DeptRegionEntity;
-import org.springblade.modules.baseinfo.org.service.IDeptRegionService;
-import org.springblade.modules.business.data.dto.RtuDataRainDTO;
-import org.springblade.modules.business.data.entity.RtuDataRainEntity;
-import org.springblade.modules.business.data.service.IRtuDataRainService;
-import org.springblade.modules.business.data.vo.RtuDataRainVO;
+import org.springblade.modules.business.data.entity.RtuDataWeatherEntity;
+import org.springblade.modules.business.data.service.IRtuDataWeatherService;
+import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
-
 
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 
 /***
@@ -46,58 +38,47 @@ import springfox.documentation.annotations.ApiIgnore;
  * Remark：认为有必要的其他信息
  */
 @RestController
-@RequestMapping("galaxy-business/rtu/data/rain")
+@RequestMapping("galaxy-business/rtu/data/weather")
 @AllArgsConstructor
-@Api(value = "降水实时数据管理", tags = "测站实时数据管理")
-public class RtuDataRainController extends BladeController {
-	private final IRtuDataRainService dataRainService;
-	private final IDeptRegionService deptRegionService;
+@Api(value = "气象实时数据管理", tags = "气象实时数据管理")
+public class RtuDataWeatherController extends BladeController {
+    private final IRtuDataWeatherService weatherService;
 
-	/**
-	 * 分页
-	 */
-	@GetMapping("/page")
-	@ApiImplicitParams({
-		@ApiImplicitParam(name = "rtuName", value = "测站名称", paramType = "query", dataType = "string"),
-		@ApiImplicitParam(name = "rtuCode", value = "测站编码", paramType = "query", dataType = "string"),
-		@ApiImplicitParam(name = "adCode", value = "行政区划编码", paramType = "query", dataType = "string"),
-	})
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页")
-	public R<IPage<RtuDataRainVO>> page(@ApiIgnore RtuDataRainDTO rtuDataRainDTO, Query query) {
-		BladeUser user = AuthUtil.getUser();
-		if (BusinessConstant.ROLE_SYS_ADMIN.equals(user.getRoleName())) {
-			if (rtuDataRainDTO.getAdCode() == null) {
-				rtuDataRainDTO.setAdCode(BusinessConstant.REGION_NM_ADCODE);
-			}
-		} else if (BusinessConstant.ROLE_ORG_ADMIN.equals(user.getRoleName()) || BusinessConstant.ROLE_COMPANY_ADMIN.equals(user.getRoleName()) || BusinessConstant.ROLE_COMPANY_SERVICE_PERSON.equals(user.getRoleName())) {
-			if (rtuDataRainDTO.getAdCode() == null) {
-				LambdaQueryWrapper<DeptRegionEntity> deptRegionEntityLambdaQueryWrapper = Wrappers.<DeptRegionEntity>query().lambda();
-				deptRegionEntityLambdaQueryWrapper.eq(DeptRegionEntity::getIsDeleted, 0);
-				deptRegionEntityLambdaQueryWrapper.eq(DeptRegionEntity::getDeptId, Func.toLong(user.getDeptId()));
-				DeptRegionEntity deptRegionEntity = deptRegionService.getOne(deptRegionEntityLambdaQueryWrapper);
-				rtuDataRainDTO.setAdCode(deptRegionEntity.getAdcd());
-			}
-		}
-		IPage<RtuDataRainVO> pages = dataRainService.selectPage(Condition.getPage(query), rtuDataRainDTO);
-		return R.data(pages);
-	}
+    @Resource
+    private KafkaTemplate<String, String> kafkaTemplate;
 
+    @GetMapping("/test/{code}")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "详情", notes = "")
+    public R test(@PathVariable(name = "code") String code) {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("rtuCode", code);
+        jsonObject.put(RtuDataInfoConstant.RTU_DATA_COLLECT_TIME_KEY, new Date());
+        jsonObject.put(RtuDataInfoConstant.RTU_DATA_UP_TIME_KEY, new Date());
+        jsonObject.put(RtuDataInfoConstant.RTU_DATA_PICK_TIME_KEY, new Date());
+        jsonObject.put("AI", 1.2);
+        jsonObject.put("MST", 2.3);
+        kafkaTemplate.send("topic-ywxt-cloud-rtu-data-weather", jsonObject.toJSONString());
+        return R.success("ok");
+    }
 
-	/**
-	 * 详情
-	 */
-	@GetMapping("/detail")
-	@ApiImplicitParams({
-		@ApiImplicitParam(name = "rtuCode", value = "测站编码", paramType = "query", dataType = "string"),
-	})
-	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入 RtuDataRainEntity")
-	public R<RtuDataRainEntity> detail(RtuDataRainEntity entity) {
-		LambdaQueryWrapper<RtuDataRainEntity> wrapper = Wrappers.<RtuDataRainEntity>query().lambda();
-		wrapper.eq(RtuDataRainEntity::getIsDeleted, 0L);
-		wrapper.eq(RtuDataRainEntity::getRtuCode, entity.getRtuCode());
-		RtuDataRainEntity rainEntity = dataRainService.getOne(wrapper);
-		return R.data(rainEntity);
-	}
+    /**
+     * 详情
+     */
+    @GetMapping("/detail/{code}")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "详情", notes = "")
+    public R<JSONObject> detail(@PathVariable(name = "code") String code) {
+        JSONObject data = new JSONObject();
+        LambdaQueryWrapper<RtuDataWeatherEntity> wrapper = Wrappers.<RtuDataWeatherEntity>query().lambda();
+        wrapper.eq(RtuDataWeatherEntity::getRtuCode, code);
+        wrapper.orderByDesc(RtuDataWeatherEntity::getTm);
+        wrapper.last("limit 1");
+        RtuDataWeatherEntity weatherEntity = weatherService.getOne(wrapper);
+        data.put("rtuCode", code);
+        data.put("tm", weatherEntity.getTm());
+        data.put("ai", weatherEntity.getAi());
+        data.put("mst", weatherEntity.getMst());
+        return R.data(data);
+    }
 }

src/main/java/org/springblade/modules/business/data/dto/RtuDataGroundStoreDTO.java

@@ -9,8 +9,7 @@ package org.springblade.modules.business.data.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.modules.business.data.entity.RtuDataGroundEntity;
+import org.springblade.modules.business.data.entity.RtuDataGroundStoreEntity;
 
 /***
  * Date:2022/8/30
@@ -22,7 +21,7 @@ import org.springblade.modules.business.data.entity.RtuDataGroundEntity;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class RtuDataGroundDTO extends RtuDataGroundEntity {
+public class RtuDataGroundStoreDTO extends RtuDataGroundStoreEntity {
 	/**
 	 * 测站名称
 	 */

src/main/java/org/springblade/modules/business/data/dto/RtuDataRainStoreDTO.java

@@ -9,8 +9,7 @@ package org.springblade.modules.business.data.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.modules.business.data.entity.RtuDataRainEntity;
+import org.springblade.modules.business.data.entity.RtuDataRainStoreEntity;
 
 /***
  * Date:2022/8/30
@@ -22,7 +21,7 @@ import org.springblade.modules.business.data.entity.RtuDataRainEntity;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class RtuDataRainDTO extends RtuDataRainEntity {
+public class RtuDataRainStoreDTO extends RtuDataRainStoreEntity {
 	/**
 	 * 测站名称
 	 */

src/main/java/org/springblade/modules/business/data/dto/RtuDataRiverStoreDTO.java

@@ -9,8 +9,7 @@ package org.springblade.modules.business.data.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.modules.business.data.entity.RtuDataRiverEntity;
+import org.springblade.modules.business.data.entity.RtuDataRiverStoreEntity;
 
 /***
  * Date:2022/8/30
@@ -22,7 +21,7 @@ import org.springblade.modules.business.data.entity.RtuDataRiverEntity;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class RtuDataRiverDTO extends RtuDataRiverEntity {
+public class RtuDataRiverStoreDTO extends RtuDataRiverStoreEntity {
 	/**
 	 * 测站名称
 	 */

src/main/java/org/springblade/modules/business/data/dto/RtuDataRsvrStoreDTO.java

@@ -9,8 +9,7 @@ package org.springblade.modules.business.data.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.modules.business.data.entity.RtuDataRsvrEntity;
+import org.springblade.modules.business.data.entity.RtuDataRsvrStoreEntity;
 
 /***
  * Date:2022/8/30
@@ -22,7 +21,7 @@ import org.springblade.modules.business.data.entity.RtuDataRsvrEntity;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class RtuDataRsvrDTO extends RtuDataRsvrEntity {
+public class RtuDataRsvrStoreDTO extends RtuDataRsvrStoreEntity {
 	/**
 	 * 测站名称
 	 */

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

@@ -127,6 +127,19 @@ public class RtuDataGroundEntity extends BaseEntity {
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double slm100;
 
+	/**
+	 * 上报时间
+	 */
+	@ApiModelProperty("上报时间")
+	@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss",
+			timezone = "GMT+8"
+	)
+	private Date upTime;
+
 	/**
 	 * 东华数据库入库时间
 	 */

src/main/java/org/springblade/modules/business/data/entity/RtuDataGroundStoreEntity.java

@@ -28,8 +28,8 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("data_att_st_somo_cache")
-public class RtuDataGroundEntity extends BaseEntity {
+@TableName("data_att_st_somo")
+public class RtuDataGroundStoreEntity extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 
 	/**

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

@@ -45,9 +45,9 @@ public class RtuDataRainEntity extends BaseEntity {
 	private String rtuCode;
 
 	/**
-	 * 时间
+	 * 采集时间
 	 */
-	@ApiModelProperty("时间")
+	@ApiModelProperty("采集时间")
 	@DateTimeFormat(
 		pattern = "yyyy-MM-dd HH:mm:ss"
 	)
@@ -72,7 +72,48 @@ public class RtuDataRainEntity extends BaseEntity {
 	private Double intv;
 
 	/**
-	 * 东华数据库入库时间
+	 * 降水历时,格式 HH.NN
+	 */
+	@ApiModelProperty("降水历时")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	private Double pdr;
+
+	/**
+	 * 日降水量,前一天8时到当前8时，24小时降水量
+	 */
+	@ApiModelProperty("日降水量")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	private Double dyp;
+
+	/**
+	 * 天气状况
+	 */
+	@ApiModelProperty("天气状况")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	private String wth;
+
+	/**
+	 * 累计降水量
+	 */
+	@ApiModelProperty("累计降水量")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	private Double pt;
+
+	/**
+	 * 上报时间
+	 */
+	@ApiModelProperty("上报时间")
+	@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss",
+			timezone = "GMT+8"
+	)
+	private Date upTime;
+
+	/**
+	 * 入库时间
 	 */
 	@ApiModelProperty("入库时间")
 	@DateTimeFormat(

src/main/java/org/springblade/modules/business/data/entity/RtuDataRainStoreEntity.java

@@ -28,8 +28,8 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("data_att_st_prec_cache")
-public class RtuDataRainEntity extends BaseEntity {
+@TableName("data_att_st_prec")
+public class RtuDataRainStoreEntity extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 
 	/**

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

@@ -45,9 +45,9 @@ public class RtuDataRiverEntity extends BaseEntity {
 	private String rtuCode;
 
 	/**
-	 * 时间
+	 * 采集时间
 	 */
-	@ApiModelProperty("时间")
+	@ApiModelProperty("采集时间")
 	@DateTimeFormat(
 		pattern = "yyyy-MM-dd HH:mm:ss"
 	)
@@ -65,7 +65,20 @@ public class RtuDataRiverEntity extends BaseEntity {
 	private Double z;
 
 	/**
-	 * 东华数据库入库时间
+	 * 上报时间
+	 */
+	@ApiModelProperty("上报时间")
+	@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss",
+			timezone = "GMT+8"
+	)
+	private Date upTime;
+
+	/**
+	 * 数据库入库时间
 	 */
 	@ApiModelProperty("入库时间")
 	@DateTimeFormat(

src/main/java/org/springblade/modules/business/data/entity/RtuDataRiverStoreEntity.java

@@ -28,8 +28,8 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("data_att_st_waco_ware_cache")
-public class RtuDataRiverEntity extends BaseEntity {
+@TableName("data_att_st_waco_ware")
+public class RtuDataRiverStoreEntity extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 
 	/**

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

@@ -45,9 +45,9 @@ public class RtuDataRsvrEntity extends BaseEntity {
 	private String rtuCode;
 
 	/**
-	 * 时间
+	 * 采集时间
 	 */
-	@ApiModelProperty("时间")
+	@ApiModelProperty("采集时间")
 	@DateTimeFormat(
 		pattern = "yyyy-MM-dd HH:mm:ss"
 	)
@@ -65,7 +65,21 @@ public class RtuDataRsvrEntity extends BaseEntity {
 	private Double rz;
 
 	/**
-	 * 东华数据库入库时间
+	 * 上报时间
+	 */
+	@ApiModelProperty("上报时间")
+	@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss",
+			timezone = "GMT+8"
+	)
+	private Date upTime;
+
+
+	/**
+	 * 数据库入库时间
 	 */
 	@ApiModelProperty("入库时间")
 	@DateTimeFormat(

src/main/java/org/springblade/modules/business/data/entity/RtuDataRsvrStoreEntity.java

@@ -28,8 +28,8 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("data_att_st_res_ware_cache")
-public class RtuDataRsvrEntity extends BaseEntity {
+@TableName("data_att_st_res_ware")
+public class RtuDataRsvrStoreEntity extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 
 	/**

src/main/java/org/springblade/modules/business/data/entity/RtuDataSzyFlowRateEntity.java

@@ -6,7 +6,19 @@
  */
 package org.springblade.modules.business.data.entity;
 
-/*** 
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
+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:2023/6/16
  * Title:文件所属模块（必须填写）
  * Description：对本文件的详细描述，原则上不能少于30字
@@ -14,5 +26,92 @@ package org.springblade.modules.business.data.entity;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public class RtuDataSzyFlowRateEntity {
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("data_szy_mp_q_r_cache")
+public class RtuDataSzyFlowRateEntity extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 租户ID
+     */
+    @ApiModelProperty("租户ID")
+    private String tenantId;
+
+    /**
+     * 测站编码
+     */
+    @ApiModelProperty("测站编码")
+    private String rtuCode;
+
+    /**
+     * 采集时间
+     */
+    @ApiModelProperty("采集时间")
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss",
+            timezone = "GMT+8"
+    )
+    private Date tm;
+
+    /**
+     * 上报时间
+     */
+    @ApiModelProperty("上报时间")
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss",
+            timezone = "GMT+8"
+    )
+    private Date upTime;
+
+    /**
+     * 数据库入库时间
+     */
+    @ApiModelProperty("入库时间")
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss",
+            timezone = "GMT+8"
+    )
+    private Date fromTime;
+
+    @ApiModelProperty("瞬时流量1组")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private String mpQ;
+
+    @ApiModelProperty("累计流量1组")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private String accW;
+
+    @ApiModelProperty("瞬时流量2组")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private String mpSencondQ;
+
+    @ApiModelProperty("累计流量2组")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private String accSencondW;
+
+    @ApiModelProperty("小时水量")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private String hourW;
+
+    @ApiModelProperty("入厂污水流量")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private String inStpQ;
+
+    @ApiModelProperty("累计入厂污水量")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private String accPqW;
+
+    @ApiModelProperty("特殊区域数据")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private String speRegData;
 }

src/main/java/org/springblade/modules/business/data/entity/RtuDataSzyFlowRateStoreEntity.java

@@ -29,7 +29,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("data_szy_mp_q_r")
-public class RtuDataSzyFlowRateEntity extends BaseEntity {
+public class RtuDataSzyFlowRateStoreEntity extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -83,8 +83,36 @@ public class RtuDataSzyFlowRateEntity extends BaseEntity {
     )
     private Date fromTime;
 
-    @ApiModelProperty("河道水位")
+    @ApiModelProperty("瞬时流量1组")
     @JsonSerialize(nullsUsing = NullSerializer.class)
-    private Double z;
+    private String mpQ;
+
+    @ApiModelProperty("累计流量1组")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private String accW;
+
+    @ApiModelProperty("瞬时流量2组")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private String mpSencondQ;
+
+    @ApiModelProperty("累计流量2组")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private String accSencondW;
+
+    @ApiModelProperty("小时水量")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private String hourW;
+
+    @ApiModelProperty("入厂污水流量")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private String inStpQ;
+
+    @ApiModelProperty("累计入厂污水量")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private String accPqW;
+
+    @ApiModelProperty("特殊区域数据")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private String speRegData;
 
 }

src/main/java/org/springblade/modules/business/data/entity/RtuDataWeatherEntity.java

@@ -28,8 +28,8 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("data_att_st_prec_cache")
-public class RtuDataRainEntity extends BaseEntity {
+@TableName("data_att_st_weather")
+public class RtuDataWeatherEntity extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 
 	/**
@@ -58,46 +58,18 @@ public class RtuDataRainEntity extends BaseEntity {
 	private Date tm;
 
 	/**
-	 * 降水量
+	 * 瞬时气温
 	 */
-	@ApiModelProperty("降水量")
+	@ApiModelProperty("瞬时气温")
 	@JsonSerialize(nullsUsing = NullSerializer.class)
-	private Double drp;
+	private Double ai;
 
 	/**
-	 * 时段长
+	 * 湿度
 	 */
-	@ApiModelProperty("时段长")
+	@ApiModelProperty("湿度")
 	@JsonSerialize(nullsUsing = NullSerializer.class)
-	private Double intv;
-
-	/**
-	 * 降水历时,格式 HH.NN
-	 */
-	@ApiModelProperty("降水历时")
-	@JsonSerialize(nullsUsing = NullSerializer.class)
-	private Double pdr;
-
-	/**
-	 * 日降水量,前一天8时到当前8时，24小时降水量
-	 */
-	@ApiModelProperty("日降水量")
-	@JsonSerialize(nullsUsing = NullSerializer.class)
-	private Double dyp;
-
-	/**
-	 * 天气状况
-	 */
-	@ApiModelProperty("天气状况")
-	@JsonSerialize(nullsUsing = NullSerializer.class)
-	private String wth;
-
-	/**
-	 * 累计降水量
-	 */
-	@ApiModelProperty("累计降水量")
-	@JsonSerialize(nullsUsing = NullSerializer.class)
-	private Double pt;
+	private Double mst;
 
 	/**
 	 * 上报时间

src/main/java/org/springblade/modules/business/data/entity/RtuDataWqRiverEntity.java

@@ -6,7 +6,19 @@
  */
 package org.springblade.modules.business.data.entity;
 
-/*** 
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
+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:2023/6/16
  * Title:文件所属模块（必须填写）
  * Description：对本文件的详细描述，原则上不能少于30字
@@ -14,5 +26,70 @@ package org.springblade.modules.business.data.entity;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public class RtuDataWqRiverEntity {
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("data_szy_river_cache")
+public class RtuDataWqRiverEntity extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 租户ID
+     */
+    @ApiModelProperty("租户ID")
+    private String tenantId;
+
+    /**
+     * 测站编码
+     */
+    @ApiModelProperty("测站编码")
+    private String rtuCode;
+
+    /**
+     * 采集时间
+     */
+    @ApiModelProperty("采集时间")
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss",
+            timezone = "GMT+8"
+    )
+    private Date tm;
+
+    /**
+     * 上报时间
+     */
+    @ApiModelProperty("上报时间")
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss",
+            timezone = "GMT+8"
+    )
+    private Date upTime;
+
+    /**
+     * 数据库入库时间
+     */
+    @ApiModelProperty("入库时间")
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss",
+            timezone = "GMT+8"
+    )
+    private Date fromTime;
+
+    @ApiModelProperty("河道水位")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private String waterLevelHigh;
+
+
+    @ApiModelProperty("河道流速")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private String waterFlowSpeed;
+
 }

src/main/java/org/springblade/modules/business/data/entity/RtuDataWqRiverStoreEntity.java

@@ -29,7 +29,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("data_szy_river")
-public class RtuDataWqRiverEntity extends BaseEntity {
+public class RtuDataWqRiverStoreEntity extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**

src/main/java/org/springblade/modules/business/data/entity/RtuRealTimeStatusEntity.java

@@ -6,7 +6,19 @@
  */
 package org.springblade.modules.business.data.entity;
 
-/*** 
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
+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:2023/6/15
  * Title:文件所属模块（必须填写）
  * Description：对本文件的详细描述，原则上不能少于30字
@@ -14,5 +26,177 @@ package org.springblade.modules.business.data.entity;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public class RtuRealTimeStatusEntity {
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("data_rtu_realtime_status")
+public class RtuRealTimeStatusEntity extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 租户ID
+     */
+    @ApiModelProperty("租户ID")
+    private String tenantId;
+
+    /**
+     * 测站编码
+     */
+    @ApiModelProperty("测站编码")
+    private String rtuCode;
+
+    /**
+     * 采集时间
+     */
+    @ApiModelProperty("采集时间")
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss",
+            timezone = "GMT+8"
+    )
+    private Date collectTime;
+
+    /**
+     * 上报时间
+     */
+    @ApiModelProperty("上报时间")
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss",
+            timezone = "GMT+8"
+    )
+    private Date upTime;
+
+
+    /**
+     * 数据库入库时间
+     */
+    @ApiModelProperty("入库时间")
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss",
+            timezone = "GMT+8"
+    )
+    private Date pickTime;
+
+    @ApiModelProperty("经度")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Double lng;
+
+    @ApiModelProperty("纬度")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Double lat;
+
+    @ApiModelProperty("信号强度")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Double dtuSignal;
+
+    @ApiModelProperty("电源电压")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Double voltage;
+
+    @ApiModelProperty("RTU温度")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Double temperature;
+
+    @ApiModelProperty("设备状态")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Integer rtuStatus;
+
+    @ApiModelProperty("异常值")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Integer rtuError;
+
+    @ApiModelProperty("电池状态")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private String batteryStatus;
+
+    @ApiModelProperty("充电状态")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private String batteryBatteryIn;
+
+    @ApiModelProperty("放电状态")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private String batteryBatteryOut;
+
+    @ApiModelProperty("电池电量 ,百分比")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Double batteryPower;
+
+    @ApiModelProperty("电池温度")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Double batteryTemperature;
+
+    @ApiModelProperty("太阳能板电压")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Double sunPowerVoltage;
+
+    @ApiModelProperty("太阳能板电流")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Double sunPowerElectric;
+
+    /**
+     * 交流电充电报警 0 正常 ，1停电
+     */
+    @ApiModelProperty("交流电充电报警")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Integer acChargeStatus;
+
+
+    /**
+     * 电池电压报警 0 正常 ，1报警
+     */
+    @ApiModelProperty("电池电压报警")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Integer batteryVoltageStatus;
+
+
+    @ApiModelProperty("水位超限报警状态")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Integer waterLevelOverStatus;
+
+    @ApiModelProperty("流量超限报警状态")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Integer waterFlowOverStatus;
+
+    @ApiModelProperty("水质超限报警状态")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Integer waterQualityStatus;
+
+    @ApiModelProperty("流量仪表状态")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Integer waterFlowSensorStatus;
+
+    @ApiModelProperty("水位仪表状态")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Integer waterLevelSensorStatus;
+
+    @ApiModelProperty("终端箱门状态")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Integer boxDoorStatus;
+
+    @ApiModelProperty("存储器状态")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Integer rtuMemoryStatus;
+
+    @ApiModelProperty("IC 卡功能 ")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Integer rtuIcCardStatus;
+
+    @ApiModelProperty("水泵工作状态 ")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Integer waterPumpStatus;
+
+    @ApiModelProperty("剩余水量报警 ")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Integer waterRemainOverStatus;
+
+    @ApiModelProperty("上报索引")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private String datagramChannelIndex;
 }

src/main/java/org/springblade/modules/business/data/entity/RtuRealTimeStatusStoreEntity.java

@@ -28,8 +28,8 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("data_rtu_realtime_status")
-public class RtuRealTimeStatusEntity extends BaseEntity {
+@TableName("data_rtu_history_status")
+public class RtuRealTimeStatusStoreEntity extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -140,21 +140,63 @@ public class RtuRealTimeStatusEntity extends BaseEntity {
     @JsonSerialize(nullsUsing = NullSerializer.class)
     private Double sunPowerElectric;
 
-    @ApiModelProperty("水位计状态")
-    @JsonSerialize(nullsUsing = NullSerializer.class)
-    private String waterSensorStatus;
-
     /**
      * 交流电充电报警 0 正常 ，1停电
      */
     @ApiModelProperty("交流电充电报警")
     @JsonSerialize(nullsUsing = NullSerializer.class)
-    private String acChargeWarning;
+    private Integer acChargeStatus;
+
 
     /**
      * 电池电压报警 0 正常 ，1报警
      */
     @ApiModelProperty("电池电压报警")
     @JsonSerialize(nullsUsing = NullSerializer.class)
-    private String batteryVoltageWarning;
+    private Integer batteryVoltageStatus;
+
+
+    @ApiModelProperty("水位超限报警状态")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Integer waterLevelOverStatus;
+
+    @ApiModelProperty("流量超限报警状态")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Integer waterFlowOverStatus;
+
+    @ApiModelProperty("水质超限报警状态")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Integer waterQualityStatus;
+
+    @ApiModelProperty("流量仪表状态")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Integer waterFlowSensorStatus;
+
+    @ApiModelProperty("水位仪表状态")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Integer waterLevelSensorStatus;
+
+    @ApiModelProperty("终端箱门状态")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Integer boxDoorStatus;
+
+    @ApiModelProperty("存储器状态")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Integer rtuMemoryStatus;
+
+    @ApiModelProperty("IC 卡功能 ")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Integer rtuIcCardStatus;
+
+    @ApiModelProperty("水泵工作状态 ")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Integer waterPumpStatus;
+
+    @ApiModelProperty("剩余水量报警 ")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Integer waterRemainOverStatus;
+
+    @ApiModelProperty("上报索引")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private String datagramChannelIndex;
 }

src/main/java/org/springblade/modules/business/data/mapper/RtuDataGroundHistoreMapper.java

@@ -9,12 +9,9 @@ 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.data.dto.RtuDataGroundDTO;
 import org.springblade.modules.business.data.dto.RtuDataGroundStoreDTO;
-import org.springblade.modules.business.data.entity.RtuDataGroundEntity;
 import org.springblade.modules.business.data.entity.RtuDataGroundStoreEntity;
 import org.springblade.modules.business.data.vo.RtuDataGroundStoreVO;
-import org.springblade.modules.business.data.vo.RtuDataGroundVO;
 
 import java.util.List;
 
@@ -26,7 +23,7 @@ import java.util.List;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public interface RtuDataGroundStoreMapper extends BaseMapper<RtuDataGroundStoreEntity> {
+public interface RtuDataGroundHistoreMapper extends BaseMapper<RtuDataGroundStoreEntity> {
 	/**
 	 * 自定义分页
 	 *

src/main/java/org/springblade/modules/business/data/mapper/RtuDataGroundHistoreMapper.xml

@@ -1,6 +1,6 @@
 <?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.data.mapper.RtuDataGroundStoreMapper">
+<mapper namespace="org.springblade.modules.business.data.mapper.RtuDataGroundHistoreMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="rtuGroundDataResultMap" type="org.springblade.modules.business.data.entity.RtuDataGroundStoreEntity">

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

@@ -17,6 +17,7 @@
         <result column="slm60" property="slm60"/>
         <result column="slm80" property="slm80"/>
         <result column="slm100" property="slm100"/>
+        <result column="up_time" property="upTime"/>
         <result column="from_time" property="fromTime"/>
     </resultMap>
 
@@ -37,6 +38,7 @@
         <result column="slm100" property="slm100"/>
         <result column="ad_city" property="adCity"/>
         <result column="ad_dist" property="adDist"/>
+        <result column="up_time" property="upTime"/>
         <result column="from_time" property="fromTime"/>
     </resultMap>
 

src/main/java/org/springblade/modules/business/data/mapper/RtuDataRainHistoreMapper.java

@@ -9,12 +9,9 @@ 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.data.dto.RtuDataRainDTO;
 import org.springblade.modules.business.data.dto.RtuDataRainStoreDTO;
-import org.springblade.modules.business.data.entity.RtuDataRainEntity;
 import org.springblade.modules.business.data.entity.RtuDataRainStoreEntity;
 import org.springblade.modules.business.data.vo.RtuDataRainStoreVO;
-import org.springblade.modules.business.data.vo.RtuDataRainVO;
 
 import java.util.List;
 
@@ -26,7 +23,7 @@ import java.util.List;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public interface RtuDataRainStoreMapper extends BaseMapper<RtuDataRainStoreEntity> {
+public interface RtuDataRainHistoreMapper extends BaseMapper<RtuDataRainStoreEntity> {
 	/**
 	 * 自定义分页
 	 *

src/main/java/org/springblade/modules/business/data/mapper/RtuDataRainHistoreMapper.xml

@@ -1,6 +1,6 @@
 <?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.data.mapper.RtuDataRainStoreMapper">
+<mapper namespace="org.springblade.modules.business.data.mapper.RtuDataRainHistoreMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="rtuRainDataResultMap" type="org.springblade.modules.business.data.entity.RtuDataRainStoreEntity">

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

@@ -7,6 +7,8 @@
         <result column="rtu_code" property="rtuCode"/>
         <result column="tm" property="tm"/>
         <result column="drp" property="drp"/>
+        <result column="intv" property="intv"/>
+        <result column="up_time" property="upTime"/>
         <result column="from_time" property="fromTime"/>
     </resultMap>
 
@@ -15,9 +17,11 @@
         <result column="rtu_code" property="rtuCode"/>
         <result column="tm" property="tm"/>
         <result column="drp" property="drp"/>
+        <result column="intv" property="intv"/>
         <result column="rtu_name" property="rtuName"/>
         <result column="ad_city" property="adCity"/>
         <result column="ad_dist" property="adDist"/>
+        <result column="up_time" property="upTime"/>
         <result column="from_time" property="fromTime"/>
     </resultMap>
 

src/main/java/org/springblade/modules/business/data/mapper/RtuDataRiverHistoreMapper.java

@@ -9,12 +9,9 @@ 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.data.dto.RtuDataRiverDTO;
 import org.springblade.modules.business.data.dto.RtuDataRiverStoreDTO;
-import org.springblade.modules.business.data.entity.RtuDataRiverEntity;
 import org.springblade.modules.business.data.entity.RtuDataRiverStoreEntity;
 import org.springblade.modules.business.data.vo.RtuDataRiverStoreVO;
-import org.springblade.modules.business.data.vo.RtuDataRiverVO;
 
 import java.util.List;
 
@@ -26,7 +23,7 @@ import java.util.List;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public interface RtuDataRiverStoreMapper extends BaseMapper<RtuDataRiverStoreEntity> {
+public interface RtuDataRiverHistoreMapper extends BaseMapper<RtuDataRiverStoreEntity> {
 	/**
 	 * 自定义分页
 	 *

src/main/java/org/springblade/modules/business/data/mapper/RtuDataRiverHistoreMapper.xml

@@ -1,6 +1,6 @@
 <?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.data.mapper.RtuDataRiverStoreMapper">
+<mapper namespace="org.springblade.modules.business.data.mapper.RtuDataRiverHistoreMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="rtuRiverDataEntityResultMap" type="org.springblade.modules.business.data.entity.RtuDataRiverStoreEntity">

src/main/java/org/springblade/modules/business/data/mapper/RtuDataRiverMapper.xml

@@ -7,6 +7,7 @@
         <result column="rtu_code" property="rtuCode"/>
         <result column="tm" property="tm"/>
         <result column="z" property="z"/>
+        <result column="up_time" property="upTime"/>
         <result column="from_time" property="fromTime"/>
     </resultMap>
 
@@ -17,6 +18,7 @@
         <result column="z" property="z"/>
         <result column="ad_city" property="adCity"/>
         <result column="ad_dist" property="adDist"/>
+        <result column="up_time" property="upTime"/>
         <result column="from_time" property="fromTime"/>
     </resultMap>
 
@@ -27,6 +29,7 @@
         <result column="rz" property="rz"/>
         <result column="ad_city" property="adCity"/>
         <result column="ad_dist" property="adDist"/>
+        <result column="up_time" property="upTime"/>
         <result column="from_time" property="fromTime"/>
     </resultMap>
 

src/main/java/org/springblade/modules/business/data/mapper/RtuDataRsvrHistoreMapper.java

@@ -9,12 +9,9 @@ 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.data.dto.RtuDataRsvrDTO;
 import org.springblade.modules.business.data.dto.RtuDataRsvrStoreDTO;
-import org.springblade.modules.business.data.entity.RtuDataRsvrEntity;
 import org.springblade.modules.business.data.entity.RtuDataRsvrStoreEntity;
 import org.springblade.modules.business.data.vo.RtuDataRsvrStoreVO;
-import org.springblade.modules.business.data.vo.RtuDataRsvrVO;
 
 import java.util.List;
 
@@ -27,7 +24,7 @@ import java.util.List;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public interface RtuDataRsvrStoreMapper extends BaseMapper<RtuDataRsvrStoreEntity> {
+public interface RtuDataRsvrHistoreMapper extends BaseMapper<RtuDataRsvrStoreEntity> {
 	/**
 	 * 自定义分页
 	 *

src/main/java/org/springblade/modules/business/data/mapper/RtuDataRsvrHistoreMapper.xml

@@ -1,6 +1,6 @@
 <?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.data.mapper.RtuDataRsvrStoreMapper">
+<mapper namespace="org.springblade.modules.business.data.mapper.RtuDataRsvrHistoreMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="rtuRsvrDataEntityResultMap" type="org.springblade.modules.business.data.entity.RtuDataRsvrStoreEntity">

src/main/java/org/springblade/modules/business/data/mapper/RtuDataRsvrMapper.xml

@@ -7,6 +7,7 @@
         <result column="rtu_code" property="rtuCode"/>
         <result column="tm" property="tm"/>
         <result column="rz" property="rz"/>
+        <result column="up_time" property="upTime"/>
         <result column="from_time" property="fromTime"/>
     </resultMap>
 
@@ -17,6 +18,7 @@
         <result column="rtu_name" property="rtuName"/>
         <result column="ad_city" property="adCity"/>
         <result column="ad_dist" property="adDist"/>
+        <result column="up_time" property="upTime"/>
         <result column="from_time" property="fromTime"/>
     </resultMap>
 

src/main/java/org/springblade/modules/business/data/mapper/RtuDataSzyMpHistoreMapper.java

@@ -7,13 +7,7 @@
 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.data.dto.RtuDataRsvrDTO;
-import org.springblade.modules.business.data.entity.RtuDataRsvrEntity;
-import org.springblade.modules.business.data.vo.RtuDataRsvrVO;
-
-import java.util.List;
+import org.springblade.modules.business.data.entity.RtuDataSzyFlowRateStoreEntity;
 
 
 /***
@@ -24,6 +18,6 @@ import java.util.List;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public interface RtuDataSzyMpMapper extends BaseMapper<RtuDataRsvrEntity> {
+public interface RtuDataSzyMpHistoreMapper extends BaseMapper<RtuDataSzyFlowRateStoreEntity> {
 
 }

src/main/java/org/springblade/modules/business/data/mapper/RtuDataSzyMpHistoreMapper.xml

@@ -1,46 +1,17 @@
 <?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.data.mapper.RtuDataRsvrMapper">
+<mapper namespace="org.springblade.modules.business.data.mapper.RtuDataSzyMpHistoreMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="rtuRsvrDataEntityResultMap" type="org.springblade.modules.business.data.entity.RtuDataRsvrEntity">
+    <resultMap id="entityResultMap" type="org.springblade.modules.business.data.entity.RtuDataSzyFlowRateStoreEntity">
         <result column="rtu_code" property="rtuCode"/>
         <result column="tm" property="tm"/>
-        <result column="rz" property="rz"/>
+        <result column="mp_q" property="mpQ"/>
+        <result column="acc_w" property="accW"/>
+        <result column="mp_sencond_q" property="mpSencondQ"/>
+        <result column="acc_sencond_w" property="accSencondW"/>
         <result column="up_time" property="upTime"/>
         <result column="from_time" property="fromTime"/>
     </resultMap>
 
-    <resultMap id="rtuRsvrDataVOResultMap" type="org.springblade.modules.business.data.vo.RtuDataRsvrVO">
-        <result column="rtu_code" property="rtuCode"/>
-        <result column="tm" property="tm"/>
-        <result column="rz" property="rz"/>
-        <result column="rtu_name" property="rtuName"/>
-        <result column="ad_city" property="adCity"/>
-        <result column="ad_dist" property="adDist"/>
-        <result column="up_time" property="upTime"/>
-        <result column="from_time" property="fromTime"/>
-    </resultMap>
-
-
-    <select id="selectPage" resultMap="rtuRsvrDataVOResultMap">
-        SELECT
-        n.*,
-        r.rtu_name,r.ad_city,r.ad_dist
-        FROM
-        data_att_st_res_ware_cache n
-        LEFT JOIN  rtu_info r ON n.rtu_code = r.rtu_code and r.is_deleted=0
-        LEFT JOIN  data_ad_cd_b a ON a.adcd = r.ad_code and a.is_deleted=0
-        WHERE
-        n.is_deleted = 0
-        <if test="rsvrDTO.rtuName!=null ">
-            and r.rtu_name LIKE concat(concat('%', #{rsvrDTO.rtuName}), '%')
-        </if>
-        <if test="rsvrDTO.rtuCode!=null">
-            and n.rtu_code like concat(concat('%', #{rsvrDTO.rtuCode}), '%')
-        </if>
-        <if test="rsvrDTO.adCode!=null">
-            and (a.adcd =#{rsvrDTO.adCode} or a.ancestors in (SELECT ancestors FROM data_ad_cd_b WHERE ancestors  like concat(concat('%', #{rsvrDTO.adCode}), '%')))
-        </if>
-    </select>
 </mapper>

src/main/java/org/springblade/modules/business/data/mapper/RtuDataSzyMpMapper.java

@@ -7,13 +7,8 @@
 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.data.dto.RtuDataRsvrDTO;
-import org.springblade.modules.business.data.entity.RtuDataRsvrEntity;
-import org.springblade.modules.business.data.vo.RtuDataRsvrVO;
+import org.springblade.modules.business.data.entity.RtuDataSzyFlowRateEntity;
 
-import java.util.List;
 
 
 /***
@@ -24,12 +19,6 @@ import java.util.List;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public interface RtuDataSzyRiverMapper extends BaseMapper<RtuDataRsvrEntity> {
-	/**
-	 * 自定义分页
-	 *
-	 * @param page 分页
-	 * @return List<RtuInfoVO>
-	 */
-	List<RtuDataRsvrVO> selectPage(IPage page, @Param("rsvrDTO") RtuDataRsvrDTO rsvrDTO);
+public interface RtuDataSzyMpMapper extends BaseMapper<RtuDataSzyFlowRateEntity> {
+
 }

src/main/java/org/springblade/modules/business/data/mapper/RtuDataSzyMpMapper.xml

@@ -1,46 +1,17 @@
 <?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.data.mapper.RtuDataRsvrMapper">
+<mapper namespace="org.springblade.modules.business.data.mapper.RtuDataSzyMpMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="rtuRsvrDataEntityResultMap" type="org.springblade.modules.business.data.entity.RtuDataRsvrEntity">
+    <resultMap id="entityResultMap" type="org.springblade.modules.business.data.entity.RtuDataSzyFlowRateEntity">
         <result column="rtu_code" property="rtuCode"/>
         <result column="tm" property="tm"/>
-        <result column="rz" property="rz"/>
+        <result column="mp_q" property="mpQ"/>
+        <result column="acc_w" property="accW"/>
+        <result column="mp_sencond_q" property="mpSencondQ"/>
+        <result column="acc_sencond_w" property="accSencondW"/>
         <result column="up_time" property="upTime"/>
         <result column="from_time" property="fromTime"/>
     </resultMap>
 
-    <resultMap id="rtuRsvrDataVOResultMap" type="org.springblade.modules.business.data.vo.RtuDataRsvrVO">
-        <result column="rtu_code" property="rtuCode"/>
-        <result column="tm" property="tm"/>
-        <result column="rz" property="rz"/>
-        <result column="rtu_name" property="rtuName"/>
-        <result column="ad_city" property="adCity"/>
-        <result column="ad_dist" property="adDist"/>
-        <result column="up_time" property="upTime"/>
-        <result column="from_time" property="fromTime"/>
-    </resultMap>
-
-
-    <select id="selectPage" resultMap="rtuRsvrDataVOResultMap">
-        SELECT
-        n.*,
-        r.rtu_name,r.ad_city,r.ad_dist
-        FROM
-        data_att_st_res_ware_cache n
-        LEFT JOIN  rtu_info r ON n.rtu_code = r.rtu_code and r.is_deleted=0
-        LEFT JOIN  data_ad_cd_b a ON a.adcd = r.ad_code and a.is_deleted=0
-        WHERE
-        n.is_deleted = 0
-        <if test="rsvrDTO.rtuName!=null ">
-            and r.rtu_name LIKE concat(concat('%', #{rsvrDTO.rtuName}), '%')
-        </if>
-        <if test="rsvrDTO.rtuCode!=null">
-            and n.rtu_code like concat(concat('%', #{rsvrDTO.rtuCode}), '%')
-        </if>
-        <if test="rsvrDTO.adCode!=null">
-            and (a.adcd =#{rsvrDTO.adCode} or a.ancestors in (SELECT ancestors FROM data_ad_cd_b WHERE ancestors  like concat(concat('%', #{rsvrDTO.adCode}), '%')))
-        </if>
-    </select>
 </mapper>

src/main/java/org/springblade/modules/business/data/mapper/RtuDataSzyRiverHistoreMapper.java

@@ -7,13 +7,7 @@
 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.data.dto.RtuDataRsvrDTO;
-import org.springblade.modules.business.data.entity.RtuDataRsvrEntity;
-import org.springblade.modules.business.data.vo.RtuDataRsvrVO;
-
-import java.util.List;
+import org.springblade.modules.business.data.entity.RtuDataWqRiverStoreEntity;
 
 
 /***
@@ -24,12 +18,6 @@ import java.util.List;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public interface RtuDataSzyRiverMapper extends BaseMapper<RtuDataRsvrEntity> {
-	/**
-	 * 自定义分页
-	 *
-	 * @param page 分页
-	 * @return List<RtuInfoVO>
-	 */
-	List<RtuDataRsvrVO> selectPage(IPage page, @Param("rsvrDTO") RtuDataRsvrDTO rsvrDTO);
+public interface RtuDataSzyRiverHistoreMapper extends BaseMapper<RtuDataWqRiverStoreEntity> {
+
 }

src/main/java/org/springblade/modules/business/data/mapper/RtuDataSzyRiverHistoreMapper.xml

@@ -1,46 +1,15 @@
 <?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.data.mapper.RtuDataRsvrMapper">
+<mapper namespace="org.springblade.modules.business.data.mapper.RtuDataSzyRiverHistoreMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="rtuRsvrDataEntityResultMap" type="org.springblade.modules.business.data.entity.RtuDataRsvrEntity">
+    <resultMap id="entityResultMap" type="org.springblade.modules.business.data.entity.RtuDataWqRiverStoreEntity">
         <result column="rtu_code" property="rtuCode"/>
         <result column="tm" property="tm"/>
-        <result column="rz" property="rz"/>
+        <result column="water_level_high" property="waterLevelHigh"/>
+        <result column="water_flow_speed" property="waterFlowSpeed"/>
         <result column="up_time" property="upTime"/>
         <result column="from_time" property="fromTime"/>
     </resultMap>
 
-    <resultMap id="rtuRsvrDataVOResultMap" type="org.springblade.modules.business.data.vo.RtuDataRsvrVO">
-        <result column="rtu_code" property="rtuCode"/>
-        <result column="tm" property="tm"/>
-        <result column="rz" property="rz"/>
-        <result column="rtu_name" property="rtuName"/>
-        <result column="ad_city" property="adCity"/>
-        <result column="ad_dist" property="adDist"/>
-        <result column="up_time" property="upTime"/>
-        <result column="from_time" property="fromTime"/>
-    </resultMap>
-
-
-    <select id="selectPage" resultMap="rtuRsvrDataVOResultMap">
-        SELECT
-        n.*,
-        r.rtu_name,r.ad_city,r.ad_dist
-        FROM
-        data_att_st_res_ware_cache n
-        LEFT JOIN  rtu_info r ON n.rtu_code = r.rtu_code and r.is_deleted=0
-        LEFT JOIN  data_ad_cd_b a ON a.adcd = r.ad_code and a.is_deleted=0
-        WHERE
-        n.is_deleted = 0
-        <if test="rsvrDTO.rtuName!=null ">
-            and r.rtu_name LIKE concat(concat('%', #{rsvrDTO.rtuName}), '%')
-        </if>
-        <if test="rsvrDTO.rtuCode!=null">
-            and n.rtu_code like concat(concat('%', #{rsvrDTO.rtuCode}), '%')
-        </if>
-        <if test="rsvrDTO.adCode!=null">
-            and (a.adcd =#{rsvrDTO.adCode} or a.ancestors in (SELECT ancestors FROM data_ad_cd_b WHERE ancestors  like concat(concat('%', #{rsvrDTO.adCode}), '%')))
-        </if>
-    </select>
 </mapper>

src/main/java/org/springblade/modules/business/data/mapper/RtuDataSzyRiverMapper.java

@@ -7,13 +7,8 @@
 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.data.dto.RtuDataRsvrDTO;
-import org.springblade.modules.business.data.entity.RtuDataRsvrEntity;
-import org.springblade.modules.business.data.vo.RtuDataRsvrVO;
+import org.springblade.modules.business.data.entity.RtuDataWqRiverEntity;
 
-import java.util.List;
 
 
 /***
@@ -24,12 +19,6 @@ import java.util.List;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public interface RtuDataRsvrMapper extends BaseMapper<RtuDataRsvrEntity> {
-	/**
-	 * 自定义分页
-	 *
-	 * @param page 分页
-	 * @return List<RtuInfoVO>
-	 */
-	List<RtuDataRsvrVO> selectPage(IPage page, @Param("rsvrDTO") RtuDataRsvrDTO rsvrDTO);
+public interface RtuDataSzyRiverMapper extends BaseMapper<RtuDataWqRiverEntity> {
+
 }

src/main/java/org/springblade/modules/business/data/mapper/RtuDataSzyRiverMapper.xml

@@ -1,46 +1,15 @@
 <?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.data.mapper.RtuDataRsvrMapper">
+<mapper namespace="org.springblade.modules.business.data.mapper.RtuDataSzyRiverMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="rtuRsvrDataEntityResultMap" type="org.springblade.modules.business.data.entity.RtuDataRsvrEntity">
+    <resultMap id="entityResultMap" type="org.springblade.modules.business.data.entity.RtuDataWqRiverEntity">
         <result column="rtu_code" property="rtuCode"/>
         <result column="tm" property="tm"/>
-        <result column="rz" property="rz"/>
+        <result column="water_level_high" property="waterLevelHigh"/>
+        <result column="water_flow_speed" property="waterFlowSpeed"/>
         <result column="up_time" property="upTime"/>
         <result column="from_time" property="fromTime"/>
     </resultMap>
 
-    <resultMap id="rtuRsvrDataVOResultMap" type="org.springblade.modules.business.data.vo.RtuDataRsvrVO">
-        <result column="rtu_code" property="rtuCode"/>
-        <result column="tm" property="tm"/>
-        <result column="rz" property="rz"/>
-        <result column="rtu_name" property="rtuName"/>
-        <result column="ad_city" property="adCity"/>
-        <result column="ad_dist" property="adDist"/>
-        <result column="up_time" property="upTime"/>
-        <result column="from_time" property="fromTime"/>
-    </resultMap>
-
-
-    <select id="selectPage" resultMap="rtuRsvrDataVOResultMap">
-        SELECT
-        n.*,
-        r.rtu_name,r.ad_city,r.ad_dist
-        FROM
-        data_att_st_res_ware_cache n
-        LEFT JOIN  rtu_info r ON n.rtu_code = r.rtu_code and r.is_deleted=0
-        LEFT JOIN  data_ad_cd_b a ON a.adcd = r.ad_code and a.is_deleted=0
-        WHERE
-        n.is_deleted = 0
-        <if test="rsvrDTO.rtuName!=null ">
-            and r.rtu_name LIKE concat(concat('%', #{rsvrDTO.rtuName}), '%')
-        </if>
-        <if test="rsvrDTO.rtuCode!=null">
-            and n.rtu_code like concat(concat('%', #{rsvrDTO.rtuCode}), '%')
-        </if>
-        <if test="rsvrDTO.adCode!=null">
-            and (a.adcd =#{rsvrDTO.adCode} or a.ancestors in (SELECT ancestors FROM data_ad_cd_b WHERE ancestors  like concat(concat('%', #{rsvrDTO.adCode}), '%')))
-        </if>
-    </select>
 </mapper>

src/main/java/org/springblade/modules/business/data/mapper/RtuDataWeatherMapper.java

@@ -6,14 +6,9 @@
  */
 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.data.dto.RtuDataRainDTO;
-import org.springblade.modules.business.data.entity.RtuDataRainEntity;
-import org.springblade.modules.business.data.vo.RtuDataRainVO;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.modules.business.data.entity.RtuDataWeatherEntity;
 
 /***
  * Date:2022/8/28
@@ -23,12 +18,6 @@ import java.util.List;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public interface RtuDataRainMapper extends BaseMapper<RtuDataRainEntity> {
-	/**
-	 * 自定义分页
-	 *
-	 * @param page 分页
-	 * @return List<RtuInfoVO>
-	 */
-	List<RtuDataRainVO> selectPage(IPage page, @Param("rtuDataRainDTO") RtuDataRainDTO rtuDataRainDTO);
+public interface RtuDataWeatherMapper extends BaseMapper<RtuDataWeatherEntity> {
+
 }

src/main/java/org/springblade/modules/business/data/mapper/RtuDataWeatherMapper.xml

@@ -1,50 +1,15 @@
 <?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.data.mapper.RtuDataRainMapper">
+<mapper namespace="org.springblade.modules.business.data.mapper.RtuDataWeatherMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="rtuRainDataResultMap" type="org.springblade.modules.business.data.entity.RtuDataRainEntity">
+    <resultMap id="rtuRainDataResultMap" type="org.springblade.modules.business.data.entity.RtuDataWeatherEntity">
         <result column="rtu_code" property="rtuCode"/>
         <result column="tm" property="tm"/>
-        <result column="drp" property="drp"/>
-        <result column="intv" property="intv"/>
+        <result column="ai" property="ai"/>
+        <result column="mst" property="mst"/>
         <result column="up_time" property="upTime"/>
         <result column="from_time" property="fromTime"/>
     </resultMap>
 
-
-    <resultMap id="rtuRainDataVOResultMap" type="org.springblade.modules.business.data.vo.RtuDataRainVO">
-        <result column="rtu_code" property="rtuCode"/>
-        <result column="tm" property="tm"/>
-        <result column="drp" property="drp"/>
-        <result column="intv" property="intv"/>
-        <result column="rtu_name" property="rtuName"/>
-        <result column="ad_city" property="adCity"/>
-        <result column="ad_dist" property="adDist"/>
-        <result column="up_time" property="upTime"/>
-        <result column="from_time" property="fromTime"/>
-    </resultMap>
-
-
-    <select id="selectPage" resultMap="rtuRainDataVOResultMap">
-        SELECT
-        n.*,
-        r.rtu_name,r.ad_city,r.ad_dist
-        FROM
-        data_att_st_prec_cache n
-        LEFT JOIN  rtu_info r ON n.rtu_code = r.rtu_code and r.is_deleted=0
-        LEFT JOIN  data_ad_cd_b a ON a.adcd = r.ad_code and a.is_deleted=0
-        WHERE
-        n.is_deleted = 0
-        <if test="rtuDataRainDTO.rtuName!=null ">
-            and r.rtu_name LIKE concat(concat('%', #{rtuDataRainDTO.rtuName}), '%')
-        </if>
-        <if test="rtuDataRainDTO.rtuCode!=null">
-            and n.rtu_code like concat(concat('%', #{rtuDataRainDTO.rtuCode}), '%')
-        </if>
-        <if test="rtuDataRainDTO.adCode!=null">
-            and (a.adcd =#{rtuDataRainDTO.adCode} or a.ancestors in (SELECT ancestors FROM data_ad_cd_b WHERE ancestors  like concat(concat('%', #{rtuDataRainDTO.adCode}), '%')))
-        </if>
-
-    </select>
 </mapper>

src/main/java/org/springblade/modules/business/data/mapper/RtuRealTimeStatusHistoreMapper.java

@@ -7,8 +7,7 @@
 package org.springblade.modules.business.data.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.modules.business.data.entity.RtuRealTimeStatusEntity;
-
+import org.springblade.modules.business.data.entity.RtuRealTimeStatusStoreEntity;
 
 
 /***
@@ -19,6 +18,6 @@ import org.springblade.modules.business.data.entity.RtuRealTimeStatusEntity;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public interface RtuRealTimeStatusMapper extends BaseMapper<RtuRealTimeStatusEntity> {
+public interface RtuRealTimeStatusHistoreMapper extends BaseMapper<RtuRealTimeStatusStoreEntity> {
 
 }

src/main/java/org/springblade/modules/business/data/mapper/RtuRealTimeStatusHistoreMapper.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.data.mapper.RtuRealTimeStatusMapper">
+<mapper namespace="org.springblade.modules.business.data.mapper.RtuRealTimeStatusHistoreMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="rtuRsvrDataEntityResultMap" type="org.springblade.modules.business.data.entity.RtuRealTimeStatusEntity">
+    <resultMap id="rtuRsvrDataEntityResultMap" type="org.springblade.modules.business.data.entity.RtuRealTimeStatusStoreEntity">
         <result column="rtu_code" property="rtuCode"/>
         <result column="collect_time" property="collectTime"/>
         <result column="up_time" property="upTime"/>
@@ -22,9 +22,18 @@
         <result column="battery_temperature" property="batteryTemperature"/>
         <result column="sun_power_voltage" property="sunPowerVoltage"/>
         <result column="sun_power_electric" property="sunPowerElectric"/>
-        <result column="water_sensor_status" property="waterSensorStatus"/>
-        <result column="ac_charge_warning" property="acChargeWarning"/>
-        <result column="battery_voltage_warning" property="batteryVoltageWarning"/>
+        <result column="ac_charge_status" property="acChargeStatus"/>
+        <result column="battery_voltage_status" property="batteryVoltageStatus"/>
+        <result column="water_level_over_status" property="waterLevelOverStatus"/>
+        <result column="water_flow_over_status" property="waterFlowOverStatus"/>
+        <result column="water_quality_status" property="waterQualityStatus"/>
+        <result column="water_flow_sensor_status" property="waterFlowSensorStatus"/>
+        <result column="water_level_sensor_status" property="waterLevelSensorStatus"/>
+        <result column="box_door_status" property="boxDoorStatus"/>
+        <result column="rtu_memory_status" property="rtuMemoryStatus"/>
+        <result column="rtu_ic_card_status" property="rtuIcCardStatus"/>
+        <result column="water_pump_status" property="waterPumpStatus"/>
+        <result column="water_remain_over_status" property="waterRemainOverStatus"/>
         <result column="datagram_channel_index" property="datagramChannelIndex"/>
 
     </resultMap>

src/main/java/org/springblade/modules/business/data/mapper/RtuRealTimeStatusMapper.java

@@ -7,13 +7,8 @@
 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.data.dto.RtuDataRsvrDTO;
-import org.springblade.modules.business.data.entity.RtuDataRsvrEntity;
-import org.springblade.modules.business.data.vo.RtuDataRsvrVO;
+import org.springblade.modules.business.data.entity.RtuRealTimeStatusEntity;
 
-import java.util.List;
 
 
 /***
@@ -24,12 +19,6 @@ import java.util.List;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public interface RtuDataRsvrMapper extends BaseMapper<RtuDataRsvrEntity> {
-	/**
-	 * 自定义分页
-	 *
-	 * @param page 分页
-	 * @return List<RtuInfoVO>
-	 */
-	List<RtuDataRsvrVO> selectPage(IPage page, @Param("rsvrDTO") RtuDataRsvrDTO rsvrDTO);
+public interface RtuRealTimeStatusMapper extends BaseMapper<RtuRealTimeStatusEntity> {
+
 }

src/main/java/org/springblade/modules/business/data/mapper/RtuRealTimeStatusMapper.xml

@@ -1,46 +1,41 @@
 <?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.data.mapper.RtuDataRsvrMapper">
+<mapper namespace="org.springblade.modules.business.data.mapper.RtuRealTimeStatusMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="rtuRsvrDataEntityResultMap" type="org.springblade.modules.business.data.entity.RtuDataRsvrEntity">
+    <resultMap id="rtuRsvrDataEntityResultMap" type="org.springblade.modules.business.data.entity.RtuRealTimeStatusEntity">
         <result column="rtu_code" property="rtuCode"/>
-        <result column="tm" property="tm"/>
-        <result column="rz" property="rz"/>
+        <result column="collect_time" property="collectTime"/>
         <result column="up_time" property="upTime"/>
-        <result column="from_time" property="fromTime"/>
-    </resultMap>
+        <result column="pick_time" property="pickTime"/>
+        <result column="lng" property="lng"/>
+        <result column="lat" property="lat"/>
+        <result column="dtu_signal" property="dtuSignal"/>
+        <result column="voltage" property="voltage"/>
+        <result column="temperature" property="temperature"/>
+        <result column="rtu_status" property="rtuStatus"/>
+        <result column="rtu_error" property="rtuError"/>
+        <result column="battery_status" property="batteryStatus"/>
+        <result column="battery_battery_in" property="batteryBatteryIn"/>
+        <result column="battery_battery_out" property="batteryBatteryOut"/>
+        <result column="battery_power" property="batteryPower"/>
+        <result column="battery_temperature" property="batteryTemperature"/>
+        <result column="sun_power_voltage" property="sunPowerVoltage"/>
+        <result column="sun_power_electric" property="sunPowerElectric"/>
+        <result column="ac_charge_status" property="acChargeStatus"/>
+        <result column="battery_voltage_status" property="batteryVoltageStatus"/>
+        <result column="water_level_over_status" property="waterLevelOverStatus"/>
+        <result column="water_flow_over_status" property="waterFlowOverStatus"/>
+        <result column="water_quality_status" property="waterQualityStatus"/>
+        <result column="water_flow_sensor_status" property="waterFlowSensorStatus"/>
+        <result column="water_level_sensor_status" property="waterLevelSensorStatus"/>
+        <result column="box_door_status" property="boxDoorStatus"/>
+        <result column="rtu_memory_status" property="rtuMemoryStatus"/>
+        <result column="rtu_ic_card_status" property="rtuIcCardStatus"/>
+        <result column="water_pump_status" property="waterPumpStatus"/>
+        <result column="water_remain_over_status" property="waterRemainOverStatus"/>
+        <result column="datagram_channel_index" property="datagramChannelIndex"/>
 
-    <resultMap id="rtuRsvrDataVOResultMap" type="org.springblade.modules.business.data.vo.RtuDataRsvrVO">
-        <result column="rtu_code" property="rtuCode"/>
-        <result column="tm" property="tm"/>
-        <result column="rz" property="rz"/>
-        <result column="rtu_name" property="rtuName"/>
-        <result column="ad_city" property="adCity"/>
-        <result column="ad_dist" property="adDist"/>
-        <result column="up_time" property="upTime"/>
-        <result column="from_time" property="fromTime"/>
     </resultMap>
 
-
-    <select id="selectPage" resultMap="rtuRsvrDataVOResultMap">
-        SELECT
-        n.*,
-        r.rtu_name,r.ad_city,r.ad_dist
-        FROM
-        data_att_st_res_ware_cache n
-        LEFT JOIN  rtu_info r ON n.rtu_code = r.rtu_code and r.is_deleted=0
-        LEFT JOIN  data_ad_cd_b a ON a.adcd = r.ad_code and a.is_deleted=0
-        WHERE
-        n.is_deleted = 0
-        <if test="rsvrDTO.rtuName!=null ">
-            and r.rtu_name LIKE concat(concat('%', #{rsvrDTO.rtuName}), '%')
-        </if>
-        <if test="rsvrDTO.rtuCode!=null">
-            and n.rtu_code like concat(concat('%', #{rsvrDTO.rtuCode}), '%')
-        </if>
-        <if test="rsvrDTO.adCode!=null">
-            and (a.adcd =#{rsvrDTO.adCode} or a.ancestors in (SELECT ancestors FROM data_ad_cd_b WHERE ancestors  like concat(concat('%', #{rsvrDTO.adCode}), '%')))
-        </if>
-    </select>
 </mapper>

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

@@ -9,10 +9,9 @@ package org.springblade.modules.business.data.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.entity.EtlGroundDataEntity;
-import org.springblade.modules.business.data.dto.RtuDataGroundDTO;
-import org.springblade.modules.business.data.entity.RtuDataGroundEntity;
-import org.springblade.modules.business.data.vo.RtuDataGroundVO;
+import org.springblade.modules.business.data.dto.RtuDataGroundStoreDTO;
+import org.springblade.modules.business.data.entity.RtuDataGroundStoreEntity;
+import org.springblade.modules.business.data.vo.RtuDataGroundStoreVO;
 
 /***
  * Date:2022/8/28
@@ -22,18 +21,13 @@ import org.springblade.modules.business.data.vo.RtuDataGroundVO;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public interface IRtuDataGroundService extends BaseService<RtuDataGroundEntity> {
+public interface IRtuDataGroundHistoreService extends BaseService<RtuDataGroundStoreEntity> {
 	/**
 	 * 自定义分页
 	 * @param page
 	 * @return
 	 */
-	IPage<RtuDataGroundVO> selectPage(IPage<RtuDataGroundVO> page, RtuDataGroundDTO rtuDataGroundDTO);
+	IPage<RtuDataGroundStoreVO> selectPage(IPage<RtuDataGroundStoreVO> page, RtuDataGroundStoreDTO rtuDataGroundDTO);
+
 
-	/**
-	 * 更新或插入墒情数据
-	 * @param etlGroundDataEntity
-	 * @return
-	 */
-	boolean updateGroundInfo(EtlGroundDataEntity etlGroundDataEntity);
 }

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

@@ -9,10 +9,10 @@ package org.springblade.modules.business.data.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.entity.EtlRainDataEntity;
-import org.springblade.modules.business.data.dto.RtuDataRainDTO;
-import org.springblade.modules.business.data.entity.RtuDataRainEntity;
-import org.springblade.modules.business.data.vo.RtuDataRainVO;
+import org.springblade.modules.business.data.dto.RtuDataRainStoreDTO;
+import org.springblade.modules.business.data.entity.RtuDataRainStoreEntity;
+import org.springblade.modules.business.data.vo.RtuDataRainStoreVO;
+
 
 /***
  * Date:2022/8/28
@@ -22,18 +22,12 @@ import org.springblade.modules.business.data.vo.RtuDataRainVO;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public interface IRtuDataRainService extends BaseService<RtuDataRainEntity> {
+public interface IRtuDataRainHistoreService extends BaseService<RtuDataRainStoreEntity> {
 	/**
 	 * 自定义分页
 	 * @param page
 	 * @return
 	 */
-	IPage<RtuDataRainVO> selectPage(IPage<RtuDataRainVO> page, RtuDataRainDTO rtuDataRainDTO);
+	IPage<RtuDataRainStoreVO> selectPage(IPage<RtuDataRainStoreVO> page, RtuDataRainStoreDTO rtuDataRainDTO);
 
-	/**
-	 * 更新或插入雨情数据
-	 * @param entity
-	 * @return
-	 */
-	boolean updateRainInfo(RtuDataRainEntity entity);
 }

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

@@ -32,8 +32,8 @@ public interface IRtuDataRainService extends BaseService<RtuDataRainEntity> {
 
 	/**
 	 * 更新或插入雨情数据
-	 * @param etlRainDataEntity
+	 * @param entity
 	 * @return
 	 */
-	boolean updateRainInfo(EtlRainDataEntity etlRainDataEntity);
+	boolean updateRainInfo(RtuDataRainEntity entity);
 }

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

@@ -8,14 +8,10 @@ package org.springblade.modules.business.data.service;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.ibatis.annotations.Param;
-import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.entity.EtlRiverDataEntity;
-import org.springblade.modules.business.data.dto.RtuDataRiverDTO;
-import org.springblade.modules.business.data.entity.RtuDataRiverEntity;
-import org.springblade.modules.business.data.vo.RtuDataRiverVO;
-
-import java.util.List;
+import org.springblade.core.mp.base.BaseService;;
+import org.springblade.modules.business.data.dto.RtuDataRiverStoreDTO;
+import org.springblade.modules.business.data.entity.RtuDataRiverStoreEntity;
+import org.springblade.modules.business.data.vo.RtuDataRiverStoreVO;
 
 /***
  * Date:2022/8/28
@@ -25,20 +21,13 @@ import java.util.List;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public interface IRtuDataRiverService extends BaseService<RtuDataRiverEntity> {
+public interface IRtuDataRiverHistoreService extends BaseService<RtuDataRiverStoreEntity> {
 	/**
 	 * 自定义分页
 	 * @param page
 	 * @return
 	 */
-	IPage<RtuDataRiverVO> selectPage(IPage<RtuDataRiverVO> page, RtuDataRiverDTO rtuDataRiverDTO);
+	IPage<RtuDataRiverStoreVO> selectPage(IPage<RtuDataRiverStoreVO> page, RtuDataRiverStoreDTO rtuDataRiverDTO);
 
-	/**
-	 * 更新或插入河道水情数据
-	 * @param entity
-	 * @return
-	 */
-	boolean updateRiverInfo(RtuDataRiverEntity entity);
 
-	IPage<RtuDataRiverVO> selectWaterPage(IPage<RtuDataRiverVO> page, RtuDataRiverDTO rtuDataRiverDTO);
 }

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

@@ -35,10 +35,10 @@ public interface IRtuDataRiverService extends BaseService<RtuDataRiverEntity> {
 
 	/**
 	 * 更新或插入河道水情数据
-	 * @param etlRiverDataEntity
+	 * @param entity
 	 * @return
 	 */
-	boolean updateRiverInfo(EtlRiverDataEntity etlRiverDataEntity);
+	boolean updateRiverInfo(RtuDataRiverEntity entity);
 
 	IPage<RtuDataRiverVO> selectWaterPage(IPage<RtuDataRiverVO> page, RtuDataRiverDTO rtuDataRiverDTO);
 }

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

@@ -9,10 +9,9 @@ package org.springblade.modules.business.data.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.entity.EtlRsvrDataEntity;
-import org.springblade.modules.business.data.dto.RtuDataRsvrDTO;
-import org.springblade.modules.business.data.entity.RtuDataRsvrEntity;
-import org.springblade.modules.business.data.vo.RtuDataRsvrVO;
+import org.springblade.modules.business.data.dto.RtuDataRsvrStoreDTO;
+import org.springblade.modules.business.data.entity.RtuDataRsvrStoreEntity;
+import org.springblade.modules.business.data.vo.RtuDataRsvrStoreVO;
 
 /***
  * Date:2022/8/28
@@ -22,18 +21,13 @@ import org.springblade.modules.business.data.vo.RtuDataRsvrVO;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public interface IRtuDataRsvrService extends BaseService<RtuDataRsvrEntity> {
+public interface IRtuDataRsvrHistoreService extends BaseService<RtuDataRsvrStoreEntity> {
 	/**
 	 * 自定义分页
 	 * @param page
 	 * @return
 	 */
-	IPage<RtuDataRsvrVO> selectPage(IPage<RtuDataRsvrVO> page, RtuDataRsvrDTO rtuDataRsvrDTO);
+	IPage<RtuDataRsvrStoreVO> selectPage(IPage<RtuDataRsvrStoreVO> page, RtuDataRsvrStoreDTO rtuDataRsvrDTO);
+
 
-	/**
-	 * 更新或插入水库水情数据
-	 * @param entity
-	 * @return
-	 */
-	boolean updateRsvrInfo(RtuDataRsvrEntity entity);
 }

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

@@ -32,8 +32,8 @@ public interface IRtuDataRsvrService extends BaseService<RtuDataRsvrEntity> {
 
 	/**
 	 * 更新或插入水库水情数据
-	 * @param etlRsvrDataEntity
+	 * @param entity
 	 * @return
 	 */
-	boolean updateRsvrInfo(EtlRsvrDataEntity etlRsvrDataEntity);
+	boolean updateRsvrInfo(RtuDataRsvrEntity entity);
 }

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

@@ -7,7 +7,7 @@
 package org.springblade.modules.business.data.service;
 
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.modules.business.data.entity.RtuDataSzyFlowRateEntity;
+import org.springblade.modules.business.data.entity.RtuDataSzyFlowRateStoreEntity;
 
 /***
  * Date:2023/6/16
@@ -17,5 +17,5 @@ import org.springblade.modules.business.data.entity.RtuDataSzyFlowRateEntity;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public interface IRtuDataSzyMpService extends BaseService<RtuDataSzyFlowRateEntity> {
+public interface IRtuDataSzyMpHistoreService extends BaseService<RtuDataSzyFlowRateStoreEntity> {
 }

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

@@ -6,7 +6,11 @@
  */
 package org.springblade.modules.business.data.service;
 
-/*** 
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.business.data.entity.RtuDataRainEntity;
+import org.springblade.modules.business.data.entity.RtuDataSzyFlowRateEntity;
+
+/***
  * Date:2023/6/16
  * Title:文件所属模块（必须填写）
  * Description：对本文件的详细描述，原则上不能少于30字
@@ -14,5 +18,6 @@ package org.springblade.modules.business.data.service;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public class IRtuDataSzyMpService {
+public interface IRtuDataSzyMpService extends BaseService<RtuDataSzyFlowRateEntity> {
+    boolean updateInfo(RtuDataSzyFlowRateEntity entity);
 }

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

@@ -7,7 +7,7 @@
 package org.springblade.modules.business.data.service;
 
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.modules.business.data.entity.RtuDataWqRiverEntity;
+import org.springblade.modules.business.data.entity.RtuDataWqRiverStoreEntity;
 
 /***
  * Date:2023/6/16
@@ -17,5 +17,5 @@ import org.springblade.modules.business.data.entity.RtuDataWqRiverEntity;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public interface IRtuDataSzyRiverService extends BaseService<RtuDataWqRiverEntity> {
+public interface IRtuDataSzyRiverHistoreService extends BaseService<RtuDataWqRiverStoreEntity> {
 }

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

@@ -6,7 +6,11 @@
  */
 package org.springblade.modules.business.data.service;
 
-/*** 
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.business.data.entity.RtuDataSzyFlowRateEntity;
+import org.springblade.modules.business.data.entity.RtuDataWqRiverEntity;
+
+/***
  * Date:2023/6/16
  * Title:文件所属模块（必须填写）
  * Description：对本文件的详细描述，原则上不能少于30字
@@ -14,5 +18,6 @@ package org.springblade.modules.business.data.service;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public class IRtuDataSzyRiverService {
+public interface IRtuDataSzyRiverService extends BaseService<RtuDataWqRiverEntity> {
+    boolean updateInfo(RtuDataWqRiverEntity entity);
 }

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

@@ -7,12 +7,9 @@
 package org.springblade.modules.business.data.service;
 
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.etl.entity.EtlRainDataEntity;
-import org.springblade.modules.business.data.dto.RtuDataRainDTO;
-import org.springblade.modules.business.data.entity.RtuDataRainEntity;
-import org.springblade.modules.business.data.vo.RtuDataRainVO;
+import org.springblade.modules.business.data.entity.RtuDataWeatherEntity;
+
 
 /***
  * Date:2022/8/28
@@ -22,18 +19,6 @@ import org.springblade.modules.business.data.vo.RtuDataRainVO;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public interface IRtuDataRainService extends BaseService<RtuDataRainEntity> {
-	/**
-	 * 自定义分页
-	 * @param page
-	 * @return
-	 */
-	IPage<RtuDataRainVO> selectPage(IPage<RtuDataRainVO> page, RtuDataRainDTO rtuDataRainDTO);
+public interface IRtuDataWeatherService extends BaseService<RtuDataWeatherEntity> {
 
-	/**
-	 * 更新或插入雨情数据
-	 * @param entity
-	 * @return
-	 */
-	boolean updateRainInfo(RtuDataRainEntity entity);
 }

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

@@ -1,7 +1,10 @@
 package org.springblade.modules.business.data.service;
 
+import com.alibaba.fastjson.JSONObject;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.modules.business.data.entity.RtuRealTimeStatusEntity;
+import org.springblade.modules.business.data.entity.RtuRealTimeStatusStoreEntity;
 
-public interface IRtuRealTimeStatusService extends BaseService<RtuRealTimeStatusEntity> {
+public interface IRtuRealTimeStatusHistoreService extends BaseService<RtuRealTimeStatusStoreEntity> {
+    boolean saveExtStatus(JSONObject data);
+    boolean saveWarnStatus(JSONObject data);
 }

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

@@ -1,4 +1,10 @@
 package org.springblade.modules.business.data.service;
 
-public interface IRtuRealTimeStatusService {
+import com.alibaba.fastjson.JSONObject;
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.business.data.entity.RtuRealTimeStatusEntity;
+
+public interface IRtuRealTimeStatusService extends BaseService<RtuRealTimeStatusEntity> {
+    boolean updateExtStatus(JSONObject data);
+    boolean updateWarnStatus(JSONObject data);
 }

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

@@ -6,20 +6,15 @@
  */
 package org.springblade.modules.business.data.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.entity.EtlGroundDataEntity;
-import org.springblade.modules.business.data.dto.RtuDataGroundDTO;
-import org.springblade.modules.business.data.entity.RtuDataGroundEntity;
-import org.springblade.modules.business.data.mapper.RtuDataGroundMapper;
-import org.springblade.modules.business.data.service.IRtuDataGroundService;
-import org.springblade.modules.business.data.vo.RtuDataGroundVO;
+import org.springblade.modules.business.data.dto.RtuDataGroundStoreDTO;
+import org.springblade.modules.business.data.entity.RtuDataGroundStoreEntity;
+import org.springblade.modules.business.data.mapper.RtuDataGroundHistoreMapper;
+import org.springblade.modules.business.data.service.IRtuDataGroundHistoreService;
+import org.springblade.modules.business.data.vo.RtuDataGroundStoreVO;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-
 /***
  * Date:2022/8/28
  * Title:文件所属模块（必须填写）
@@ -29,37 +24,10 @@ import java.util.Date;
  * Remark：认为有必要的其他信息
  */
 @Service
-public class RtuDataGroundServiceImpl extends BaseServiceImpl<RtuDataGroundMapper, RtuDataGroundEntity> implements IRtuDataGroundService {
+public class RtuDataGroundHistoreServiceImpl extends BaseServiceImpl<RtuDataGroundHistoreMapper, RtuDataGroundStoreEntity> implements IRtuDataGroundHistoreService {
 	@Override
-	public IPage<RtuDataGroundVO> selectPage(IPage<RtuDataGroundVO> page, RtuDataGroundDTO rtuDataGroundDTO) {
+	public IPage<RtuDataGroundStoreVO> selectPage(IPage<RtuDataGroundStoreVO> page, RtuDataGroundStoreDTO rtuDataGroundDTO) {
 		return page.setRecords(baseMapper.selectPage(page, rtuDataGroundDTO));
 	}
 
-	@Override
-	public boolean updateGroundInfo(EtlGroundDataEntity etlGroundDataEntity) {
-		LambdaQueryWrapper<RtuDataGroundEntity> dataWrapper = Wrappers.<RtuDataGroundEntity>query().lambda();
-		dataWrapper.eq(RtuDataGroundEntity::getRtuCode, etlGroundDataEntity.getRtuCode());
-		dataWrapper.eq(RtuDataGroundEntity::getIsDeleted, 0);
-		RtuDataGroundEntity groundDataEntity = this.getOne(dataWrapper);
-		if (null == groundDataEntity) {
-			groundDataEntity = new RtuDataGroundEntity();
-			groundDataEntity.setRtuCode(etlGroundDataEntity.getRtuCode());
-			groundDataEntity.setCreateTime(new Date());
-			groundDataEntity.setStatus(1);
-			groundDataEntity.setIsDeleted(0);
-		}
-		groundDataEntity.setSlm10(etlGroundDataEntity.getMoco10cm());
-		groundDataEntity.setSlm20(etlGroundDataEntity.getMoco20cm());
-		groundDataEntity.setSlm30(etlGroundDataEntity.getMoco30cm());
-		groundDataEntity.setSlm40(etlGroundDataEntity.getMoco40cm());
-		groundDataEntity.setSlm50(etlGroundDataEntity.getMoco50cm());
-		groundDataEntity.setSlm60(etlGroundDataEntity.getMoco60cm());
-		groundDataEntity.setSlm80(etlGroundDataEntity.getMoco80cm());
-		groundDataEntity.setSlm100(etlGroundDataEntity.getMoco100cm());
-		groundDataEntity.setSrlslm(etlGroundDataEntity.getSurfMoco());
-		groundDataEntity.setVtavslm(etlGroundDataEntity.getVertAverMoco());
-		groundDataEntity.setTm(etlGroundDataEntity.getTm());
-		groundDataEntity.setFromTime(etlGroundDataEntity.getFromDate());
-		return this.saveOrUpdate(groundDataEntity);
-	}
 }

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

@@ -6,20 +6,16 @@
  */
 package org.springblade.modules.business.data.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.entity.EtlRainDataEntity;
-import org.springblade.modules.business.data.dto.RtuDataRainDTO;
-import org.springblade.modules.business.data.entity.RtuDataRainEntity;
-import org.springblade.modules.business.data.mapper.RtuDataRainMapper;
-import org.springblade.modules.business.data.service.IRtuDataRainService;
-import org.springblade.modules.business.data.vo.RtuDataRainVO;
+import org.springblade.modules.business.data.dto.RtuDataRainStoreDTO;
+import org.springblade.modules.business.data.entity.RtuDataRainStoreEntity;
+import org.springblade.modules.business.data.mapper.RtuDataRainHistoreMapper;
+import org.springblade.modules.business.data.service.IRtuDataRainHistoreService;
+import org.springblade.modules.business.data.vo.RtuDataRainStoreVO;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-import java.util.Date;
 
 /***
  * Date:2022/8/28
@@ -30,23 +26,11 @@ import java.util.Date;
  * Remark：认为有必要的其他信息
  */
 @Service
-public class RtuDataRainServiceImpl extends BaseServiceImpl<RtuDataRainMapper, RtuDataRainEntity> implements IRtuDataRainService {
+public class RtuDataRainHistoreServiceImpl extends BaseServiceImpl<RtuDataRainHistoreMapper, RtuDataRainStoreEntity> implements IRtuDataRainHistoreService {
 
 	@Override
-	public IPage<RtuDataRainVO> selectPage(IPage<RtuDataRainVO> page, RtuDataRainDTO rtuDataRainDTO) {
+	public IPage<RtuDataRainStoreVO> selectPage(IPage<RtuDataRainStoreVO> page, RtuDataRainStoreDTO rtuDataRainDTO) {
 		return page.setRecords(baseMapper.selectPage(page, rtuDataRainDTO));
 	}
 
-	@Override
-	public boolean updateRainInfo(RtuDataRainEntity entity) {
-		LambdaQueryWrapper<RtuDataRainEntity> dataWrapper = Wrappers.<RtuDataRainEntity>query().lambda();
-		dataWrapper.eq(RtuDataRainEntity::getRtuCode, entity.getRtuCode());
-		dataWrapper.eq(RtuDataRainEntity::getIsDeleted, 0);
-		RtuDataRainEntity rainEntity = this.getOne(dataWrapper);
-		if (null != rainEntity) {
-			entity.setId(rainEntity.getId());
-		}
-		entity.setUpdateTime(new Date());
-		return this.saveOrUpdate(entity);
-	}
 }

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

@@ -38,23 +38,15 @@ public class RtuDataRainServiceImpl extends BaseServiceImpl<RtuDataRainMapper, R
 	}
 
 	@Override
-	public boolean updateRainInfo(EtlRainDataEntity etlRainDataEntity) {
+	public boolean updateRainInfo(RtuDataRainEntity entity) {
 		LambdaQueryWrapper<RtuDataRainEntity> dataWrapper = Wrappers.<RtuDataRainEntity>query().lambda();
-		dataWrapper.eq(RtuDataRainEntity::getRtuCode, etlRainDataEntity.getRtuCode());
+		dataWrapper.eq(RtuDataRainEntity::getRtuCode, entity.getRtuCode());
 		dataWrapper.eq(RtuDataRainEntity::getIsDeleted, 0);
 		RtuDataRainEntity rainEntity = this.getOne(dataWrapper);
-		if (null == rainEntity) {
-			rainEntity = new RtuDataRainEntity();
-			rainEntity.setRtuCode(etlRainDataEntity.getRtuCode());
-			rainEntity.setCreateTime(new Date());
-			rainEntity.setStatus(1);
-			rainEntity.setIsDeleted(0);
+		if (null != rainEntity) {
+			entity.setId(rainEntity.getId());
 		}
-		rainEntity.setUpdateTime(new Date());
-		rainEntity.setDrp(etlRainDataEntity.getDrp());
-		rainEntity.setIntv(etlRainDataEntity.getIntv());
-		rainEntity.setTm(etlRainDataEntity.getTm());
-		rainEntity.setFromTime(etlRainDataEntity.getFromDate());
-		return this.saveOrUpdate(rainEntity);
+		entity.setUpdateTime(new Date());
+		return this.saveOrUpdate(entity);
 	}
 }

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

@@ -7,20 +7,15 @@
 package org.springblade.modules.business.data.service.impl;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.entity.EtlRiverDataEntity;
-import org.springblade.modules.business.data.dto.RtuDataRiverDTO;
-import org.springblade.modules.business.data.entity.RtuDataRiverEntity;
-import org.springblade.modules.business.data.mapper.RtuDataRiverMapper;
-import org.springblade.modules.business.data.service.IRtuDataRiverService;
-import org.springblade.modules.business.data.vo.RtuDataRiverVO;
+import org.springblade.modules.business.data.dto.RtuDataRiverStoreDTO;
+import org.springblade.modules.business.data.entity.RtuDataRiverStoreEntity;
+import org.springblade.modules.business.data.mapper.RtuDataRiverHistoreMapper;
+import org.springblade.modules.business.data.service.IRtuDataRiverHistoreService;
+import org.springblade.modules.business.data.vo.RtuDataRiverStoreVO;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.List;
 
 /***
  * Date:2022/8/28
@@ -31,27 +26,10 @@ import java.util.List;
  * Remark：认为有必要的其他信息
  */
 @Service
-public class RtuDataRiverServiceImpl extends BaseServiceImpl<RtuDataRiverMapper, RtuDataRiverEntity> implements IRtuDataRiverService {
+public class RtuDataRiverHistoreServiceImpl extends BaseServiceImpl<RtuDataRiverHistoreMapper, RtuDataRiverStoreEntity> implements IRtuDataRiverHistoreService {
     @Override
-    public IPage<RtuDataRiverVO> selectPage(IPage<RtuDataRiverVO> page, RtuDataRiverDTO rtuDataRiverDTO) {
+    public IPage<RtuDataRiverStoreVO> selectPage(IPage<RtuDataRiverStoreVO> page, RtuDataRiverStoreDTO rtuDataRiverDTO) {
         return page.setRecords(baseMapper.selectPage(page, rtuDataRiverDTO));
     }
 
-    @Override
-    public boolean updateRiverInfo(RtuDataRiverEntity entity) {
-        LambdaQueryWrapper<RtuDataRiverEntity> dataWrapper = Wrappers.<RtuDataRiverEntity>query().lambda();
-        dataWrapper.eq(RtuDataRiverEntity::getRtuCode, entity.getRtuCode());
-        dataWrapper.eq(RtuDataRiverEntity::getIsDeleted, 0);
-        RtuDataRiverEntity riverEntity = this.getOne(dataWrapper);
-        if (null != riverEntity) {
-            entity.setId(riverEntity.getId());
-        }
-        entity.setUpdateTime(new Date());
-        return this.saveOrUpdate(entity);
-    }
-
-    @Override
-    public IPage<RtuDataRiverVO> selectWaterPage(IPage<RtuDataRiverVO> page, RtuDataRiverDTO rtuDataRiverDTO) {
-        return page.setRecords(baseMapper.selectWaterPage(page, rtuDataRiverDTO));
-    }
 }

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

@@ -32,33 +32,26 @@ import java.util.List;
  */
 @Service
 public class RtuDataRiverServiceImpl extends BaseServiceImpl<RtuDataRiverMapper, RtuDataRiverEntity> implements IRtuDataRiverService {
-	@Override
-	public IPage<RtuDataRiverVO> selectPage(IPage<RtuDataRiverVO> page, RtuDataRiverDTO rtuDataRiverDTO) {
-		return page.setRecords(baseMapper.selectPage(page, rtuDataRiverDTO));
-	}
+    @Override
+    public IPage<RtuDataRiverVO> selectPage(IPage<RtuDataRiverVO> page, RtuDataRiverDTO rtuDataRiverDTO) {
+        return page.setRecords(baseMapper.selectPage(page, rtuDataRiverDTO));
+    }
 
-	@Override
-	public boolean updateRiverInfo(EtlRiverDataEntity etlRiverDataEntity) {
-		LambdaQueryWrapper<RtuDataRiverEntity> dataWrapper = Wrappers.<RtuDataRiverEntity>query().lambda();
-		dataWrapper.eq(RtuDataRiverEntity::getRtuCode, etlRiverDataEntity.getRtuCode());
-		dataWrapper.eq(RtuDataRiverEntity::getIsDeleted, 0);
-		RtuDataRiverEntity riverEntity = this.getOne(dataWrapper);
-		if (null == riverEntity) {
-			riverEntity = new RtuDataRiverEntity();
-			riverEntity.setRtuCode(etlRiverDataEntity.getRtuCode());
-			riverEntity.setCreateTime(new Date());
-			riverEntity.setStatus(1);
-			riverEntity.setIsDeleted(0);
-		}
-		riverEntity.setUpdateTime(new Date());
-		riverEntity.setZ(etlRiverDataEntity.getZ());
-		riverEntity.setTm(etlRiverDataEntity.getTm());
-		riverEntity.setFromTime(etlRiverDataEntity.getFromDate());
-		return this.saveOrUpdate(riverEntity);
-	}
+    @Override
+    public boolean updateRiverInfo(RtuDataRiverEntity entity) {
+        LambdaQueryWrapper<RtuDataRiverEntity> dataWrapper = Wrappers.<RtuDataRiverEntity>query().lambda();
+        dataWrapper.eq(RtuDataRiverEntity::getRtuCode, entity.getRtuCode());
+        dataWrapper.eq(RtuDataRiverEntity::getIsDeleted, 0);
+        RtuDataRiverEntity riverEntity = this.getOne(dataWrapper);
+        if (null != riverEntity) {
+            entity.setId(riverEntity.getId());
+        }
+        entity.setUpdateTime(new Date());
+        return this.saveOrUpdate(entity);
+    }
 
-	@Override
-	public IPage<RtuDataRiverVO> selectWaterPage(IPage<RtuDataRiverVO> page, RtuDataRiverDTO rtuDataRiverDTO) {
-		return page.setRecords(baseMapper.selectWaterPage(page, rtuDataRiverDTO));
-	}
+    @Override
+    public IPage<RtuDataRiverVO> selectWaterPage(IPage<RtuDataRiverVO> page, RtuDataRiverDTO rtuDataRiverDTO) {
+        return page.setRecords(baseMapper.selectWaterPage(page, rtuDataRiverDTO));
+    }
 }

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

@@ -7,19 +7,15 @@
 package org.springblade.modules.business.data.service.impl;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.entity.EtlRsvrDataEntity;
-import org.springblade.modules.business.data.dto.RtuDataRsvrDTO;
-import org.springblade.modules.business.data.entity.RtuDataRsvrEntity;
-import org.springblade.modules.business.data.mapper.RtuDataRsvrMapper;
-import org.springblade.modules.business.data.service.IRtuDataRsvrService;
-import org.springblade.modules.business.data.vo.RtuDataRsvrVO;
+import org.springblade.modules.business.data.dto.RtuDataRsvrStoreDTO;
+import org.springblade.modules.business.data.entity.RtuDataRsvrStoreEntity;
+import org.springblade.modules.business.data.mapper.RtuDataRsvrHistoreMapper;
+import org.springblade.modules.business.data.service.IRtuDataRsvrHistoreService;
+import org.springblade.modules.business.data.vo.RtuDataRsvrStoreVO;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
 
 /***
  * Date:2022/8/28
@@ -30,22 +26,10 @@ import java.util.Date;
  * Remark：认为有必要的其他信息
  */
 @Service
-public class RtuDataRsvrServiceImpl extends BaseServiceImpl<RtuDataRsvrMapper, RtuDataRsvrEntity> implements IRtuDataRsvrService {
+public class RtuDataRsvrHistoreServiceImpl extends BaseServiceImpl<RtuDataRsvrHistoreMapper, RtuDataRsvrStoreEntity> implements IRtuDataRsvrHistoreService {
 	@Override
-	public IPage<RtuDataRsvrVO> selectPage(IPage<RtuDataRsvrVO> page, RtuDataRsvrDTO rtuDataRsvrDTO) {
+	public IPage<RtuDataRsvrStoreVO> selectPage(IPage<RtuDataRsvrStoreVO> page, RtuDataRsvrStoreDTO rtuDataRsvrDTO) {
 		return page.setRecords(baseMapper.selectPage(page, rtuDataRsvrDTO));
 	}
 
-	@Override
-	public boolean updateRsvrInfo(RtuDataRsvrEntity entity) {
-		LambdaQueryWrapper<RtuDataRsvrEntity> dataWrapper = Wrappers.<RtuDataRsvrEntity>query().lambda();
-		dataWrapper.eq(RtuDataRsvrEntity::getRtuCode, entity.getRtuCode());
-		dataWrapper.eq(RtuDataRsvrEntity::getIsDeleted, 0);
-		RtuDataRsvrEntity rsvrDataEntity = this.getOne(dataWrapper);
-		if (null != rsvrDataEntity) {
-			entity.setId(rsvrDataEntity.getId());
-		}
-		entity.setUpdateTime(new Date());
-		return this.saveOrUpdate(entity);
-	}
 }

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

@@ -37,21 +37,15 @@ public class RtuDataRsvrServiceImpl extends BaseServiceImpl<RtuDataRsvrMapper, R
 	}
 
 	@Override
-	public boolean updateRsvrInfo(EtlRsvrDataEntity etlRsvrDataEntity) {
+	public boolean updateRsvrInfo(RtuDataRsvrEntity entity) {
 		LambdaQueryWrapper<RtuDataRsvrEntity> dataWrapper = Wrappers.<RtuDataRsvrEntity>query().lambda();
-		dataWrapper.eq(RtuDataRsvrEntity::getRtuCode, etlRsvrDataEntity.getRtuCode());
+		dataWrapper.eq(RtuDataRsvrEntity::getRtuCode, entity.getRtuCode());
 		dataWrapper.eq(RtuDataRsvrEntity::getIsDeleted, 0);
 		RtuDataRsvrEntity rsvrDataEntity = this.getOne(dataWrapper);
-		if (null == rsvrDataEntity) {
-			rsvrDataEntity = new RtuDataRsvrEntity();
-			rsvrDataEntity.setRtuCode(etlRsvrDataEntity.getRtuCode());
-			rsvrDataEntity.setCreateTime(new Date());
-			rsvrDataEntity.setStatus(1);
-			rsvrDataEntity.setIsDeleted(0);
+		if (null != rsvrDataEntity) {
+			entity.setId(rsvrDataEntity.getId());
 		}
-		rsvrDataEntity.setRz(etlRsvrDataEntity.getRz());
-		rsvrDataEntity.setTm(etlRsvrDataEntity.getTm());
-		rsvrDataEntity.setFromTime(etlRsvrDataEntity.getFromDate());
-		return this.saveOrUpdate(rsvrDataEntity);
+		entity.setUpdateTime(new Date());
+		return this.saveOrUpdate(entity);
 	}
 }

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

@@ -7,9 +7,9 @@
 package org.springblade.modules.business.data.service.impl;
 
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.modules.business.data.entity.RtuDataSzyFlowRateEntity;
-import org.springblade.modules.business.data.mapper.RtuDataSzyMpMapper;
-import org.springblade.modules.business.data.service.IRtuDataSzyMpService;
+import org.springblade.modules.business.data.entity.RtuDataSzyFlowRateStoreEntity;
+import org.springblade.modules.business.data.mapper.RtuDataSzyMpHistoreMapper;
+import org.springblade.modules.business.data.service.IRtuDataSzyMpHistoreService;
 import org.springframework.stereotype.Service;
 
 /***
@@ -21,5 +21,5 @@ import org.springframework.stereotype.Service;
  * Remark：认为有必要的其他信息
  */
 @Service
-public class RtuDataSzyMpServiceImpl extends BaseServiceImpl<RtuDataSzyMpMapper, RtuDataSzyFlowRateEntity> implements IRtuDataSzyMpService {
+public class RtuDataSzyMpHistoreServiceImpl extends BaseServiceImpl<RtuDataSzyMpHistoreMapper, RtuDataSzyFlowRateStoreEntity> implements IRtuDataSzyMpHistoreService {
 }

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

@@ -6,7 +6,18 @@
  */
 package org.springblade.modules.business.data.service.impl;
 
-/*** 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.business.data.entity.RtuDataRiverEntity;
+import org.springblade.modules.business.data.entity.RtuDataSzyFlowRateEntity;
+import org.springblade.modules.business.data.mapper.RtuDataSzyMpMapper;
+import org.springblade.modules.business.data.service.IRtuDataSzyMpService;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/***
  * Date:2023/6/16
  * Title:文件所属模块（必须填写）
  * Description：对本文件的详细描述，原则上不能少于30字
@@ -14,5 +25,18 @@ package org.springblade.modules.business.data.service.impl;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public class RtuDataSzyMpServiceImpl {
+@Service
+public class RtuDataSzyMpServiceImpl extends BaseServiceImpl<RtuDataSzyMpMapper, RtuDataSzyFlowRateEntity> implements IRtuDataSzyMpService {
+    @Override
+    public boolean updateInfo(RtuDataSzyFlowRateEntity entity) {
+        LambdaQueryWrapper<RtuDataSzyFlowRateEntity> dataWrapper = Wrappers.<RtuDataSzyFlowRateEntity>query().lambda();
+        dataWrapper.eq(RtuDataSzyFlowRateEntity::getRtuCode, entity.getRtuCode());
+        dataWrapper.eq(RtuDataSzyFlowRateEntity::getIsDeleted, 0);
+        RtuDataSzyFlowRateEntity riverEntity = this.getOne(dataWrapper);
+        if (null != riverEntity) {
+            entity.setId(riverEntity.getId());
+        }
+        entity.setUpdateTime(new Date());
+        return this.saveOrUpdate(entity);
+    }
 }

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

@@ -7,9 +7,9 @@
 package org.springblade.modules.business.data.service.impl;
 
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.modules.business.data.entity.RtuDataWqRiverEntity;
-import org.springblade.modules.business.data.mapper.RtuDataSzyRiverMapper;
-import org.springblade.modules.business.data.service.IRtuDataSzyRiverService;
+import org.springblade.modules.business.data.entity.RtuDataWqRiverStoreEntity;
+import org.springblade.modules.business.data.mapper.RtuDataSzyRiverHistoreMapper;
+import org.springblade.modules.business.data.service.IRtuDataSzyRiverHistoreService;
 import org.springframework.stereotype.Service;
 
 /***
@@ -21,5 +21,5 @@ import org.springframework.stereotype.Service;
  * Remark：认为有必要的其他信息
  */
 @Service
-public class RtuDataSzyRiverServiceImpl extends BaseServiceImpl<RtuDataSzyRiverMapper, RtuDataWqRiverEntity> implements IRtuDataSzyRiverService {
+public class RtuDataSzyRiverHistoreServiceImpl extends BaseServiceImpl<RtuDataSzyRiverHistoreMapper, RtuDataWqRiverStoreEntity> implements IRtuDataSzyRiverHistoreService {
 }

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

@@ -6,7 +6,18 @@
  */
 package org.springblade.modules.business.data.service.impl;
 
-/*** 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.business.data.entity.RtuDataSzyFlowRateEntity;
+import org.springblade.modules.business.data.entity.RtuDataWqRiverEntity;
+import org.springblade.modules.business.data.mapper.RtuDataSzyRiverMapper;
+import org.springblade.modules.business.data.service.IRtuDataSzyRiverService;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/***
  * Date:2023/6/16
  * Title:文件所属模块（必须填写）
  * Description：对本文件的详细描述，原则上不能少于30字
@@ -14,5 +25,18 @@ package org.springblade.modules.business.data.service.impl;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public class RtuDataSzyRiverServiceImpl {
+@Service
+public class RtuDataSzyRiverServiceImpl extends BaseServiceImpl<RtuDataSzyRiverMapper, RtuDataWqRiverEntity> implements IRtuDataSzyRiverService {
+    @Override
+    public boolean updateInfo(RtuDataWqRiverEntity entity) {
+        LambdaQueryWrapper<RtuDataWqRiverEntity> dataWrapper = Wrappers.<RtuDataWqRiverEntity>query().lambda();
+        dataWrapper.eq(RtuDataWqRiverEntity::getRtuCode, entity.getRtuCode());
+        dataWrapper.eq(RtuDataWqRiverEntity::getIsDeleted, 0);
+        RtuDataWqRiverEntity riverEntity = this.getOne(dataWrapper);
+        if (null != riverEntity) {
+            entity.setId(riverEntity.getId());
+        }
+        entity.setUpdateTime(new Date());
+        return this.saveOrUpdate(entity);
+    }
 }

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

@@ -6,20 +6,12 @@
  */
 package org.springblade.modules.business.data.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.etl.entity.EtlRainDataEntity;
-import org.springblade.modules.business.data.dto.RtuDataRainDTO;
-import org.springblade.modules.business.data.entity.RtuDataRainEntity;
-import org.springblade.modules.business.data.mapper.RtuDataRainMapper;
-import org.springblade.modules.business.data.service.IRtuDataRainService;
-import org.springblade.modules.business.data.vo.RtuDataRainVO;
+import org.springblade.modules.business.data.entity.RtuDataWeatherEntity;
+import org.springblade.modules.business.data.mapper.RtuDataWeatherMapper;
+import org.springblade.modules.business.data.service.IRtuDataWeatherService;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-import java.util.Date;
 
 /***
  * Date:2022/8/28
@@ -30,23 +22,7 @@ import java.util.Date;
  * Remark：认为有必要的其他信息
  */
 @Service
-public class RtuDataRainServiceImpl extends BaseServiceImpl<RtuDataRainMapper, RtuDataRainEntity> implements IRtuDataRainService {
+public class RtuDataWeatherServiceImpl extends BaseServiceImpl<RtuDataWeatherMapper, RtuDataWeatherEntity> implements IRtuDataWeatherService {
 
-	@Override
-	public IPage<RtuDataRainVO> selectPage(IPage<RtuDataRainVO> page, RtuDataRainDTO rtuDataRainDTO) {
-		return page.setRecords(baseMapper.selectPage(page, rtuDataRainDTO));
-	}
 
-	@Override
-	public boolean updateRainInfo(RtuDataRainEntity entity) {
-		LambdaQueryWrapper<RtuDataRainEntity> dataWrapper = Wrappers.<RtuDataRainEntity>query().lambda();
-		dataWrapper.eq(RtuDataRainEntity::getRtuCode, entity.getRtuCode());
-		dataWrapper.eq(RtuDataRainEntity::getIsDeleted, 0);
-		RtuDataRainEntity rainEntity = this.getOne(dataWrapper);
-		if (null != rainEntity) {
-			entity.setId(rainEntity.getId());
-		}
-		entity.setUpdateTime(new Date());
-		return this.saveOrUpdate(entity);
-	}
 }

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

@@ -6,10 +6,19 @@
  */
 package org.springblade.modules.business.data.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springblade.constant.RtuDataInfoConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.modules.business.data.entity.RtuRealTimeStatusEntity;
-import org.springblade.modules.business.data.mapper.RtuRealTimeStatusMapper;
-import org.springblade.modules.business.data.service.IRtuRealTimeStatusService;
+import org.springblade.modules.business.data.entity.RtuRealTimeStatusStoreEntity;
+import org.springblade.modules.business.data.mapper.RtuRealTimeStatusHistoreMapper;
+import org.springblade.modules.business.data.service.IRtuRealTimeStatusHistoreService;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
 
 /***
  * Date:2023/6/15
@@ -19,5 +28,130 @@ import org.springblade.modules.business.data.service.IRtuRealTimeStatusService;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public class RtuRealTimeStatusServiceImpl extends BaseServiceImpl<RtuRealTimeStatusMapper, RtuRealTimeStatusEntity> implements IRtuRealTimeStatusService {
+@Service
+public class RtuRealTimeStatusServiceHistoreImpl extends BaseServiceImpl<RtuRealTimeStatusHistoreMapper, RtuRealTimeStatusStoreEntity> implements IRtuRealTimeStatusHistoreService {
+    @Override
+    public boolean saveExtStatus(JSONObject data) {
+        String rtuCode = data.getString(RtuDataInfoConstant.RTU_DATA_RTUCODE_KEY);
+        RtuRealTimeStatusStoreEntity entity = new RtuRealTimeStatusStoreEntity();
+        entity.setRtuCode(rtuCode);
+        if (data.containsKey(RtuDataInfoConstant.RTU_DATA_COLLECT_TIME_KEY)) {
+            entity.setCollectTime(data.getDate(RtuDataInfoConstant.RTU_DATA_COLLECT_TIME_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_DATA_UP_TIME_KEY)) {
+            entity.setUpTime(data.getDate(RtuDataInfoConstant.RTU_DATA_UP_TIME_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_DATA_PICK_TIME_KEY)) {
+            entity.setPickTime(data.getDate(RtuDataInfoConstant.RTU_DATA_PICK_TIME_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_DTU_SIGNAL_KEY)) {
+            entity.setDtuSignal(data.getDouble(RtuDataInfoConstant.RTU_STATUS_DTU_SIGNAL_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_VOLTAGE_KEY)) {
+            entity.setVoltage(data.getDouble(RtuDataInfoConstant.RTU_STATUS_VOLTAGE_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_TEMPERATURE_KEY)) {
+            entity.setTemperature(data.getDouble(RtuDataInfoConstant.RTU_STATUS_TEMPERATURE_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_UUID_KEY)) {
+            //     entity.set(data.getDouble(RtuDataInfoConstant.RTU_STATUS_UUID_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_CCID_KEY)) {
+            //     entity.set(data.getDouble(RtuDataInfoConstant.RTU_STATUS_UUID_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_RTU_STATUS_KEY)) {
+            entity.setRtuStatus(data.getInteger(RtuDataInfoConstant.RTU_STATUS_RTU_STATUS_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_RTU_ERROR_KEY)) {
+            entity.setRtuError(data.getInteger(RtuDataInfoConstant.RTU_STATUS_RTU_ERROR_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_BATTERY_STATUS_KEY)) {
+            entity.setBatteryStatus(data.getString(RtuDataInfoConstant.RTU_STATUS_BATTERY_STATUS_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_BATTERY_IN_KEY)) {
+            entity.setBatteryBatteryIn(data.getString(RtuDataInfoConstant.RTU_STATUS_BATTERY_IN_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_BATTERY_OUT_KEY)) {
+            entity.setBatteryBatteryOut(data.getString(RtuDataInfoConstant.RTU_STATUS_BATTERY_OUT_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_BATTERY_POWER_KEY)) {
+            entity.setBatteryPower(data.getDouble(RtuDataInfoConstant.RTU_STATUS_BATTERY_POWER_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_BATTERY_TEMP_KEY)) {
+            entity.setBatteryTemperature(data.getDouble(RtuDataInfoConstant.RTU_STATUS_BATTERY_TEMP_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_SUN_POWER_VOLTAGE_KEY)) {
+            entity.setSunPowerVoltage(data.getDouble(RtuDataInfoConstant.RTU_STATUS_SUN_POWER_VOLTAGE_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_SUN_POWER_ELECTRIC_KEY)) {
+            entity.setSunPowerElectric(data.getDouble(RtuDataInfoConstant.RTU_STATUS_SUN_POWER_ELECTRIC_KEY));
+        }
+        if (data.containsKey("waterLevelSensorStatus")) {
+            entity.setWaterLevelSensorStatus(Integer.valueOf(data.getString("waterLevelSensorStatus")));
+        }
+        if (data.containsKey("batteryVoltageStatus")) {
+            entity.setBatteryVoltageStatus(Integer.valueOf(data.getString("batteryVoltageStatus")));
+        }
+        if (data.containsKey("acChargeStatus")) {
+            entity.setAcChargeStatus(Integer.valueOf(data.getString("acChargeStatus")));
+        }
+        return this.save(entity);
+    }
+
+    @Override
+    public boolean saveWarnStatus(JSONObject data) {
+
+        String rtuCode = data.getString(RtuDataInfoConstant.RTU_DATA_RTUCODE_KEY);
+        RtuRealTimeStatusStoreEntity entity = new RtuRealTimeStatusStoreEntity();
+        entity.setRtuCode(rtuCode);
+        if (data.containsKey(RtuDataInfoConstant.RTU_DATA_COLLECT_TIME_KEY)) {
+            entity.setCollectTime(data.getDate(RtuDataInfoConstant.RTU_DATA_COLLECT_TIME_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_DATA_UP_TIME_KEY)) {
+            entity.setUpTime(data.getDate(RtuDataInfoConstant.RTU_DATA_UP_TIME_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_DATA_PICK_TIME_KEY)) {
+            entity.setPickTime(data.getDate(RtuDataInfoConstant.RTU_DATA_PICK_TIME_KEY));
+        }
+        if (data.containsKey("voltage")) {
+            entity.setVoltage(data.getDouble("voltage"));
+        }
+        if (data.containsKey("batteryVoltageStatus")) {
+            entity.setBatteryVoltageStatus(Integer.valueOf(data.getString("batteryVoltageStatus")));
+        }
+        if (data.containsKey("acChargeStatus")) {
+            entity.setAcChargeStatus(Integer.valueOf(data.getString("acChargeStatus")));
+        }
+        if (data.containsKey("waterLevelOverStatus")) {
+            entity.setWaterLevelOverStatus(Integer.valueOf(data.getString("waterLevelOverStatus")));
+        }
+        if (data.containsKey("waterFlowOverStatus")) {
+            entity.setWaterFlowOverStatus(Integer.valueOf(data.getString("waterFlowOverStatus")));
+        }
+        if (data.containsKey("waterQualityStatus")) {
+            entity.setWaterQualityStatus(Integer.valueOf(data.getString("waterQualityStatus")));
+        }
+        if (data.containsKey("waterFlowSensorStatus")) {
+            entity.setWaterFlowSensorStatus(Integer.valueOf(data.getString("waterFlowSensorStatus")));
+        }
+        if (data.containsKey("waterLevelSensorStatus")) {
+            entity.setWaterLevelSensorStatus(Integer.valueOf(data.getString("waterLevelSensorStatus")));
+        }
+        if (data.containsKey("boxDoorStatus")) {
+            entity.setBoxDoorStatus(Integer.valueOf(data.getString("boxDoorStatus")));
+        }
+        if (data.containsKey("rtuMemoryStatus")) {
+            entity.setRtuMemoryStatus(Integer.valueOf(data.getString("rtuMemoryStatus")));
+        }
+        if (data.containsKey("rtuIcCardStatus")) {
+            entity.setRtuIcCardStatus(Integer.valueOf(data.getString("rtuIcCardStatus")));
+        }
+        if (data.containsKey("waterPumpStatus")) {
+            entity.setWaterPumpStatus(Integer.valueOf(data.getString("waterPumpStatus")));
+        }
+        if (data.containsKey("waterRemainOverStatus")) {
+            entity.setWaterRemainOverStatus(Integer.valueOf(data.getString("waterRemainOverStatus")));
+        }
+        return this.save(entity);
+    }
 }

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

@@ -6,7 +6,20 @@
  */
 package org.springblade.modules.business.data.service.impl;
 
-/*** 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springblade.constant.RtuDataInfoConstant;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.business.data.entity.RtuDataRsvrEntity;
+import org.springblade.modules.business.data.entity.RtuRealTimeStatusEntity;
+import org.springblade.modules.business.data.mapper.RtuRealTimeStatusMapper;
+import org.springblade.modules.business.data.service.IRtuRealTimeStatusService;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/***
  * Date:2023/6/15
  * Title:文件所属模块（必须填写）
  * Description：对本文件的详细描述，原则上不能少于30字
@@ -14,5 +27,142 @@ package org.springblade.modules.business.data.service.impl;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public class RtuRealTimeStatusServiceImpl {
+@Service
+public class RtuRealTimeStatusServiceImpl extends BaseServiceImpl<RtuRealTimeStatusMapper, RtuRealTimeStatusEntity> implements IRtuRealTimeStatusService {
+    @Override
+    public boolean updateExtStatus(JSONObject data) {
+        String rtuCode = data.getString(RtuDataInfoConstant.RTU_DATA_RTUCODE_KEY);
+        LambdaQueryWrapper<RtuRealTimeStatusEntity> dataWrapper = Wrappers.<RtuRealTimeStatusEntity>query().lambda();
+        dataWrapper.eq(RtuRealTimeStatusEntity::getRtuCode, rtuCode);
+        RtuRealTimeStatusEntity entity = this.getOne(dataWrapper);
+        if (null == entity) {
+            entity = new RtuRealTimeStatusEntity();
+            entity.setRtuCode(rtuCode);
+        }
+        entity.setUpdateTime(new Date());
+        entity.setRtuCode(data.getString(RtuDataInfoConstant.RTU_DATA_RTUCODE_KEY));
+        if (data.containsKey(RtuDataInfoConstant.RTU_DATA_COLLECT_TIME_KEY)) {
+            entity.setCollectTime(data.getDate(RtuDataInfoConstant.RTU_DATA_COLLECT_TIME_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_DATA_UP_TIME_KEY)) {
+            entity.setUpTime(data.getDate(RtuDataInfoConstant.RTU_DATA_UP_TIME_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_DATA_PICK_TIME_KEY)) {
+            entity.setPickTime(data.getDate(RtuDataInfoConstant.RTU_DATA_PICK_TIME_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_DTU_SIGNAL_KEY)) {
+            entity.setDtuSignal(data.getDouble(RtuDataInfoConstant.RTU_STATUS_DTU_SIGNAL_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_VOLTAGE_KEY)) {
+            entity.setVoltage(data.getDouble(RtuDataInfoConstant.RTU_STATUS_VOLTAGE_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_TEMPERATURE_KEY)) {
+            entity.setTemperature(data.getDouble(RtuDataInfoConstant.RTU_STATUS_TEMPERATURE_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_UUID_KEY)) {
+            //     entity.set(data.getDouble(RtuDataInfoConstant.RTU_STATUS_UUID_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_CCID_KEY)) {
+            //     entity.set(data.getDouble(RtuDataInfoConstant.RTU_STATUS_UUID_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_RTU_STATUS_KEY)) {
+            entity.setRtuStatus(data.getInteger(RtuDataInfoConstant.RTU_STATUS_RTU_STATUS_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_RTU_ERROR_KEY)) {
+            entity.setRtuError(data.getInteger(RtuDataInfoConstant.RTU_STATUS_RTU_ERROR_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_BATTERY_STATUS_KEY)) {
+            entity.setBatteryStatus(data.getString(RtuDataInfoConstant.RTU_STATUS_BATTERY_STATUS_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_BATTERY_IN_KEY)) {
+            entity.setBatteryBatteryIn(data.getString(RtuDataInfoConstant.RTU_STATUS_BATTERY_IN_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_BATTERY_OUT_KEY)) {
+            entity.setBatteryBatteryOut(data.getString(RtuDataInfoConstant.RTU_STATUS_BATTERY_OUT_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_BATTERY_POWER_KEY)) {
+            entity.setBatteryPower(data.getDouble(RtuDataInfoConstant.RTU_STATUS_BATTERY_POWER_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_BATTERY_TEMP_KEY)) {
+            entity.setBatteryTemperature(data.getDouble(RtuDataInfoConstant.RTU_STATUS_BATTERY_TEMP_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_SUN_POWER_VOLTAGE_KEY)) {
+            entity.setSunPowerVoltage(data.getDouble(RtuDataInfoConstant.RTU_STATUS_SUN_POWER_VOLTAGE_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_STATUS_SUN_POWER_ELECTRIC_KEY)) {
+            entity.setSunPowerElectric(data.getDouble(RtuDataInfoConstant.RTU_STATUS_SUN_POWER_ELECTRIC_KEY));
+        }
+        if (data.containsKey("waterLevelSensorStatus")) {
+            entity.setWaterLevelSensorStatus(Integer.valueOf(data.getString("waterLevelSensorStatus")));
+        }
+        if (data.containsKey("batteryVoltageStatus")) {
+            entity.setBatteryVoltageStatus(Integer.valueOf(data.getString("batteryVoltageStatus")));
+        }
+        if (data.containsKey("acChargeStatus")) {
+            entity.setAcChargeStatus(Integer.valueOf(data.getString("acChargeStatus")));
+        }
+        return this.saveOrUpdate(entity);
+    }
+
+    @Override
+    public boolean updateWarnStatus(JSONObject data) {
+        String rtuCode = data.getString(RtuDataInfoConstant.RTU_DATA_RTUCODE_KEY);
+        LambdaQueryWrapper<RtuRealTimeStatusEntity> dataWrapper = Wrappers.<RtuRealTimeStatusEntity>query().lambda();
+        dataWrapper.eq(RtuRealTimeStatusEntity::getRtuCode, rtuCode);
+        RtuRealTimeStatusEntity entity = this.getOne(dataWrapper);
+        if (null == entity) {
+            entity = new RtuRealTimeStatusEntity();
+            entity.setRtuCode(rtuCode);
+        }
+        entity.setUpdateTime(new Date());
+        if (data.containsKey(RtuDataInfoConstant.RTU_DATA_COLLECT_TIME_KEY)) {
+            entity.setCollectTime(data.getDate(RtuDataInfoConstant.RTU_DATA_COLLECT_TIME_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_DATA_UP_TIME_KEY)) {
+            entity.setUpTime(data.getDate(RtuDataInfoConstant.RTU_DATA_UP_TIME_KEY));
+        }
+        if (data.containsKey(RtuDataInfoConstant.RTU_DATA_PICK_TIME_KEY)) {
+            entity.setPickTime(data.getDate(RtuDataInfoConstant.RTU_DATA_PICK_TIME_KEY));
+        }
+        if (data.containsKey("voltage")) {
+            entity.setVoltage(data.getDouble("voltage"));
+        }
+        if (data.containsKey("batteryVoltageStatus")) {
+            entity.setBatteryVoltageStatus(Integer.valueOf(data.getString("batteryVoltageStatus")));
+        }
+        if (data.containsKey("acChargeStatus")) {
+            entity.setAcChargeStatus(Integer.valueOf(data.getString("acChargeStatus")));
+        }
+        if (data.containsKey("waterLevelOverStatus")) {
+            entity.setWaterLevelOverStatus(Integer.valueOf(data.getString("waterLevelOverStatus")));
+        }
+        if (data.containsKey("waterFlowOverStatus")) {
+            entity.setWaterFlowOverStatus(Integer.valueOf(data.getString("waterFlowOverStatus")));
+        }
+        if (data.containsKey("waterQualityStatus")) {
+            entity.setWaterQualityStatus(Integer.valueOf(data.getString("waterQualityStatus")));
+        }
+        if (data.containsKey("waterFlowSensorStatus")) {
+            entity.setWaterFlowSensorStatus(Integer.valueOf(data.getString("waterFlowSensorStatus")));
+        }
+        if (data.containsKey("waterLevelSensorStatus")) {
+            entity.setWaterLevelSensorStatus(Integer.valueOf(data.getString("waterLevelSensorStatus")));
+        }
+        if (data.containsKey("boxDoorStatus")) {
+            entity.setBoxDoorStatus(Integer.valueOf(data.getString("boxDoorStatus")));
+        }
+        if (data.containsKey("rtuMemoryStatus")) {
+            entity.setRtuMemoryStatus(Integer.valueOf(data.getString("rtuMemoryStatus")));
+        }
+        if (data.containsKey("rtuIcCardStatus")) {
+            entity.setRtuIcCardStatus(Integer.valueOf(data.getString("rtuIcCardStatus")));
+        }
+        if (data.containsKey("waterPumpStatus")) {
+            entity.setWaterPumpStatus(Integer.valueOf(data.getString("waterPumpStatus")));
+        }
+        if (data.containsKey("waterRemainOverStatus")) {
+            entity.setWaterRemainOverStatus(Integer.valueOf(data.getString("waterRemainOverStatus")));
+        }
+        return this.saveOrUpdate(entity);
+    }
 }

src/main/java/org/springblade/modules/business/data/vo/RtuDataGroundStoreVO.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.modules.business.data.entity.RtuDataGroundEntity;
+import org.springblade.modules.business.data.entity.RtuDataGroundStoreEntity;
 
 
 /***
@@ -22,7 +23,7 @@ import org.springblade.modules.business.data.entity.RtuDataGroundEntity;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class RtuDataGroundVO extends RtuDataGroundEntity {
+public class RtuDataGroundStoreVO extends RtuDataGroundStoreEntity {
 
 	/**
 	 * 测站名称

src/main/java/org/springblade/modules/business/data/vo/RtuDataRainStoreVO.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.modules.business.data.entity.RtuDataRainEntity;
+import org.springblade.modules.business.data.entity.RtuDataRainStoreEntity;
 
 
 /***
@@ -22,7 +23,7 @@ import org.springblade.modules.business.data.entity.RtuDataRainEntity;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class RtuDataRainVO extends RtuDataRainEntity {
+public class RtuDataRainStoreVO extends RtuDataRainStoreEntity {
 
 	/**
 	 * 测站名称

src/main/java/org/springblade/modules/business/data/vo/RtuDataRiverStoreVO.java

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.modules.business.data.entity.RtuDataRiverEntity;
+import org.springblade.modules.business.data.entity.RtuDataRiverStoreEntity;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
@@ -28,7 +29,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class RtuDataRiverVO extends RtuDataRiverEntity {
+public class RtuDataRiverStoreVO extends RtuDataRiverStoreEntity {
 	/**
 	 * 测站名称
 	 */

src/main/java/org/springblade/modules/business/data/vo/RtuDataRsvrStoreVO.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.modules.business.data.entity.RtuDataRsvrEntity;
+import org.springblade.modules.business.data.entity.RtuDataRsvrStoreEntity;
 
 
 /***
@@ -22,7 +23,7 @@ import org.springblade.modules.business.data.entity.RtuDataRsvrEntity;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class RtuDataRsvrVO extends RtuDataRsvrEntity {
+public class RtuDataRsvrStoreVO extends RtuDataRsvrStoreEntity {
 	/**
 	 * 测站名称
 	 */

src/main/java/org/springblade/modules/business/data/wrapper/RtuDataGroundHistoreWrapper.java

@@ -8,9 +8,8 @@ package org.springblade.modules.business.data.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.modules.business.data.entity.RtuDataGroundEntity;
-import org.springblade.modules.business.data.vo.RtuDataGroundVO;
-
+import org.springblade.modules.business.data.entity.RtuDataGroundStoreEntity;
+import org.springblade.modules.business.data.vo.RtuDataGroundStoreVO;
 
 import java.util.Objects;
 
@@ -22,14 +21,14 @@ import java.util.Objects;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public class RtuDataGroundWrapper extends BaseEntityWrapper<RtuDataGroundEntity, RtuDataGroundVO> {
-	public static RtuDataGroundWrapper build() {
-		return new RtuDataGroundWrapper();
+public class RtuDataGroundHistoreWrapper extends BaseEntityWrapper<RtuDataGroundStoreEntity, RtuDataGroundStoreVO> {
+	public static RtuDataGroundHistoreWrapper build() {
+		return new RtuDataGroundHistoreWrapper();
 	}
 
 	@Override
-	public RtuDataGroundVO entityVO(RtuDataGroundEntity entity) {
-		RtuDataGroundVO rtuDataGroundVO = Objects.requireNonNull(BeanUtil.copy(entity, RtuDataGroundVO.class));
+	public RtuDataGroundStoreVO entityVO(RtuDataGroundStoreEntity entity) {
+		RtuDataGroundStoreVO rtuDataGroundVO = Objects.requireNonNull(BeanUtil.copy(entity, RtuDataGroundStoreVO.class));
 
 		return rtuDataGroundVO;
 	}

src/main/java/org/springblade/modules/business/data/wrapper/RtuDataRainHistoreWrapper.java

@@ -8,9 +8,8 @@ package org.springblade.modules.business.data.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.modules.business.data.entity.RtuDataRainEntity;
-import org.springblade.modules.business.data.vo.RtuDataRainVO;
-
+import org.springblade.modules.business.data.entity.RtuDataRainStoreEntity;
+import org.springblade.modules.business.data.vo.RtuDataRainStoreVO;
 
 import java.util.Objects;
 
@@ -22,14 +21,14 @@ import java.util.Objects;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public class RtuDataRainWrapper extends BaseEntityWrapper<RtuDataRainEntity, RtuDataRainVO> {
-	public static RtuDataRainWrapper build() {
-		return new RtuDataRainWrapper();
+public class RtuDataRainHistoreWrapper extends BaseEntityWrapper<RtuDataRainStoreEntity, RtuDataRainStoreVO> {
+	public static RtuDataRainHistoreWrapper build() {
+		return new RtuDataRainHistoreWrapper();
 	}
 
 	@Override
-	public RtuDataRainVO entityVO(RtuDataRainEntity entity) {
-		RtuDataRainVO rtuDataRainVO = Objects.requireNonNull(BeanUtil.copy(entity, RtuDataRainVO.class));
+	public RtuDataRainStoreVO entityVO(RtuDataRainStoreEntity entity) {
+		RtuDataRainStoreVO rtuDataRainVO = Objects.requireNonNull(BeanUtil.copy(entity, RtuDataRainStoreVO.class));
 		return rtuDataRainVO;
 	}
 }

src/main/java/org/springblade/modules/business/data/wrapper/RtuDataRiverHistoreWrapper.java

@@ -9,9 +9,8 @@ package org.springblade.modules.business.data.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.modules.business.data.entity.RtuDataRiverEntity;
-import org.springblade.modules.business.data.vo.RtuDataRiverVO;
-
+import org.springblade.modules.business.data.entity.RtuDataRiverStoreEntity;
+import org.springblade.modules.business.data.vo.RtuDataRiverStoreVO;
 
 import java.util.Objects;
 
@@ -23,18 +22,18 @@ import java.util.Objects;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public class RtuDataRiverWrapper extends BaseEntityWrapper<RtuDataRiverEntity, RtuDataRiverVO> {
-	public static RtuDataRiverWrapper build() {
-		return new RtuDataRiverWrapper();
+public class RtuDataRiverHistoreWrapper extends BaseEntityWrapper<RtuDataRiverStoreEntity, RtuDataRiverStoreVO> {
+	public static RtuDataRiverHistoreWrapper build() {
+		return new RtuDataRiverHistoreWrapper();
 	}
 
 	@Override
-	public RtuDataRiverVO entityVO(RtuDataRiverEntity entity) {
-		RtuDataRiverVO rtuInfoVO = Objects.requireNonNull(BeanUtil.copy(entity, RtuDataRiverVO.class));
+	public RtuDataRiverStoreVO entityVO(RtuDataRiverStoreEntity entity) {
+		RtuDataRiverStoreVO rtuInfoVO = Objects.requireNonNull(BeanUtil.copy(entity, RtuDataRiverStoreVO.class));
 		return entityVO(rtuInfoVO);
 	}
 
-	public RtuDataRiverVO entityVO(RtuDataRiverVO vo) {
+	public RtuDataRiverStoreVO entityVO(RtuDataRiverStoreVO vo) {
 		if (vo.getTm() != null) {
 			vo.setWl(vo.getZ());
 			vo.setWlTm(vo.getTm());

src/main/java/org/springblade/modules/business/data/wrapper/RtuDataRsvrHistoreWrapper.java

@@ -9,9 +9,8 @@ package org.springblade.modules.business.data.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.modules.business.data.entity.RtuDataRsvrEntity;
-import org.springblade.modules.business.data.vo.RtuDataRsvrVO;
-
+import org.springblade.modules.business.data.entity.RtuDataRsvrStoreEntity;
+import org.springblade.modules.business.data.vo.RtuDataRsvrStoreVO;
 
 import java.util.Objects;
 
@@ -23,14 +22,14 @@ import java.util.Objects;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public class RtuDataRsvrWrapper extends BaseEntityWrapper<RtuDataRsvrEntity, RtuDataRsvrVO> {
-	public static RtuDataRsvrWrapper build() {
-		return new RtuDataRsvrWrapper();
+public class RtuDataRsvrHistoreWrapper extends BaseEntityWrapper<RtuDataRsvrStoreEntity, RtuDataRsvrStoreVO> {
+	public static RtuDataRsvrHistoreWrapper build() {
+		return new RtuDataRsvrHistoreWrapper();
 	}
 
 	@Override
-	public RtuDataRsvrVO entityVO(RtuDataRsvrEntity entity) {
-		RtuDataRsvrVO rtuInfoVO = Objects.requireNonNull(BeanUtil.copy(entity, RtuDataRsvrVO.class));
+	public RtuDataRsvrStoreVO entityVO(RtuDataRsvrStoreEntity entity) {
+		RtuDataRsvrStoreVO rtuInfoVO = Objects.requireNonNull(BeanUtil.copy(entity, RtuDataRsvrStoreVO.class));
 
 		return rtuInfoVO;
 	}

src/main/java/org/springblade/modules/business/datagram/entity/RtuDatagramInfoEntity.java

@@ -27,7 +27,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("data_rtu_datagram_info")
-public class RtuDatagramInfo extends BaseEntity {
+public class RtuDatagramInfoEntity extends BaseEntity {
     private static final long serialVersionUID = 1L;
     /**
      * 租户ID

src/main/java/org/springblade/modules/business/datagram/mapper/RtuDatagramMapper.java

@@ -4,16 +4,11 @@
  * 项目名称: 大恒泰山系统
  * 创建日期:2022/8/24
  */
-package org.springblade.modules.business.warning.mapper;
+package org.springblade.modules.business.datagram.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.warning.dto.RtuWarningInfoDTO;
-import org.springblade.modules.business.warning.entity.RtuWarningInfoEntity;
-import org.springblade.modules.business.warning.vo.RtuWarningInfoVO;
+import org.springblade.modules.business.datagram.entity.RtuDatagramInfoEntity;
 
-import java.util.List;
 
 /***
  * Date:2022/8/24
@@ -23,19 +18,6 @@ import java.util.List;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public interface RtuWarningMapper extends BaseMapper<RtuWarningInfoEntity> {
-	/**
-	 * 查询分页
-	 * @param page
-	 * @param rtuWarningInfoDTO
-	 * @return
-	 */
-	List<RtuWarningInfoVO> selectPage(IPage page, @Param("rtuWarningInfoDTO") RtuWarningInfoDTO rtuWarningInfoDTO);
+public interface RtuDatagramMapper extends BaseMapper<RtuDatagramInfoEntity> {
 
-	/**
-	 * 设备异常测站数量
-	 * @param rtuWarningInfoDTO
-	 * @return
-	 */
-	Long warningRtuCount(@Param("rtuWarningInfoDTO") RtuWarningInfoDTO rtuWarningInfoDTO);
 }

src/main/java/org/springblade/modules/business/datagram/mapper/RtuDatagramMapper.xml

@@ -1,74 +1,14 @@
 <?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.warning.mapper.RtuWarningMapper">
+<mapper namespace="org.springblade.modules.business.datagram.mapper.RtuDatagramMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="rtuWarningInfoEntityResultMap"
-               type="org.springblade.modules.business.warning.entity.RtuWarningInfoEntity">
+    <resultMap id="entityResultMap"
+               type="org.springblade.modules.business.datagram.entity.RtuDatagramInfoEntity">
         <result column="rtu_code" property="rtuCode"/>
-        <result column="warning_kind" property="warningKind"/>
-        <result column="warning_desc" property="warningDesc"/>
-        <result column="warning_happen_time" property="warningHappenTime"/>
-        <result column="warning_recovery_time" property="warningRecoveryTime"/>
-        <result column="warning_status" property="warningStatus"/>
-        <result column="data_from_id" property="dataFromId"/>
+        <result column="datagram" property="datagram"/>
+        <result column="agreement" property="agreement"/>
+        <result column="pick_time" property="pickTime"/>
     </resultMap>
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="rtuWarningInfoVOResultMap" type="org.springblade.modules.business.warning.vo.RtuWarningInfoVO">
-        <result column="rtu_code" property="rtuCode"/>
-        <result column="warning_kind" property="warningKind"/>
-        <result column="warning_desc" property="warningDesc"/>
-        <result column="warning_happen_time" property="warningHappenTime"/>
-        <result column="warning_recovery_time" property="warningRecoveryTime"/>
-        <result column="warning_status" property="warningStatus"/>
-        <result column="data_from_id" property="dataFromId"/>
-        <result column="rtu_name" property="rtuName"/>
-        <result column="ad_city" property="adCity"/>
-        <result column="ad_dist" property="adDist"/>
-        <result column="ancestors" property="ancestors"/>
-        <result column="adcd" property="adCode"/>
-    </resultMap>
-
-
-    <select id="selectPage" resultMap="rtuWarningInfoVOResultMap">
-        SELECT
-        w.*, r.rtu_name,r.ad_city,r.ad_dist,a.ancestors,a.adcd
-        FROM
-        rtu_warning w
-        LEFT JOIN rtu_info r ON r.rtu_code = w.rtu_code
-        LEFT JOIN data_ad_cd_b a ON a.adcd = r.ad_code and a.is_deleted=0
-        WHERE
-        w.is_deleted = 0
-        <if test="rtuWarningInfoDTO.rtuCode!=null">
-            and r.rtu_code like concat(concat('%', #{rtuWarningInfoDTO.rtuCode}), '%')
-        </if>
-        <if test="rtuWarningInfoDTO.rtuName!=null">
-            and r.rtu_name like concat(concat('%', #{rtuWarningInfoDTO.rtuName}), '%')
-        </if>
-        <if test="rtuWarningInfoDTO.warningStatus!=null">
-            and w.warning_status = #{rtuWarningInfoDTO.warningStatus}
-        </if>
-        <if test="rtuWarningInfoDTO.adCode!=null">
-            and (a.adcd =#{rtuWarningInfoDTO.adCode} or a.ancestors in (SELECT ancestors FROM data_ad_cd_b WHERE ancestors  like concat(concat('%', #{rtuWarningInfoDTO.adCode}), '%')))
-        </if>
-        order by w.warning_happen_time desc
-    </select>
-
-    <select id="warningRtuCount" resultType="java.lang.Long">
-        SELECT count(*) FROM
-        ( SELECT
-        w.rtu_code
-        FROM
-        rtu_warning w
-        LEFT JOIN rtu_info r ON w.rtu_code = r.rtu_code and r.is_deleted=0
-        LEFT JOIN data_ad_cd_b a ON a.adcd = r.ad_code and a.is_deleted=0
-        WHERE
-        w.is_deleted = 0
-        <if test="rtuWarningInfoDTO.adCode!=null">
-            and (a.adcd =#{rtuWarningInfoDTO.adCode} or a.ancestors in (SELECT ancestors FROM data_ad_cd_b WHERE ancestors  like concat(concat('%', #{rtuWarningInfoDTO.adCode}), '%')))
-        </if>
-        and w.warning_status = 0
-        group by w.rtu_code ) a
-    </select>
 </mapper>

src/main/java/org/springblade/modules/business/datagram/service/IRtuDatagramService.java

@@ -6,7 +6,11 @@
  */
 package org.springblade.modules.business.datagram.service;
 
-/*** 
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.business.datagram.entity.RtuDatagramInfoEntity;
+
+
+/***
  * Date:2023/6/16
  * Title:文件所属模块（必须填写）
  * Description：对本文件的详细描述，原则上不能少于30字
@@ -14,5 +18,5 @@ package org.springblade.modules.business.datagram.service;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public class IRtuDatagramService {
+public interface IRtuDatagramService extends BaseService<RtuDatagramInfoEntity> {
 }

src/main/java/org/springblade/modules/business/datagram/service/impl/RtuDatagramServiceImpl.java

@@ -6,7 +6,14 @@
  */
 package org.springblade.modules.business.datagram.service.impl;
 
-/*** 
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.business.datagram.entity.RtuDatagramInfoEntity;
+import org.springblade.modules.business.datagram.mapper.RtuDatagramMapper;
+import org.springblade.modules.business.datagram.service.IRtuDatagramService;
+import org.springframework.stereotype.Service;
+
+/***
  * Date:2023/6/16
  * Title:文件所属模块（必须填写）
  * Description：对本文件的详细描述，原则上不能少于30字
@@ -14,5 +21,7 @@ package org.springblade.modules.business.datagram.service.impl;
  * @version 1.0
  * Remark：认为有必要的其他信息
  */
-public class RtuDatagramServiceImpl {
+@Slf4j
+@Service
+public class RtuDatagramServiceImpl extends BaseServiceImpl<RtuDatagramMapper, RtuDatagramInfoEntity> implements IRtuDatagramService {
 }

src/main/java/org/springblade/modules/business/home/ScheduledTaskManager.java

@@ -74,7 +74,7 @@ public class ScheduledTaskManager {
 	@Resource
 	private IDeptRegionService deptRegionService;
 
-	@Scheduled(cron = "0 0/5 * * * * ")
+//	@Scheduled(cron = "0 0/5 * * * * ")
 	public void countTask() {
 		try {
 			//HomeInfoCountTask task = new HomeInfoCountTask(redisTemplate,messagingTemplate,rtuBaseInfoService,rtuWarningService, checkOrderService,deptService,deptRegionService);

src/main/java/org/springblade/modules/business/rtumanage/service/impl/RtuManageServiceImpl.java

@@ -57,13 +57,13 @@ public class RtuManageServiceImpl extends BaseServiceImpl<RtuManageMapper, RtuSt
 		querywrapper.eq(RtuStatusEntity::getRtuCode, rtuStatusEntity.getRtuCode());
 		RtuStatusEntity entity = this.getOne(querywrapper);
 		if (null != entity) {
-			if (null != entity.getLastUpTime()) {
-				if (entity.getLastUpTime().before(rtuStatusEntity.getLastUpTime())) {
-					entity.setLastUpTime(rtuStatusEntity.getLastUpTime());
-				}
-			} else {
+//			if (null != entity.getLastUpTime()) {
+//				if (entity.getLastUpTime().before(rtuStatusEntity.getLastUpTime())) {
+//					entity.setLastUpTime(rtuStatusEntity.getLastUpTime());
+//				}
+//			} else {
 				entity.setLastUpTime(rtuStatusEntity.getLastUpTime());
-			}
+			//}
 			return this.updateById(entity);
 		} else {
 			rtuStatusEntity.setRunStatusId(EquipmentStatusEnum.STATUS_RUN.getCode());

src/main/java/org/springblade/mq/kafka/handler/MessageHandler.java

@@ -5,11 +5,23 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 
 import org.springblade.constant.RtuDataInfoConstant;
+import org.springblade.core.tool.utils.ConcurrentDateFormat;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.business.data.entity.*;
+import org.springblade.modules.business.data.service.*;
+import org.springblade.modules.business.datagram.entity.RtuDatagramInfoEntity;
+import org.springblade.modules.business.datagram.service.IRtuDatagramService;
+import org.springblade.modules.business.rtumanage.entity.RtuStatusEntity;
+import org.springblade.modules.business.rtumanage.service.IRtuManageService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.kafka.support.Acknowledgment;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
+import java.util.Date;
+
 /**
  * KAFKA消息处理器
  *
@@ -29,6 +41,222 @@ public class MessageHandler {
     @Value("${spring.mq-topic.ywxt-cloud-rtu-data-rsvr}")
     private String topicRtuDataRsvr;
 
+    @Value("${spring.mq-topic.ywxt-rtu-status}")
+    private String topicRtuStatus;
+
+    @Resource
+    private KafkaTemplate<String, String> kafkaTemplate;
+
+    @Resource
+    private IRtuDataRainService rtuDataRainService;
+
+    @Resource
+    private IRtuDataRiverService rtuDataRiverService;
+
+    @Resource
+    private IRtuDataRsvrService rtuDataRsvrService;
+
+    @Resource
+    private IRtuDataRainHistoreService rtuDataRainHistoreService;
+
+    @Resource
+    private IRtuDataRiverHistoreService rtuDataRiverHistoreService;
+
+    @Resource
+    private IRtuDataRsvrHistoreService rtuDataRsvrHistoreService;
+
+    @Resource
+    private IRtuRealTimeStatusService rtuRealTimeStatusService;
+
+    @Resource
+    private IRtuRealTimeStatusHistoreService rtuRealTimeStatusHistoreService;
+
+    @Resource
+    private IRtuDatagramService rtuDatagramService;
+
+    @Resource
+    private IRtuDataSzyMpService mpService;
+
+    @Resource
+    private IRtuDataSzyMpHistoreService mpHistoreService;
+
+    @Resource
+    private IRtuDataSzyRiverService szyRiverService;
+
+    @Resource
+    private IRtuDataSzyRiverHistoreService szyRiverHistoreService;
+
+    @Resource
+    private IRtuManageService rtuManageService;
+
+    @Resource
+    private IRtuDataWeatherService weatherService;
+
+    @KafkaListener(groupId = "${spring.kafka.consumer.group-id}", topics = "${spring.mq-topic.ywxt-cloud-collect-datagram}", containerFactory = "ackContainerFactory")
+    public void datagramInfoMessage(ConsumerRecord record, Acknowledgment acknowledgment) {
+        try {
+            String message = (String) record.value();
+            log.info("{} ,{}", "datagram info", message);
+
+            JSONObject data = JSONObject.parseObject(message, JSONObject.class);
+            String rtuCode = data.getString(RtuDataInfoConstant.BASE_KEY_RTU);
+            String datagram = data.getString(RtuDataInfoConstant.BASE_KEY_DATAGRAM);
+            String pickTm = data.getString(RtuDataInfoConstant.BASE_KEY_DATAGRAM_PICK_TM);
+            String agreement = data.getString(RtuDataInfoConstant.BASE_KEY_AGREEMENT);
+
+            RtuDatagramInfoEntity entity = new RtuDatagramInfoEntity();
+            entity.setRtuCode(rtuCode);
+            entity.setAgreement(agreement);
+            entity.setDatagram(datagram);
+            Date pickDt = Func.parse(pickTm, ConcurrentDateFormat.of("yyyyMMddHHmmss"));
+            entity.setPickTime(pickDt);
+            rtuDatagramService.save(entity);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        } finally {
+            // 手动提交 offset
+            acknowledgment.acknowledge();
+        }
+    }
+
+
+    @KafkaListener(groupId = "${spring.kafka.consumer.group-id}", topics = "${spring.mq-topic.ywxt-cloud-collect-datagram-ext}", containerFactory = "ackContainerFactory")
+    public void datagramExtInfoMessage(ConsumerRecord record, Acknowledgment acknowledgment) {
+        try {
+            String message = (String) record.value();
+            log.info("{} ,{}", "datagram info ext", message);
+            JSONObject data = JSONObject.parseObject(message, JSONObject.class);
+            String rtuCode = data.getString(RtuDataInfoConstant.BASE_KEY_RTU);
+            String datagram = data.getString(RtuDataInfoConstant.BASE_KEY_DATAGRAM);
+            String pickTm = data.getString(RtuDataInfoConstant.BASE_KEY_DATAGRAM_PICK_TM);
+            String agreement = data.getString(RtuDataInfoConstant.BASE_KEY_AGREEMENT);
+
+            RtuDatagramInfoEntity entity = new RtuDatagramInfoEntity();
+            entity.setRtuCode(rtuCode);
+            entity.setAgreement(agreement);
+            entity.setDatagram(datagram);
+            Date pickDt = Func.parse(pickTm, ConcurrentDateFormat.of("yyyyMMddHHmmss"));
+            entity.setPickTime(pickDt);
+            rtuDatagramService.save(entity);
+
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        } finally {
+            // 手动提交 offset
+            acknowledgment.acknowledge();
+        }
+    }
+
+
+    @KafkaListener(groupId = "${spring.kafka.consumer.group-id}", topics = "${spring.mq-topic.ywxt-cloud-rtu-data-szy-river}", containerFactory = "ackContainerFactory")
+    public void szyRiverInfoMessage(ConsumerRecord record, Acknowledgment acknowledgment) {
+        try {
+            String message = (String) record.value();
+            log.info("{} ,{}", "rtu data szy river info", message);
+            JSONObject data = JSONObject.parseObject(message, JSONObject.class);
+            if (data.containsKey(RtuDataInfoConstant.RTU_DATA_RTUCODE_KEY)) {
+                log.info("rtu code {}", data.getString(RtuDataInfoConstant.RTU_DATA_RTUCODE_KEY));
+                RtuDataWqRiverEntity entity = new RtuDataWqRiverEntity();
+                entity.setRtuCode(data.getString(RtuDataInfoConstant.RTU_DATA_RTUCODE_KEY));
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_COLLECT_TIME_KEY)) {
+                    entity.setTm(data.getDate(RtuDataInfoConstant.RTU_DATA_COLLECT_TIME_KEY));
+                }
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_UP_TIME_KEY)) {
+                    entity.setUpTime(data.getDate(RtuDataInfoConstant.RTU_DATA_UP_TIME_KEY));
+                }
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_PICK_TIME_KEY)) {
+                    entity.setFromTime(data.getDate(RtuDataInfoConstant.RTU_DATA_PICK_TIME_KEY));
+                }
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_SZY_RIVER_HIGH)) {
+                    entity.setWaterLevelHigh(data.getString(RtuDataInfoConstant.RTU_DATA_SZY_RIVER_HIGH));
+                }
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_SZY_RIVER_SPEED)) {
+                    entity.setWaterFlowSpeed(data.getString(RtuDataInfoConstant.RTU_DATA_SZY_RIVER_SPEED));
+                }
+
+                szyRiverService.updateInfo(entity);
+
+                RtuDataWqRiverStoreEntity storeEntity = new RtuDataWqRiverStoreEntity();
+                storeEntity.setRtuCode(entity.getRtuCode());
+                storeEntity.setTm(entity.getTm());
+                storeEntity.setUpTime(entity.getUpTime());
+                storeEntity.setFromTime(entity.getFromTime());
+                storeEntity.setWaterLevelHigh(entity.getWaterLevelHigh());
+                storeEntity.setWaterFlowSpeed(entity.getWaterFlowSpeed());
+                szyRiverHistoreService.save(storeEntity);
+
+                RtuStatusEntity rtuStatusEntity = new RtuStatusEntity();
+                rtuStatusEntity.setRtuCode(entity.getRtuCode());
+                rtuStatusEntity.setLastUpTime(entity.getUpTime());
+                kafkaTemplate.send(topicRtuStatus, Func.toJson(rtuStatusEntity));
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        } finally {
+            // 手动提交 offset
+            acknowledgment.acknowledge();
+        }
+    }
+
+
+    @KafkaListener(groupId = "${spring.kafka.consumer.group-id}", topics = "${spring.mq-topic.ywxt-cloud-rtu-data-szy-mp-q-r}", containerFactory = "ackContainerFactory")
+    public void szyMpQRInfoMessage(ConsumerRecord record, Acknowledgment acknowledgment) {
+        try {
+            String message = (String) record.value();
+            log.info("{} ,{}", "rtu data  mp info", message);
+            JSONObject data = JSONObject.parseObject(message, JSONObject.class);
+            if (data.containsKey(RtuDataInfoConstant.RTU_DATA_RTUCODE_KEY)) {
+                log.info("rtu code {}", data.getString(RtuDataInfoConstant.RTU_DATA_RTUCODE_KEY));
+                RtuDataSzyFlowRateEntity entity = new RtuDataSzyFlowRateEntity();
+                entity.setRtuCode(data.getString(RtuDataInfoConstant.RTU_DATA_RTUCODE_KEY));
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_COLLECT_TIME_KEY)) {
+                    entity.setTm(data.getDate(RtuDataInfoConstant.RTU_DATA_COLLECT_TIME_KEY));
+                }
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_UP_TIME_KEY)) {
+                    entity.setUpTime(data.getDate(RtuDataInfoConstant.RTU_DATA_UP_TIME_KEY));
+                }
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_PICK_TIME_KEY)) {
+                    entity.setFromTime(data.getDate(RtuDataInfoConstant.RTU_DATA_PICK_TIME_KEY));
+                }
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_SZY_MP_Q_R_FIRST_FLOWRATE)) {
+                    entity.setMpQ(data.getString(RtuDataInfoConstant.RTU_DATA_SZY_MP_Q_R_FIRST_FLOWRATE));
+                }
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_SZY_MP_Q_R_FIRST_ACC_FLOWRATE)) {
+                    entity.setAccW(data.getString(RtuDataInfoConstant.RTU_DATA_SZY_MP_Q_R_FIRST_ACC_FLOWRATE));
+                }
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_SZY_MP_Q_R_SECOND_FLOWRATE)) {
+                    entity.setMpSencondQ(data.getString(RtuDataInfoConstant.RTU_DATA_SZY_MP_Q_R_SECOND_FLOWRATE));
+                }
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_SZY_MP_Q_R_SECOND_ACC_FLOWRATE)) {
+                    entity.setAccSencondW(data.getString(RtuDataInfoConstant.RTU_DATA_SZY_MP_Q_R_SECOND_ACC_FLOWRATE));
+                }
+
+                mpService.updateInfo(entity);
+                RtuDataSzyFlowRateStoreEntity storeEntity = new RtuDataSzyFlowRateStoreEntity();
+                storeEntity.setRtuCode(entity.getRtuCode());
+                storeEntity.setTm(entity.getTm());
+                storeEntity.setUpTime(entity.getUpTime());
+                storeEntity.setFromTime(entity.getFromTime());
+                storeEntity.setMpQ(entity.getMpQ());
+                storeEntity.setAccW(entity.getAccW());
+                storeEntity.setMpSencondQ(entity.getMpSencondQ());
+                storeEntity.setAccSencondW(entity.getAccSencondW());
+
+                mpHistoreService.save(storeEntity);
+
+                RtuStatusEntity rtuStatusEntity = new RtuStatusEntity();
+                rtuStatusEntity.setRtuCode(entity.getRtuCode());
+                rtuStatusEntity.setLastUpTime(entity.getUpTime());
+                kafkaTemplate.send(topicRtuStatus, Func.toJson(rtuStatusEntity));
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        } finally {
+            // 手动提交 offset
+            acknowledgment.acknowledge();
+        }
+    }
+
 
     /**
      * RTU雨情数据
@@ -44,6 +272,53 @@ public class MessageHandler {
             JSONObject data = JSONObject.parseObject(message, JSONObject.class);
             if (data.containsKey(RtuDataInfoConstant.RTU_DATA_RTUCODE_KEY)) {
                 log.info("rtu code {}", data.getString(RtuDataInfoConstant.RTU_DATA_RTUCODE_KEY));
+                RtuDataRainEntity entity = new RtuDataRainEntity();
+                entity.setRtuCode(data.getString(RtuDataInfoConstant.RTU_DATA_RTUCODE_KEY));
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_COLLECT_TIME_KEY)) {
+                    entity.setTm(data.getDate(RtuDataInfoConstant.RTU_DATA_COLLECT_TIME_KEY));
+                }
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_UP_TIME_KEY)) {
+                    entity.setUpTime(data.getDate(RtuDataInfoConstant.RTU_DATA_UP_TIME_KEY));
+                }
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_PICK_TIME_KEY)) {
+                    entity.setFromTime(data.getDate(RtuDataInfoConstant.RTU_DATA_PICK_TIME_KEY));
+                }
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_RAIN_DRP_KEY)) {
+                    entity.setDrp(data.getDouble(RtuDataInfoConstant.RTU_DATA_RAIN_DRP_KEY));
+                }
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_RAIN_INTV_KEY)) {
+                    entity.setIntv(data.getDouble(RtuDataInfoConstant.RTU_DATA_RAIN_INTV_KEY));
+                }
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_RAIN_PDR_KEY)) {
+                    entity.setPdr(data.getDouble(RtuDataInfoConstant.RTU_DATA_RAIN_PDR_KEY));
+                }
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_RAIN_DYP_KEY)) {
+                    entity.setDyp(data.getDouble(RtuDataInfoConstant.RTU_DATA_RAIN_DYP_KEY));
+                }
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_RAIN_WTH_KEY)) {
+                    entity.setWth(data.getString(RtuDataInfoConstant.RTU_DATA_RAIN_WTH_KEY));
+                }
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_RAIN_PT_KEY)) {
+                    entity.setPt(data.getDouble(RtuDataInfoConstant.RTU_DATA_RAIN_PT_KEY));
+                }
+                rtuDataRainService.updateRainInfo(entity);
+                RtuDataRainStoreEntity storeEntity = new RtuDataRainStoreEntity();
+                storeEntity.setRtuCode(entity.getRtuCode());
+                storeEntity.setTm(entity.getTm());
+                storeEntity.setUpTime(entity.getUpTime());
+                storeEntity.setFromTime(entity.getFromTime());
+                storeEntity.setDrp(entity.getDrp());
+                storeEntity.setIntv(entity.getIntv());
+                storeEntity.setPdr(entity.getPdr());
+                storeEntity.setDyp(entity.getDyp());
+                storeEntity.setWth(entity.getWth());
+                storeEntity.setPt(entity.getPt());
+                rtuDataRainHistoreService.save(storeEntity);
+
+                RtuStatusEntity rtuStatusEntity = new RtuStatusEntity();
+                rtuStatusEntity.setRtuCode(entity.getRtuCode());
+                rtuStatusEntity.setLastUpTime(entity.getUpTime());
+                kafkaTemplate.send(topicRtuStatus, Func.toJson(rtuStatusEntity));
             }
         } catch (Exception e) {
             log.error(e.getMessage(), e);
@@ -67,6 +342,34 @@ public class MessageHandler {
             JSONObject data = JSONObject.parseObject(message, JSONObject.class);
             if (data.containsKey(RtuDataInfoConstant.RTU_DATA_RTUCODE_KEY)) {
                 log.info("rtu code {}", data.getString(RtuDataInfoConstant.RTU_DATA_RTUCODE_KEY));
+                RtuDataRiverEntity entity = new RtuDataRiverEntity();
+                entity.setRtuCode(data.getString(RtuDataInfoConstant.RTU_DATA_RTUCODE_KEY));
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_COLLECT_TIME_KEY)) {
+                    entity.setTm(data.getDate(RtuDataInfoConstant.RTU_DATA_COLLECT_TIME_KEY));
+                }
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_UP_TIME_KEY)) {
+                    entity.setUpTime(data.getDate(RtuDataInfoConstant.RTU_DATA_UP_TIME_KEY));
+                }
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_PICK_TIME_KEY)) {
+                    entity.setFromTime(data.getDate(RtuDataInfoConstant.RTU_DATA_PICK_TIME_KEY));
+                }
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_RIVER_Z_KEY)) {
+                    entity.setZ(data.getDouble(RtuDataInfoConstant.RTU_DATA_RIVER_Z_KEY));
+                }
+                rtuDataRiverService.updateRiverInfo(entity);
+
+                RtuDataRiverStoreEntity storeEntity = new RtuDataRiverStoreEntity();
+                storeEntity.setRtuCode(entity.getRtuCode());
+                storeEntity.setTm(entity.getTm());
+                storeEntity.setUpTime(entity.getUpTime());
+                storeEntity.setFromTime(entity.getFromTime());
+                storeEntity.setZ(entity.getZ());
+                rtuDataRiverHistoreService.save(storeEntity);
+
+                RtuStatusEntity rtuStatusEntity = new RtuStatusEntity();
+                rtuStatusEntity.setRtuCode(entity.getRtuCode());
+                rtuStatusEntity.setLastUpTime(entity.getUpTime());
+                kafkaTemplate.send(topicRtuStatus, Func.toJson(rtuStatusEntity));
             }
         } catch (Exception e) {
             log.error(e.getMessage(), e);
@@ -90,6 +393,58 @@ public class MessageHandler {
             JSONObject data = JSONObject.parseObject(message, JSONObject.class);
             if (data.containsKey(RtuDataInfoConstant.RTU_DATA_RTUCODE_KEY)) {
                 log.info("rtu code {}", data.getString(RtuDataInfoConstant.RTU_DATA_RTUCODE_KEY));
+                RtuDataRsvrEntity entity = new RtuDataRsvrEntity();
+                entity.setRtuCode(data.getString(RtuDataInfoConstant.RTU_DATA_RTUCODE_KEY));
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_COLLECT_TIME_KEY)) {
+                    entity.setTm(data.getDate(RtuDataInfoConstant.RTU_DATA_COLLECT_TIME_KEY));
+                }
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_UP_TIME_KEY)) {
+                    entity.setUpTime(data.getDate(RtuDataInfoConstant.RTU_DATA_UP_TIME_KEY));
+                }
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_PICK_TIME_KEY)) {
+                    entity.setFromTime(data.getDate(RtuDataInfoConstant.RTU_DATA_PICK_TIME_KEY));
+                }
+                if (data.containsKey(RtuDataInfoConstant.RTU_DATA_RSVR_RZ_KEY)) {
+                    entity.setRz(data.getDouble(RtuDataInfoConstant.RTU_DATA_RSVR_RZ_KEY));
+                }
+
+                rtuDataRsvrService.updateRsvrInfo(entity);
+
+                RtuDataRsvrStoreEntity storeEntity = new RtuDataRsvrStoreEntity();
+                storeEntity.setRtuCode(entity.getRtuCode());
+                storeEntity.setTm(entity.getTm());
+                storeEntity.setUpTime(entity.getUpTime());
+                storeEntity.setFromTime(entity.getFromTime());
+                storeEntity.setRz(entity.getRz());
+                rtuDataRsvrHistoreService.save(storeEntity);
+
+                RtuStatusEntity rtuStatusEntity = new RtuStatusEntity();
+                rtuStatusEntity.setRtuCode(entity.getRtuCode());
+                rtuStatusEntity.setLastUpTime(entity.getUpTime());
+                kafkaTemplate.send(topicRtuStatus, Func.toJson(rtuStatusEntity));
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        } finally {
+            // 手动提交 offset
+            acknowledgment.acknowledge();
+        }
+    }
+
+    /**
+     * 测站实时状态信息
+     *
+     * @param record
+     * @param acknowledgment
+     */
+    @KafkaListener(groupId = "${spring.kafka.consumer.group-id}", topics = "${spring.mq-topic.ywxt-cloud-rtu-realtime-info}", containerFactory = "ackContainerFactory")
+    public void rtuRealtimeStatusInfoMessage(ConsumerRecord record, Acknowledgment acknowledgment) {
+        try {
+            String message = (String) record.value();
+            log.info("{} ,{}", "rtu realtime status info", message);
+            JSONObject data = JSONObject.parseObject(message, JSONObject.class);
+            if (rtuRealTimeStatusService.updateExtStatus(data)) {
+                rtuRealTimeStatusHistoreService.saveExtStatus(data);
             }
         } catch (Exception e) {
             log.error(e.getMessage(), e);
@@ -99,4 +454,67 @@ public class MessageHandler {
         }
     }
 
+    @KafkaListener(groupId = "${spring.kafka.consumer.group-id}", topics = "${spring.mq-topic.ywxt-cloud-rtu-warn-info}", containerFactory = "ackContainerFactory")
+    public void rtuWarnStatusInfoMessage(ConsumerRecord record, Acknowledgment acknowledgment) {
+        try {
+            String message = (String) record.value();
+            log.info("{} ,{}", "rtu warn status info", message);
+            JSONObject data = JSONObject.parseObject(message, JSONObject.class);
+            log.info("rtu code {}", data.getString(RtuDataInfoConstant.RTU_DATA_RTUCODE_KEY));
+            if (rtuRealTimeStatusService.updateWarnStatus(data)) {
+                rtuRealTimeStatusHistoreService.saveWarnStatus(data);
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        } finally {
+            // 手动提交 offset
+            acknowledgment.acknowledge();
+        }
+    }
+
+    @KafkaListener(groupId = "${spring.kafka.consumer.group-id}", topics = "${spring.mq-topic.ywxt-cloud-rtu-data-weather}", containerFactory = "ackContainerFactory")
+    public void rtuWeatherMessage(ConsumerRecord record, Acknowledgment acknowledgment) {
+        try {
+            String message = (String) record.value();
+            JSONObject data = JSONObject.parseObject(message, JSONObject.class);
+            RtuDataWeatherEntity entity = new RtuDataWeatherEntity();
+            entity.setRtuCode(data.getString(RtuDataInfoConstant.RTU_DATA_RTUCODE_KEY));
+            if (data.containsKey(RtuDataInfoConstant.RTU_DATA_COLLECT_TIME_KEY)) {
+                entity.setTm(data.getDate(RtuDataInfoConstant.RTU_DATA_COLLECT_TIME_KEY));
+            }
+            if (data.containsKey(RtuDataInfoConstant.RTU_DATA_UP_TIME_KEY)) {
+                entity.setUpTime(data.getDate(RtuDataInfoConstant.RTU_DATA_UP_TIME_KEY));
+            }
+            if (data.containsKey(RtuDataInfoConstant.RTU_DATA_PICK_TIME_KEY)) {
+                entity.setFromTime(data.getDate(RtuDataInfoConstant.RTU_DATA_PICK_TIME_KEY));
+            }
+            if (data.containsKey("AI")) {
+                entity.setAi(data.getDouble("AI"));
+            }
+            if (data.containsKey("MST")) {
+                entity.setMst(data.getDouble("MST"));
+            }
+            weatherService.save(entity);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        } finally {
+            // 手动提交 offset
+            acknowledgment.acknowledge();
+        }
+    }
+
+    @KafkaListener(groupId = "${spring.kafka.consumer.group-id}", topics = "${spring.mq-topic.ywxt-rtu-status}", containerFactory = "ackContainerFactory")
+    public void rtuStatusMessage(ConsumerRecord record, Acknowledgment acknowledgment) {
+        try {
+            String message = (String) record.value();
+            RtuStatusEntity rtuStatusEntity = JSONObject.parseObject(message, RtuStatusEntity.class);
+            rtuManageService.updateLastTime(rtuStatusEntity);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        } finally {
+            // 手动提交 offset
+            acknowledgment.acknowledge();
+        }
+    }
+
 }

src/main/resources/application-dev.yml

@@ -43,7 +43,7 @@ spring:
       key-serializer: org.apache.kafka.common.serialization.StringSerializer
       value-serializer: org.apache.kafka.common.serialization.StringSerializer
     consumer:
-      group-id: kafka-ywxt-nm
+      group-id: kafka-tsywxt-cloud-data-server
       # 手动提交
       enable-auto-commit: false
       auto-offset-reset: latest
@@ -60,6 +60,13 @@ spring:
     ywxt-cloud-rtu-data-rain:  topic-ywxt-cloud-rtu-data-rain
     ywxt-cloud-rtu-data-river:  topic-ywxt-cloud-rtu-data-river
     ywxt-cloud-rtu-data-rsvr:  topic-ywxt-cloud-rtu-data-rsvr
+    ywxt-cloud-rtu-realtime-info: topic-ywxt-cloud-rtu-realtime-info
+    ywxt-cloud-rtu-warn-info: topic-ywxt-cloud-rtu-warn-info
+    ywxt-cloud-rtu-data-szy-river: topic-ywxt-cloud-rtu-data-szy-river
+    ywxt-cloud-rtu-data-szy-mp-q-r: topic-ywxt-cloud-rtu-data-szy-mp-q-r
+    ywxt-cloud-collect-datagram: queue-waiting-process-datagram
+    ywxt-cloud-collect-datagram-ext: queue-waiting-process-datagram-ext
+    ywxt-cloud-rtu-data-weather: topic-ywxt-cloud-rtu-data-sw-weather
     ywxt-rtu-status: ywxt-rtu-status
     ywxt-warning: ywxt-warning
     topic-etl-task-run-info: topic-etl-task-run-info

src/main/resources/application-prod.yml

@@ -2,11 +2,9 @@
 spring:
   redis:
     ##redis 单机环境配置
-    ##将docker脚本部署的redis服务映射为宿主机ip
-    ##生产环境推荐使用阿里云高可用redis服务并设置密码
-    host: 172.1.0.218
+    host: 172.31.1.228
     port: 6379
-    password: Zhkrc@2019
+    password:  Dh@82828800
     database: 1
     ssl: false
     ##redis 集群环境配置
@@ -14,14 +12,98 @@ spring:
     #  nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003
     #  commandTimeout: 5000
   datasource:
-    url: jdbc:mysql://172.1.0.210:3306/galaxy?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-    username: bladex
-    password: Zhkrc@2019
+    # MySql
+    url: jdbc:mysql://172.31.1.233:3306/tsdb_cloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    username: root
+    password: Dh@82828800
+
+    # PostgreSQL
+    #url: jdbc:postgresql://127.0.0.1:5432/bladex_boot
+    #username: postgres
+    #password: 123456
+    # Oracle
+    #url: jdbc:oracle:thin:@127.0.0.1:1521:orcl
+    #username: BLADEX_BOOT
+    #password: BLADEX_BOOT
+    # SqlServer
+    #url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=bladex_boot
+    #username: bladex_boot
+    #password: bladex_boot
+    # DaMeng
+  #    url: jdbc:dm://172.1.0.215:5236/ZGXXXT?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
+  #    username: ZGXXXT
+  #    password: ZGXXXT2022
+
+  kafka:
+    bootstrap-servers: 172.31.1.228:9092
+    producer:
+      retries: 0
+      batch-size: 16384
+      buffer-memory: 33554432
+      key-serializer: org.apache.kafka.common.serialization.StringSerializer
+      value-serializer: org.apache.kafka.common.serialization.StringSerializer
+    consumer:
+      group-id: kafka-tsywxt-cloud
+      # 手动提交
+      enable-auto-commit: false
+      auto-offset-reset: latest
+      key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
+      value-deserializer: org.apache.kafka.common.serialization.StringDeserializer
+      properties:
+        session.timeout.ms: 60000
+    listener:
+      log-container-config: false
+      concurrency: 5
+      # 手动提交
+      ack-mode: manual_immediate
+  mq-topic:
+    ywxt-cloud-rtu-data-rain:  topic-ywxt-cloud-rtu-data-rain
+    ywxt-cloud-rtu-data-river:  topic-ywxt-cloud-rtu-data-river
+    ywxt-cloud-rtu-data-rsvr:  topic-ywxt-cloud-rtu-data-rsvr
+    ywxt-cloud-rtu-realtime-info: topic-ywxt-cloud-rtu-realtime-info
+    ywxt-cloud-rtu-data-szy-river: topic-ywxt-cloud-rtu-data-szy-river
+    ywxt-cloud-rtu-data-szy-mp-q-r: topic-ywxt-cloud-rtu-data-szy-mp-q-r
+    ywxt-cloud-collect-datagram: queue-waiting-process-datagram
+    ywxt-cloud-collect-datagram-ext: queue-waiting-process-datagram-ext
+    ywxt-rtu-status: ywxt-rtu-status
+    ywxt-warning: ywxt-warning
+    topic-etl-task-run-info: topic-etl-task-run-info
+    topic-etl-rain: topic-etl-rain-data
+    topic-etl-river: topic-etl-river-data
+    topic-etl-rsvr: topic-etl-rsvr-data
+    topic-etl-ground: topic-etl-ground-data
+    topic-etl-promptly-collect:  topic-etl-promptly-collect
+  apk:
+    url: http://111.204.228.227:20002/app/apk
+    save-path: D:\\tmp
+  task-config:
+    etl-task: false
+    warning-check-task: false
+    dept-update-task: false
+  warn-config:
+    delay-time: 120
+
+export-config:
+  workdir: D:\\tmp\\export
+  equipment-info-template: equipment-template.xlsx
+  inspection-remainingproblems-template: inspection-remainingproblems-template.xlsx
+  inspection-unfinished-template: inspection-unfinished-template.xlsx
+
+ftp-config:
+  ip: 172.31.1.199
+  port: 2221
+  username: admin
+  password: admin
+  workdir: D:\\tmp\\ftp
+  targetdir: ANALYSIS/CLDAS
+
+rockdb-config:
+  save-path: /home/tsywxt-cloud/server/data-server/rockdb
 
 #第三方登陆
 social:
   enabled: true
-  domain: http://172.1.0.218:1888
+  domain: http://127.0.0.1:1888
 
 #blade配置
 blade:
@@ -29,12 +111,11 @@ blade:
   lock:
     ##是否启用分布式锁
     enabled: false
-    ##将docker脚本部署的redis服务映射为宿主机ip
-    ##生产环境推荐使用阿里云高可用redis服务并设置密码
-    address: redis://172.1.0.218:6379
-    password: 123456
+    ##redis服务地址
+    address: redis://172.9.0.165:6379
+    password:  Dh8282
   #本地文件上传
   file:
     remote-mode: true
     upload-domain: http://localhost:8999
-    remote-path: /usr/share/nginx/html
+    remote-path: /usr/share/nginx/html

src/main/resources/application-test.yml

@@ -70,7 +70,7 @@ spring:
     topic-etl-promptly-collect:  topic-etl-promptly-collect
   apk:
     url: http://111.204.228.227:20002/app/apk
-    save-path: D:\\tmp
+    save-path: /home/tmp
   task-config:
     etl-task: false
     warning-check-task: false
@@ -79,7 +79,7 @@ spring:
     delay-time: 120
 
 export-config:
-  workdir: D:\\tmp\\export
+  workdir: /home/export
   equipment-info-template: equipment-template.xlsx
   inspection-remainingproblems-template: inspection-remainingproblems-template.xlsx
   inspection-unfinished-template: inspection-unfinished-template.xlsx
@@ -89,11 +89,11 @@ ftp-config:
   port: 2221
   username: admin
   password: admin
-  workdir: D:\\tmp\\ftp
+  workdir: /home/ftp
   targetdir: ANALYSIS/CLDAS
 
 rockdb-config:
-  save-path: D:\\tmp\\rockdb
+  save-path: /home/tsywxt-cloud/server/data-server/rockdb
 
 #第三方登陆
 social:

src/main/resources/application.yml

@@ -201,6 +201,7 @@ blade:
     skip-url:
       - /galaxy-test/**
       - /galaxy-business/open/user/reg
+      - /galaxy-business/rtu/data/weather/**
     #授权认证配置
     auth:
       - method: ALL