diff --git a/src/main/java/com/gunshi/project/hsz/mapper/StRiverRMapper.java b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StRiverRMapper.java similarity index 70% rename from src/main/java/com/gunshi/project/hsz/mapper/StRiverRMapper.java rename to module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StRiverRMapper.java index 8171b7d..a043f3d 100644 --- a/src/main/java/com/gunshi/project/hsz/mapper/StRiverRMapper.java +++ b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StRiverRMapper.java @@ -1,7 +1,7 @@ -package com.gunshi.project.hsz.mapper; +package com.gunshi.project.hsz.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gunshi.project.hsz.model.StRiverR; +import com.gunshi.project.hsz.common.model.StRiverR; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/gunshi/project/hsz/mapper/StRiverRRealMapper.java b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StRiverRRealMapper.java similarity index 85% rename from src/main/java/com/gunshi/project/hsz/mapper/StRiverRRealMapper.java rename to module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StRiverRRealMapper.java index 7b6a70e..454739d 100644 --- a/src/main/java/com/gunshi/project/hsz/mapper/StRiverRRealMapper.java +++ b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StRiverRRealMapper.java @@ -1,7 +1,7 @@ -package com.gunshi.project.hsz.mapper; +package com.gunshi.project.hsz.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gunshi.project.hsz.model.StRiverRReal; +import com.gunshi.project.hsz.common.model.StRiverRReal; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/gunshi/project/hsz/mapper/StRsvrRMapper.java b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StRsvrRMapper.java similarity index 91% rename from src/main/java/com/gunshi/project/hsz/mapper/StRsvrRMapper.java rename to module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StRsvrRMapper.java index 197fdc8..9047ebf 100644 --- a/src/main/java/com/gunshi/project/hsz/mapper/StRsvrRMapper.java +++ b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StRsvrRMapper.java @@ -1,7 +1,7 @@ -package com.gunshi.project.hsz.mapper; +package com.gunshi.project.hsz.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gunshi.project.hsz.model.StRsvrR; +import com.gunshi.project.hsz.common.model.StRsvrR; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/gunshi/project/hsz/mapper/StRsvrRRealMapper.java b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StRsvrRRealMapper.java similarity index 87% rename from src/main/java/com/gunshi/project/hsz/mapper/StRsvrRRealMapper.java rename to module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StRsvrRRealMapper.java index 7c9a533..7cbc72b 100644 --- a/src/main/java/com/gunshi/project/hsz/mapper/StRsvrRRealMapper.java +++ b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StRsvrRRealMapper.java @@ -1,7 +1,7 @@ -package com.gunshi.project.hsz.mapper; +package com.gunshi.project.hsz.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gunshi.project.hsz.model.StRsvrRReal; +import com.gunshi.project.hsz.common.model.StRsvrRReal; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/gunshi/project/hsz/model/StRiverR.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/StRiverR.java similarity index 98% rename from src/main/java/com/gunshi/project/hsz/model/StRiverR.java rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/StRiverR.java index d6d7e0d..7fde3e2 100644 --- a/src/main/java/com/gunshi/project/hsz/model/StRiverR.java +++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/StRiverR.java @@ -1,4 +1,4 @@ -package com.gunshi.project.hsz.model; +package com.gunshi.project.hsz.common.model; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/src/main/java/com/gunshi/project/hsz/model/StRiverRReal.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/StRiverRReal.java similarity index 98% rename from src/main/java/com/gunshi/project/hsz/model/StRiverRReal.java rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/StRiverRReal.java index 44c1a61..9c75a55 100644 --- a/src/main/java/com/gunshi/project/hsz/model/StRiverRReal.java +++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/StRiverRReal.java @@ -1,4 +1,4 @@ -package com.gunshi.project.hsz.model; +package com.gunshi.project.hsz.common.model; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/src/main/java/com/gunshi/project/hsz/model/StRsvrR.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/StRsvrR.java similarity index 99% rename from src/main/java/com/gunshi/project/hsz/model/StRsvrR.java rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/StRsvrR.java index c1487f9..2b61720 100644 --- a/src/main/java/com/gunshi/project/hsz/model/StRsvrR.java +++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/StRsvrR.java @@ -1,4 +1,4 @@ -package com.gunshi.project.hsz.model; +package com.gunshi.project.hsz.common.model; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/src/main/java/com/gunshi/project/hsz/model/StRsvrRReal.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/StRsvrRReal.java similarity index 97% rename from src/main/java/com/gunshi/project/hsz/model/StRsvrRReal.java rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/StRsvrRReal.java index 3991383..17cb456 100644 --- a/src/main/java/com/gunshi/project/hsz/model/StRsvrRReal.java +++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/StRsvrRReal.java @@ -1,4 +1,4 @@ -package com.gunshi.project.hsz.model; +package com.gunshi.project.hsz.common.model; import com.baomidou.mybatisplus.annotation.IdType; @@ -15,6 +15,7 @@ import jakarta.validation.constraints.Size; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -63,7 +64,7 @@ public class StRsvrRReal implements Serializable { @TableField(value="rz") @Schema(description="rz") // @Size(max = 0,message = "rz最大长度要小于 0") - private String rz; + private BigDecimal rz; /** * inq diff --git a/module-common/src/main/java/com/gunshi/project/hsz/common/util/LocalDateTimeConverter.java b/module-common/src/main/java/com/gunshi/project/hsz/common/util/LocalDateTimeConverter.java new file mode 100644 index 0000000..416ff6b --- /dev/null +++ b/module-common/src/main/java/com/gunshi/project/hsz/common/util/LocalDateTimeConverter.java @@ -0,0 +1,19 @@ +package com.gunshi.project.hsz.common.util; + +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.Date; + +/** + * @author lyf + * @since 2025-11-06 + */ +public class LocalDateTimeConverter { + public static Date toDate(LocalDateTime localDateTime) { + return Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant()); + } + + public static LocalDateTime fromDate(Date date) { + return LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault()); + } +} diff --git a/src/main/resources/mapper/StRsvrRMapper.xml b/module-common/src/main/resources/mapper/StRsvrRMapper.xml similarity index 93% rename from src/main/resources/mapper/StRsvrRMapper.xml rename to module-common/src/main/resources/mapper/StRsvrRMapper.xml index 1e13007..6aaae54 100644 --- a/src/main/resources/mapper/StRsvrRMapper.xml +++ b/module-common/src/main/resources/mapper/StRsvrRMapper.xml @@ -1,8 +1,8 @@ - + - SELECT stb.stcd, case UPPER(stb.sttp) when 'RR' then r.tm when 'ZZ' then r2.tm end stm, stb.source, @@ -16,7 +16,7 @@ WHERE subquery2.rn = 1) r2 ON stb.stcd = r2.stcd WHERE stb.source in ('SW', 'SH', 'SHYLRES') - SELECT stb.stcd, case UPPER(stb.sttp) when 'RR' then r.tm when 'ZZ' then r2.tm end etm, stb.source, diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/service/SyncTableRService.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/SyncTableRService.java similarity index 93% rename from service-datasync/src/main/java/com/gunshi/project/hsz/datasync/service/SyncTableRService.java rename to service-datasync/src/main/java/com/gunshi/project/hsz/datasync/SyncTableRService.java index bdaee3a..039e2e5 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/service/SyncTableRService.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/SyncTableRService.java @@ -1,4 +1,4 @@ -package com.gunshi.project.hsz.datasync.service; +package com.gunshi.project.hsz.datasync; import org.springframework.lang.NonNull; diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/config/SyncTaskScheduler.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/config/SyncTaskScheduler.java index ac89f30..21a2740 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/config/SyncTaskScheduler.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/config/SyncTaskScheduler.java @@ -1,8 +1,8 @@ package com.gunshi.project.hsz.datasync.config; -import com.gunshi.project.hsz.datasync.service.impl.SyncGnssRService; -import com.gunshi.project.hsz.datasync.service.impl.SyncSlRService; -import com.gunshi.project.hsz.datasync.service.impl.SyncSyRService; +import com.gunshi.project.hsz.datasync.gnss.SyncGnssRService; +import com.gunshi.project.hsz.datasync.seepage.SyncSlRService; +import com.gunshi.project.hsz.datasync.seepage.SyncSyRService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/flow/SyncFlowService.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/flow/SyncFlowService.java index 70cfd30..008101f 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/flow/SyncFlowService.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/flow/SyncFlowService.java @@ -7,7 +7,7 @@ import com.gunshi.project.hsz.common.model.StStbprpBElem; import com.gunshi.project.hsz.datasync.flow.datasource.JcskStFlowR; import com.gunshi.project.hsz.common.mapper.StStbprpBElemMapper; import com.gunshi.project.hsz.datasync.flow.datasource.JcskStFlowRMapper; -import com.gunshi.project.hsz.datasync.service.SyncTableRService; +import com.gunshi.project.hsz.datasync.SyncTableRService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/service/impl/SyncGnssRService.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/gnss/SyncGnssRService.java similarity index 95% rename from service-datasync/src/main/java/com/gunshi/project/hsz/datasync/service/impl/SyncGnssRService.java rename to service-datasync/src/main/java/com/gunshi/project/hsz/datasync/gnss/SyncGnssRService.java index 9cc0fba..8fabd4c 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/service/impl/SyncGnssRService.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/gnss/SyncGnssRService.java @@ -1,4 +1,4 @@ -package com.gunshi.project.hsz.datasync.service.impl; +package com.gunshi.project.hsz.datasync.gnss; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.gunshi.project.hsz.common.model.JcskGnssB; @@ -6,8 +6,8 @@ import com.gunshi.project.hsz.common.model.JcskGnssR; import com.gunshi.project.hsz.datasync.entity.jcsk.AttMqttCalcData; import com.gunshi.project.hsz.common.mapper.JcskGnssBMapper; import com.gunshi.project.hsz.common.mapper.JcskGnssRMapper; -import com.gunshi.project.hsz.datasync.mapper.jcsk.AttMqttCalcDataNormalMapper; -import com.gunshi.project.hsz.datasync.service.SyncTableRService; +import com.gunshi.project.hsz.datasync.gnss.datasource.AttMqttCalcDataNormalMapper; +import com.gunshi.project.hsz.datasync.SyncTableRService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/AttMqttCalcDataNormalMapper.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/gnss/datasource/AttMqttCalcDataNormalMapper.java similarity index 88% rename from service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/AttMqttCalcDataNormalMapper.java rename to service-datasync/src/main/java/com/gunshi/project/hsz/datasync/gnss/datasource/AttMqttCalcDataNormalMapper.java index 2f27325..83cf815 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/AttMqttCalcDataNormalMapper.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/gnss/datasource/AttMqttCalcDataNormalMapper.java @@ -1,4 +1,4 @@ -package com.gunshi.project.hsz.datasync.mapper.jcsk; +package com.gunshi.project.hsz.datasync.gnss.datasource; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/AttWyCdBaseMapper.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/gnss/datasource/AttWyCdBaseMapper.java similarity index 87% rename from service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/AttWyCdBaseMapper.java rename to service-datasync/src/main/java/com/gunshi/project/hsz/datasync/gnss/datasource/AttWyCdBaseMapper.java index 181c1da..fd68888 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/AttWyCdBaseMapper.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/gnss/datasource/AttWyCdBaseMapper.java @@ -1,4 +1,4 @@ -package com.gunshi.project.hsz.datasync.mapper.jcsk; +package com.gunshi.project.hsz.datasync.gnss.datasource; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/WaterDataTermitesMapper.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/WaterDataTermitesMapper.java deleted file mode 100644 index 321363f..0000000 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/WaterDataTermitesMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.gunshi.project.hsz.datasync.mapper.jcsk; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gunshi.project.hsz.datasync.entity.jcsk.WaterDataTermites; -import org.apache.ibatis.annotations.Mapper; - -/** - * WaterDataTermites的Mapper接口 - */ -@DS("jcsk") -@Mapper -public interface WaterDataTermitesMapper extends BaseMapper { - -} diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/WaterDeviceMapper.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/WaterDeviceMapper.java deleted file mode 100644 index 77bbd31..0000000 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/WaterDeviceMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.gunshi.project.hsz.datasync.mapper.jcsk; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gunshi.project.hsz.datasync.entity.jcsk.WaterDevice; -import org.apache.ibatis.annotations.Mapper; - -/** - * WaterDevice的Mapper接口 - */ -@DS("jcsk") -@Mapper -public interface WaterDeviceMapper extends BaseMapper { - - // 可以在这里添加自定义的SQL方法 - -} \ No newline at end of file diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/SyncRainfallService.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/SyncRainfallService.java index f7c4454..998c8d1 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/SyncRainfallService.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/SyncRainfallService.java @@ -6,9 +6,10 @@ import com.gunshi.project.hsz.common.mapper.StPptnRRealMapper; import com.gunshi.project.hsz.common.mapper.StStbprpBElemMapper; import com.gunshi.project.hsz.common.model.StPptnR; import com.gunshi.project.hsz.common.model.StStbprpBElem; +import com.gunshi.project.hsz.common.util.LocalDateTimeConverter; import com.gunshi.project.hsz.datasync.rainfall.datasource.JcskStPptnR; import com.gunshi.project.hsz.datasync.rainfall.datasource.JcskStPptnRMapper; -import com.gunshi.project.hsz.datasync.service.SyncTableRService; +import com.gunshi.project.hsz.datasync.SyncTableRService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.lang.NonNull; @@ -16,6 +17,9 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.ZoneOffset; +import java.util.Date; import java.util.List; /** @@ -69,7 +73,9 @@ public class SyncRainfallService implements SyncTableRService getSourceEntityListByLatestTargetEntity(@NonNull StPptnR targetEntity) { String stcd = targetEntity.getStcd(); - LocalDateTime tm = targetEntity.getTm(); + LocalDateTime tm = LocalDateTimeConverter.fromDate(targetEntity.getTm()); return sourceMapper.selectList( new LambdaQueryWrapper() .gt(JcskStPptnR::getTm, tm) @@ -101,6 +107,7 @@ public class SyncRainfallService implements SyncTableRService { -} \ No newline at end of file diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/riverWaterLevel/RiverWaterLevelReal.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/riverWaterLevel/RiverWaterLevelReal.java deleted file mode 100644 index 379cbbd..0000000 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/riverWaterLevel/RiverWaterLevelReal.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.gunshi.project.hsz.datasync.riverWaterLevel; - - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - - -@Data -@TableName("st_river_r_real") -public class RiverWaterLevelReal { - - /** - * stcd - */ - @TableId(value = "stcd", type = IdType.AUTO) - private String stcd; - - /** - * tm - */ - @TableField(value = "tm") - private LocalDateTime tm; - - /** - * z - */ - @TableField(value = "") - private BigDecimal z; - - /** - * rwptn - */ - @TableField(value = "wptn") - private String wptn; - - - /** - * chtm - */ - @TableField(value = "chtm") - private LocalDateTime chtm; - -} diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/riverWaterLevel/RiverWaterLevelRealMapper.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/riverWaterLevel/RiverWaterLevelRealMapper.java deleted file mode 100644 index c7fefd3..0000000 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/riverWaterLevel/RiverWaterLevelRealMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.gunshi.project.hsz.datasync.riverWaterLevel; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author lyf - * @since 2025-10-20 - */ -@DS("tsg") -@Mapper -public interface RiverWaterLevelRealMapper extends BaseMapper { -} diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rsvrWaterLevel/RsvrWaterLevel.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rsvrWaterLevel/RsvrWaterLevel.java deleted file mode 100644 index 9f0e713..0000000 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rsvrWaterLevel/RsvrWaterLevel.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.gunshi.project.hsz.datasync.rsvrWaterLevel; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -/** - * @author lyf - * @since 2025-10-20 - */ -@Data -@TableName("st_rsvr_r") -public class RsvrWaterLevel { - /** - * 测站编码 - */ - @TableField("stcd") - private String stcd; - - /** - * 监测时间 - */ - @TableField("tm") - private LocalDateTime tm; - - /** - * 水位 - */ - @TableField("rz") - private BigDecimal rz; - - /** - * 入库流量 - */ - @TableField("inq") - private BigDecimal inq; - - /** - * 蓄水量 - */ - @TableField("w") - private BigDecimal w; - - /** - * 库下水位 - */ - @TableField("blrz") - private BigDecimal blrz; - - /** - * 出库流量 - */ - @TableField("otq") - private BigDecimal otq; - - /** - * 水库水势 - */ - @TableField("rwptn") - private String rwptn; - -} \ No newline at end of file diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rsvrWaterLevel/RsvrWaterLevelMapper.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rsvrWaterLevel/RsvrWaterLevelMapper.java deleted file mode 100644 index 50f38fa..0000000 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rsvrWaterLevel/RsvrWaterLevelMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.gunshi.project.hsz.datasync.rsvrWaterLevel; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author lyf - * @since 2025-10-20 - */ -@DS("tsg") -@Mapper -public interface RsvrWaterLevelMapper extends BaseMapper { -} \ No newline at end of file diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rsvrWaterLevel/RsvrWaterLevelReal.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rsvrWaterLevel/RsvrWaterLevelReal.java deleted file mode 100644 index cb29da4..0000000 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rsvrWaterLevel/RsvrWaterLevelReal.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.gunshi.project.hsz.datasync.rsvrWaterLevel; - - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - - -@Data -@TableName("st_rsvr_r_real") -public class RsvrWaterLevelReal { - - /** - * stcd - */ - @TableId(value = "stcd", type = IdType.AUTO) - private String stcd; - - /** - * tm - */ - @TableField(value = "tm") - private LocalDateTime tm; - - /** - * rz - */ - @TableField(value = "rz") - private BigDecimal rz; - - /** - * rwptn - */ - @TableField(value = "rwptn") - private String rwptn; - - - /** - * chtm - */ - @TableField(value = "chtm") - private LocalDateTime chtm; - -} diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rsvrWaterLevel/RsvrWaterLevelRealMapper.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rsvrWaterLevel/RsvrWaterLevelRealMapper.java deleted file mode 100644 index c368ceb..0000000 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rsvrWaterLevel/RsvrWaterLevelRealMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.gunshi.project.hsz.datasync.rsvrWaterLevel; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author lyf - * @since 2025-10-20 - */ -@DS("tsg") -@Mapper -public interface RsvrWaterLevelRealMapper extends BaseMapper { -} diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/service/impl/SyncSlRService.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/seepage/SyncSlRService.java similarity index 95% rename from service-datasync/src/main/java/com/gunshi/project/hsz/datasync/service/impl/SyncSlRService.java rename to service-datasync/src/main/java/com/gunshi/project/hsz/datasync/seepage/SyncSlRService.java index da6aa0f..298f05a 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/service/impl/SyncSlRService.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/seepage/SyncSlRService.java @@ -1,4 +1,4 @@ -package com.gunshi.project.hsz.datasync.service.impl; +package com.gunshi.project.hsz.datasync.seepage; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.gunshi.project.hsz.common.model.JcskSlB; @@ -6,8 +6,8 @@ import com.gunshi.project.hsz.common.model.JcskSlR; import com.gunshi.project.hsz.datasync.entity.jcsk.DsmSpgSpqn; import com.gunshi.project.hsz.common.mapper.JcskSlBMapper; import com.gunshi.project.hsz.common.mapper.JcskSlRMapper; -import com.gunshi.project.hsz.datasync.mapper.jcsk.DsmSpgSpqnMapper; -import com.gunshi.project.hsz.datasync.service.SyncTableRService; +import com.gunshi.project.hsz.datasync.seepage.datasource.DsmSpgSpqnMapper; +import com.gunshi.project.hsz.datasync.SyncTableRService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/service/impl/SyncSyRService.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/seepage/SyncSyRService.java similarity index 95% rename from service-datasync/src/main/java/com/gunshi/project/hsz/datasync/service/impl/SyncSyRService.java rename to service-datasync/src/main/java/com/gunshi/project/hsz/datasync/seepage/SyncSyRService.java index be249f5..c72de8e 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/service/impl/SyncSyRService.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/seepage/SyncSyRService.java @@ -1,4 +1,4 @@ -package com.gunshi.project.hsz.datasync.service.impl; +package com.gunshi.project.hsz.datasync.seepage; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.gunshi.project.hsz.common.model.JcskSyB; @@ -6,8 +6,8 @@ import com.gunshi.project.hsz.common.model.JcskSyR; import com.gunshi.project.hsz.datasync.entity.jcsk.DsmSpgSppr; import com.gunshi.project.hsz.common.mapper.JcskSyBMapper; import com.gunshi.project.hsz.common.mapper.JcskSyRMapper; -import com.gunshi.project.hsz.datasync.mapper.jcsk.DsmSpgSpprMapper; -import com.gunshi.project.hsz.datasync.service.SyncTableRService; +import com.gunshi.project.hsz.datasync.seepage.datasource.DsmSpgSpprMapper; +import com.gunshi.project.hsz.datasync.SyncTableRService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/DsmSpgSpprMapper.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/seepage/datasource/DsmSpgSpprMapper.java similarity index 85% rename from service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/DsmSpgSpprMapper.java rename to service-datasync/src/main/java/com/gunshi/project/hsz/datasync/seepage/datasource/DsmSpgSpprMapper.java index fc5d6e7..0365cc7 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/DsmSpgSpprMapper.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/seepage/datasource/DsmSpgSpprMapper.java @@ -1,4 +1,4 @@ -package com.gunshi.project.hsz.datasync.mapper.jcsk; +package com.gunshi.project.hsz.datasync.seepage.datasource; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/DsmSpgSpprmpMapper.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/seepage/datasource/DsmSpgSpprmpMapper.java similarity index 86% rename from service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/DsmSpgSpprmpMapper.java rename to service-datasync/src/main/java/com/gunshi/project/hsz/datasync/seepage/datasource/DsmSpgSpprmpMapper.java index b644d7e..ea1e963 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/DsmSpgSpprmpMapper.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/seepage/datasource/DsmSpgSpprmpMapper.java @@ -1,4 +1,4 @@ -package com.gunshi.project.hsz.datasync.mapper.jcsk; +package com.gunshi.project.hsz.datasync.seepage.datasource; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/DsmSpgSpqnMapper.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/seepage/datasource/DsmSpgSpqnMapper.java similarity index 86% rename from service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/DsmSpgSpqnMapper.java rename to service-datasync/src/main/java/com/gunshi/project/hsz/datasync/seepage/datasource/DsmSpgSpqnMapper.java index 073fd8d..19e9e27 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/DsmSpgSpqnMapper.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/seepage/datasource/DsmSpgSpqnMapper.java @@ -1,4 +1,4 @@ -package com.gunshi.project.hsz.datasync.mapper.jcsk; +package com.gunshi.project.hsz.datasync.seepage.datasource; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/DsmSpgSpqnmpMapper.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/seepage/datasource/DsmSpgSpqnmpMapper.java similarity index 86% rename from service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/DsmSpgSpqnmpMapper.java rename to service-datasync/src/main/java/com/gunshi/project/hsz/datasync/seepage/datasource/DsmSpgSpqnmpMapper.java index 6de6e6a..432450c 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/DsmSpgSpqnmpMapper.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/seepage/datasource/DsmSpgSpqnmpMapper.java @@ -1,4 +1,4 @@ -package com.gunshi.project.hsz.datasync.mapper.jcsk; +package com.gunshi.project.hsz.datasync.seepage.datasource; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/riverWaterLevel/SyncRiverWaterLevelService.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/waterLevel/SyncRiverWaterLevelService.java similarity index 63% rename from service-datasync/src/main/java/com/gunshi/project/hsz/datasync/riverWaterLevel/SyncRiverWaterLevelService.java rename to service-datasync/src/main/java/com/gunshi/project/hsz/datasync/waterLevel/SyncRiverWaterLevelService.java index 189391c..dc3ead9 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/riverWaterLevel/SyncRiverWaterLevelService.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/waterLevel/SyncRiverWaterLevelService.java @@ -1,11 +1,16 @@ -package com.gunshi.project.hsz.datasync.riverWaterLevel; +package com.gunshi.project.hsz.datasync.waterLevel; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.gunshi.project.hsz.common.mapper.StRiverRMapper; +import com.gunshi.project.hsz.common.mapper.StRiverRRealMapper; +import com.gunshi.project.hsz.common.model.StRiverR; +import com.gunshi.project.hsz.common.model.StRiverRReal; import com.gunshi.project.hsz.common.model.StStbprpBElem; import com.gunshi.project.hsz.common.mapper.StStbprpBElemMapper; -import com.gunshi.project.hsz.datasync.rsvrWaterLevel.datasource.JcskStRsvrR; -import com.gunshi.project.hsz.datasync.rsvrWaterLevel.datasource.JcskStRsvrRMapper; -import com.gunshi.project.hsz.datasync.service.SyncTableRService; +import com.gunshi.project.hsz.common.util.LocalDateTimeConverter; +import com.gunshi.project.hsz.datasync.waterLevel.datasource.JcskStRsvrR; +import com.gunshi.project.hsz.datasync.waterLevel.datasource.JcskStRsvrRMapper; +import com.gunshi.project.hsz.datasync.SyncTableRService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.lang.NonNull; @@ -13,6 +18,7 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.util.Date; import java.util.List; /** @@ -21,15 +27,15 @@ import java.util.List; * 荆楚水库的河道水位和水库水位共用一张表 */ @Service -public class SyncRiverWaterLevelService implements SyncTableRService { +public class SyncRiverWaterLevelService implements SyncTableRService { @Autowired private JcskStRsvrRMapper sourceMapper; @Autowired - private RiverWaterLevelRealMapper targetRealMapper; + private StRiverRRealMapper targetRealMapper; @Autowired - private RiverWaterLevelMapper targetMapper; + private StRiverRMapper targetMapper; @Autowired private StStbprpBElemMapper stbprpMapper; @@ -42,10 +48,10 @@ public class SyncRiverWaterLevelService implements SyncTableRService sourceEntityList = getSourceEntityListByLatestTargetEntity(latestTarget); cnt += saveToTarget(sourceEntityList); } @@ -54,30 +60,32 @@ public class SyncRiverWaterLevelService implements SyncTableRService() - .eq(RiverWaterLevel::getStcd, stcd) - .orderByDesc(RiverWaterLevel::getTm) + StRiverR target = targetMapper.selectOne( + new LambdaQueryWrapper() + .eq(StRiverR::getStcd, stcd) + .orderByDesc(StRiverR::getTm) .last("limit 1") ); if (target == null) { - target = new RiverWaterLevel(); + target = new StRiverR(); target.setStcd(stcd); - target.setTm(LocalDateTime.of(2025, 10, 20, 15, 0, 0)); + + Date date = LocalDateTimeConverter.toDate(LocalDateTime.of(2025, 10, 20, 15, 0, 0)); + target.setTm(date); } return target; } @Override - public List getSourceEntityListByLatestTargetEntity(@NonNull RiverWaterLevel targetEntity) { + public List getSourceEntityListByLatestTargetEntity(@NonNull StRiverR targetEntity) { //去荆楚水库中查询出，时间大于水库中最新那一条时间的记录 String stcd = targetEntity.getStcd(); - LocalDateTime tm = targetEntity.getTm(); + LocalDateTime tm = LocalDateTimeConverter.fromDate(targetEntity.getTm()); return sourceMapper.selectList( new LambdaQueryWrapper() .gt(JcskStRsvrR::getTm, tm) @@ -92,14 +100,14 @@ public class SyncRiverWaterLevelService implements SyncTableRService() - .eq(RiverWaterLevel::getStcd, stcd) - .eq(RiverWaterLevel::getTm, tm) + StRiverR existingTarget = targetMapper.selectOne( + new LambdaQueryWrapper() + .eq(StRiverR::getStcd, stcd) + .eq(StRiverR::getTm, tm) ); if (existingTarget == null) { - RiverWaterLevel targetEntity = new RiverWaterLevel(); + StRiverR targetEntity = new StRiverR(); BeanUtils.copyProperties(sourceEntity, targetEntity); targetEntity.setZ(sourceEntity.getRz()); targetEntity.setWptn(sourceEntity.getRwptn()); @@ -112,15 +120,15 @@ public class SyncRiverWaterLevelService implements SyncTableRService o2.getTm().compareTo(o1.getTm())); JcskStRsvrR sourceEntity = sourceEntityList.getFirst(); String stcd = sourceEntity.getStcd(); - RiverWaterLevelReal real = targetRealMapper.selectById(stcd); + StRiverRReal real = targetRealMapper.selectById(stcd); if (real == null) { - real = new RiverWaterLevelReal(); + real = new StRiverRReal(); } - real.setTm(sourceEntity.getTm()); + real.setTm(LocalDateTimeConverter.toDate(sourceEntity.getTm())); real.setStcd(stcd); real.setZ(sourceEntity.getRz()); real.setWptn(sourceEntity.getRwptn()); - real.setChtm(LocalDateTime.now()); + real.setChtm(new Date()); targetRealMapper.insertOrUpdate(real); } return count; diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rsvrWaterLevel/SyncRsvrWaterLevelService.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/waterLevel/SyncRsvrWaterLevelService.java similarity index 61% rename from service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rsvrWaterLevel/SyncRsvrWaterLevelService.java rename to service-datasync/src/main/java/com/gunshi/project/hsz/datasync/waterLevel/SyncRsvrWaterLevelService.java index 404d9d6..3cc8708 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rsvrWaterLevel/SyncRsvrWaterLevelService.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/waterLevel/SyncRsvrWaterLevelService.java @@ -1,11 +1,16 @@ -package com.gunshi.project.hsz.datasync.rsvrWaterLevel; +package com.gunshi.project.hsz.datasync.waterLevel; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.gunshi.project.hsz.common.mapper.StRsvrRMapper; +import com.gunshi.project.hsz.common.mapper.StRsvrRRealMapper; +import com.gunshi.project.hsz.common.model.StRsvrR; +import com.gunshi.project.hsz.common.model.StRsvrRReal; import com.gunshi.project.hsz.common.model.StStbprpBElem; import com.gunshi.project.hsz.common.mapper.StStbprpBElemMapper; -import com.gunshi.project.hsz.datasync.rsvrWaterLevel.datasource.JcskStRsvrR; -import com.gunshi.project.hsz.datasync.rsvrWaterLevel.datasource.JcskStRsvrRMapper; -import com.gunshi.project.hsz.datasync.service.SyncTableRService; +import com.gunshi.project.hsz.common.util.LocalDateTimeConverter; +import com.gunshi.project.hsz.datasync.waterLevel.datasource.JcskStRsvrR; +import com.gunshi.project.hsz.datasync.waterLevel.datasource.JcskStRsvrRMapper; +import com.gunshi.project.hsz.datasync.SyncTableRService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.lang.NonNull; @@ -13,6 +18,7 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.util.Date; import java.util.List; /** @@ -20,15 +26,15 @@ import java.util.List; * @since 2025-10-20 */ @Service -public class SyncRsvrWaterLevelService implements SyncTableRService { +public class SyncRsvrWaterLevelService implements SyncTableRService { @Autowired private JcskStRsvrRMapper sourceMapper; @Autowired - private RsvrWaterLevelRealMapper targetRealMapper; + private StRsvrRRealMapper targetRealMapper; @Autowired - private RsvrWaterLevelMapper targetMapper; + private StRsvrRMapper targetMapper; @Autowired private StStbprpBElemMapper stbprpMapper; @@ -41,10 +47,10 @@ public class SyncRsvrWaterLevelService implements SyncTableRService sourceEntityList = getSourceEntityListByLatestTargetEntity(latestTarget); cnt += saveToTarget(sourceEntityList); } @@ -53,29 +59,29 @@ public class SyncRsvrWaterLevelService implements SyncTableRService() - .eq(RsvrWaterLevel::getStcd, stcd) - .orderByDesc(RsvrWaterLevel::getTm) + StRsvrR target = targetMapper.selectOne( + new LambdaQueryWrapper() + .eq(StRsvrR::getStcd, stcd) + .orderByDesc(StRsvrR::getTm) .last("limit 1") ); if (target == null) { - target = new RsvrWaterLevel(); + target = new StRsvrR(); target.setStcd(stcd); - target.setTm(LocalDateTime.of(2025,10,20,15,0,0)); + target.setTm(LocalDateTimeConverter.toDate(LocalDateTime.of(2025, 10, 20, 15, 0, 0))); } return target; } @Override - public List getSourceEntityListByLatestTargetEntity(@NonNull RsvrWaterLevel targetEntity) { + public List getSourceEntityListByLatestTargetEntity(@NonNull StRsvrR targetEntity) { String stcd = targetEntity.getStcd(); - LocalDateTime tm = targetEntity.getTm(); + LocalDateTime tm = LocalDateTimeConverter.fromDate(targetEntity.getTm()); return sourceMapper.selectList( new LambdaQueryWrapper() .gt(JcskStRsvrR::getTm, tm) @@ -89,14 +95,14 @@ public class SyncRsvrWaterLevelService implements SyncTableRService() - .eq(RsvrWaterLevel::getStcd, stcd) - .eq(RsvrWaterLevel::getTm, tm) + StRsvrR existingTarget = targetMapper.selectOne( + new LambdaQueryWrapper() + .eq(StRsvrR::getStcd, stcd) + .eq(StRsvrR::getTm, tm) ); if (existingTarget == null) { - RsvrWaterLevel targetEntity = new RsvrWaterLevel(); + StRsvrR targetEntity = new StRsvrR(); BeanUtils.copyProperties(sourceEntity, targetEntity); targetMapper.insert(targetEntity); } @@ -107,15 +113,15 @@ public class SyncRsvrWaterLevelService implements SyncTableRService o2.getTm().compareTo(o1.getTm())); JcskStRsvrR sourceEntity = sourceEntityList.getFirst(); String stcd = sourceEntity.getStcd(); - RsvrWaterLevelReal real = targetRealMapper.selectById(stcd); + StRsvrRReal real = targetRealMapper.selectById(stcd); if (real == null) { - real = new RsvrWaterLevelReal(); + real = new StRsvrRReal(); } - real.setTm(sourceEntity.getTm()); + real.setTm(LocalDateTimeConverter.toDate(sourceEntity.getTm())); real.setStcd(stcd); real.setRz(sourceEntity.getRz()); real.setRwptn(sourceEntity.getRwptn()); - real.setChtm(LocalDateTime.now()); + real.setChtm(new Date()); targetRealMapper.insertOrUpdate(real); } return count; diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rsvrWaterLevel/datasource/JcskStRsvrR.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/waterLevel/datasource/JcskStRsvrR.java similarity index 95% rename from service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rsvrWaterLevel/datasource/JcskStRsvrR.java rename to service-datasync/src/main/java/com/gunshi/project/hsz/datasync/waterLevel/datasource/JcskStRsvrR.java index af4f673..78b8c10 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rsvrWaterLevel/datasource/JcskStRsvrR.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/waterLevel/datasource/JcskStRsvrR.java @@ -1,4 +1,4 @@ -package com.gunshi.project.hsz.datasync.rsvrWaterLevel.datasource; +package com.gunshi.project.hsz.datasync.waterLevel.datasource; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rsvrWaterLevel/datasource/JcskStRsvrRMapper.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/waterLevel/datasource/JcskStRsvrRMapper.java similarity index 81% rename from service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rsvrWaterLevel/datasource/JcskStRsvrRMapper.java rename to service-datasync/src/main/java/com/gunshi/project/hsz/datasync/waterLevel/datasource/JcskStRsvrRMapper.java index 6af6836..f30cb17 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rsvrWaterLevel/datasource/JcskStRsvrRMapper.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/waterLevel/datasource/JcskStRsvrRMapper.java @@ -1,4 +1,4 @@ -package com.gunshi.project.hsz.datasync.rsvrWaterLevel.datasource; +package com.gunshi.project.hsz.datasync.waterLevel.datasource; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/gunshi/project/hsz/controller/ReservoirWaterController.java b/src/main/java/com/gunshi/project/hsz/controller/ReservoirWaterController.java index f1001e3..5b08260 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/ReservoirWaterController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/ReservoirWaterController.java @@ -9,6 +9,7 @@ import com.gunshi.core.annotation.Get; import com.gunshi.core.annotation.Post; import com.gunshi.core.result.R; import com.gunshi.project.hsz.common.model.StPptnR; +import com.gunshi.project.hsz.common.model.StRsvrR; import com.gunshi.project.hsz.common.model.StStbprpB; import com.gunshi.project.hsz.entity.so.DataQueryCommonSo; import com.gunshi.project.hsz.entity.so.PicQuerySo; diff --git a/src/main/java/com/gunshi/project/hsz/controller/StRiverRController.java b/src/main/java/com/gunshi/project/hsz/controller/StRiverRController.java index 59830d5..38a3def 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/StRiverRController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/StRiverRController.java @@ -2,7 +2,7 @@ package com.gunshi.project.hsz.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; -import com.gunshi.project.hsz.model.StRiverR; +import com.gunshi.project.hsz.common.model.StRiverR; import com.gunshi.project.hsz.service.StRiverRService; import com.gunshi.project.hsz.common.validate.markers.Insert; import com.gunshi.project.hsz.common.validate.markers.Update; diff --git a/src/main/java/com/gunshi/project/hsz/controller/StRiverRRealController.java b/src/main/java/com/gunshi/project/hsz/controller/StRiverRRealController.java index a7816d5..538ec8c 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/StRiverRRealController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/StRiverRRealController.java @@ -2,7 +2,7 @@ package com.gunshi.project.hsz.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; -import com.gunshi.project.hsz.model.StRiverRReal; +import com.gunshi.project.hsz.common.model.StRiverRReal; import com.gunshi.project.hsz.service.StRiverRRealService; import com.gunshi.project.hsz.common.validate.markers.Insert; import com.gunshi.project.hsz.common.validate.markers.Update; diff --git a/src/main/java/com/gunshi/project/hsz/controller/StRsvrRController.java b/src/main/java/com/gunshi/project/hsz/controller/StRsvrRController.java index dc3205b..bf9dd8e 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/StRsvrRController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/StRsvrRController.java @@ -1,7 +1,7 @@ package com.gunshi.project.hsz.controller; import com.gunshi.core.result.R; -import com.gunshi.project.hsz.model.StRsvrR; +import com.gunshi.project.hsz.common.model.StRsvrR; import com.gunshi.project.hsz.service.StRsvrRService; import com.gunshi.project.hsz.common.validate.markers.Insert; import com.gunshi.project.hsz.common.validate.markers.Update; diff --git a/src/main/java/com/gunshi/project/hsz/controller/StRsvrRRealController.java b/src/main/java/com/gunshi/project/hsz/controller/StRsvrRRealController.java index 7b60c7b..ab48ec3 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/StRsvrRRealController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/StRsvrRRealController.java @@ -1,7 +1,7 @@ package com.gunshi.project.hsz.controller; import com.gunshi.core.result.R; -import com.gunshi.project.hsz.model.StRsvrRReal; +import com.gunshi.project.hsz.common.model.StRsvrRReal; import com.gunshi.project.hsz.service.StRsvrRRealService; import com.gunshi.project.hsz.common.validate.markers.Insert; import com.gunshi.project.hsz.common.validate.markers.Update; diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/StRsvrVo.java b/src/main/java/com/gunshi/project/hsz/entity/vo/StRsvrVo.java index 3e03fbf..f45b0ab 100644 --- a/src/main/java/com/gunshi/project/hsz/entity/vo/StRsvrVo.java +++ b/src/main/java/com/gunshi/project/hsz/entity/vo/StRsvrVo.java @@ -1,6 +1,6 @@ package com.gunshi.project.hsz.entity.vo; -import com.gunshi.project.hsz.model.StRsvrR; +import com.gunshi.project.hsz.common.model.StRsvrR; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/gunshi/project/hsz/mapper/AttResBaseMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/AttResBaseMapper.java index 40e6a5b..84cdec9 100644 --- a/src/main/java/com/gunshi/project/hsz/mapper/AttResBaseMapper.java +++ b/src/main/java/com/gunshi/project/hsz/mapper/AttResBaseMapper.java @@ -2,6 +2,7 @@ package com.gunshi.project.hsz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.gunshi.project.hsz.common.model.StRsvrR; import com.gunshi.project.hsz.common.model.StStbprpB; import com.gunshi.project.hsz.entity.so.DataQueryCommonSo; import com.gunshi.project.hsz.entity.so.PicQuerySo; diff --git a/src/main/java/com/gunshi/project/hsz/service/ForecastResultsService.java b/src/main/java/com/gunshi/project/hsz/service/ForecastResultsService.java index 9af78ff..fe097a5 100644 --- a/src/main/java/com/gunshi/project/hsz/service/ForecastResultsService.java +++ b/src/main/java/com/gunshi/project/hsz/service/ForecastResultsService.java @@ -9,6 +9,7 @@ import com.gunshi.algorithm.RrainfallForecast; import com.gunshi.algorithm.RunoffService; import com.gunshi.model.vo.FloodAlgorithemVo; import com.gunshi.project.hsz.common.model.StPptnR; +import com.gunshi.project.hsz.common.model.StRsvrR; import com.gunshi.project.hsz.common.model.StStbprpB; import com.gunshi.project.hsz.entity.vo.ForeRainStatVo; import com.gunshi.project.hsz.entity.vo.ForeRainTimeVo; diff --git a/src/main/java/com/gunshi/project/hsz/service/MessageCenterService.java b/src/main/java/com/gunshi/project/hsz/service/MessageCenterService.java index 61331ad..5219503 100644 --- a/src/main/java/com/gunshi/project/hsz/service/MessageCenterService.java +++ b/src/main/java/com/gunshi/project/hsz/service/MessageCenterService.java @@ -14,7 +14,7 @@ import com.gunshi.project.hsz.mapper.MessageCenterMapper; import com.gunshi.project.hsz.model.AttResBase; import com.gunshi.project.hsz.model.MessageCenter; import com.gunshi.project.hsz.model.OsmoticWarnR; -import com.gunshi.project.hsz.model.StRsvrR; +import com.gunshi.project.hsz.common.model.StRsvrR; import com.gunshi.project.hsz.util.DateUtil; import com.ruoyi.common.utils.SecurityUtils; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/gunshi/project/hsz/service/RiverWaterService.java b/src/main/java/com/gunshi/project/hsz/service/RiverWaterService.java index e0e59b1..8d68680 100644 --- a/src/main/java/com/gunshi/project/hsz/service/RiverWaterService.java +++ b/src/main/java/com/gunshi/project/hsz/service/RiverWaterService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.gunshi.project.hsz.common.model.StPptnRReal; +import com.gunshi.project.hsz.common.model.StRiverRReal; import com.gunshi.project.hsz.entity.so.DataQueryCommonSo; import com.gunshi.project.hsz.entity.vo.*; import com.gunshi.project.hsz.mapper.AttResBaseMapper; diff --git a/src/main/java/com/gunshi/project/hsz/service/StQxWarnRService.java b/src/main/java/com/gunshi/project/hsz/service/StQxWarnRService.java index 84049ec..d7a7c8e 100644 --- a/src/main/java/com/gunshi/project/hsz/service/StQxWarnRService.java +++ b/src/main/java/com/gunshi/project/hsz/service/StQxWarnRService.java @@ -6,6 +6,7 @@ import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fasterxml.jackson.databind.ObjectMapper; import com.gunshi.db.dto.DateTimeRangeSo; +import com.gunshi.project.hsz.common.model.StRiverRReal; import com.gunshi.project.hsz.entity.vo.*; import com.gunshi.project.hsz.mapper.AttResBaseMapper; import com.gunshi.project.hsz.mapper.StQxWarnRMapper; diff --git a/src/main/java/com/gunshi/project/hsz/service/StRiverRRealService.java b/src/main/java/com/gunshi/project/hsz/service/StRiverRRealService.java index 15703cb..bb4f28c 100644 --- a/src/main/java/com/gunshi/project/hsz/service/StRiverRRealService.java +++ b/src/main/java/com/gunshi/project/hsz/service/StRiverRRealService.java @@ -1,8 +1,8 @@ package com.gunshi.project.hsz.service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gunshi.project.hsz.mapper.StRiverRRealMapper; -import com.gunshi.project.hsz.model.StRiverRReal; +import com.gunshi.project.hsz.common.mapper.StRiverRRealMapper; +import com.gunshi.project.hsz.common.model.StRiverRReal; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/gunshi/project/hsz/service/StRiverRService.java b/src/main/java/com/gunshi/project/hsz/service/StRiverRService.java index c6be518..f4863df 100644 --- a/src/main/java/com/gunshi/project/hsz/service/StRiverRService.java +++ b/src/main/java/com/gunshi/project/hsz/service/StRiverRService.java @@ -1,8 +1,8 @@ package com.gunshi.project.hsz.service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gunshi.project.hsz.mapper.StRiverRMapper; -import com.gunshi.project.hsz.model.StRiverR; +import com.gunshi.project.hsz.common.mapper.StRiverRMapper; +import com.gunshi.project.hsz.common.model.StRiverR; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/gunshi/project/hsz/service/StRsvrRRealService.java b/src/main/java/com/gunshi/project/hsz/service/StRsvrRRealService.java index da8f62d..99e02f7 100644 --- a/src/main/java/com/gunshi/project/hsz/service/StRsvrRRealService.java +++ b/src/main/java/com/gunshi/project/hsz/service/StRsvrRRealService.java @@ -1,8 +1,8 @@ package com.gunshi.project.hsz.service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gunshi.project.hsz.mapper.StRsvrRRealMapper; -import com.gunshi.project.hsz.model.StRsvrRReal; +import com.gunshi.project.hsz.common.mapper.StRsvrRRealMapper; +import com.gunshi.project.hsz.common.model.StRsvrRReal; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/gunshi/project/hsz/service/StRsvrRService.java b/src/main/java/com/gunshi/project/hsz/service/StRsvrRService.java index 8c80cee..b689d52 100644 --- a/src/main/java/com/gunshi/project/hsz/service/StRsvrRService.java +++ b/src/main/java/com/gunshi/project/hsz/service/StRsvrRService.java @@ -7,8 +7,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gunshi.project.hsz.mapper.StRsvrRMapper; -import com.gunshi.project.hsz.model.StRsvrR; +import com.gunshi.project.hsz.common.mapper.StRsvrRMapper; +import com.gunshi.project.hsz.common.model.StRsvrR; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/gunshi/project/hsz/service/StStbprpBService.java b/src/main/java/com/gunshi/project/hsz/service/StStbprpBService.java index cbe874a..2753ed3 100644 --- a/src/main/java/com/gunshi/project/hsz/service/StStbprpBService.java +++ b/src/main/java/com/gunshi/project/hsz/service/StStbprpBService.java @@ -12,7 +12,7 @@ import com.gunshi.project.hsz.entity.vo.*; import com.gunshi.project.hsz.mapper.OsmoticPressRMapper; import com.gunshi.project.hsz.mapper.OsmoticShiftRMapper; import com.gunshi.project.hsz.mapper.StbprpBVoMapper; -import com.gunshi.project.hsz.model.StRsvrR; +import com.gunshi.project.hsz.common.model.StRsvrR; import com.gunshi.project.hsz.model.StZqrlB; import com.gunshi.project.hsz.model.StZvarlB; import com.gunshi.project.hsz.util.DateUtil; diff --git a/src/main/java/com/gunshi/project/hsz/service/StZqrlBService.java b/src/main/java/com/gunshi/project/hsz/service/StZqrlBService.java index 7b10c62..e4641b7 100644 --- a/src/main/java/com/gunshi/project/hsz/service/StZqrlBService.java +++ b/src/main/java/com/gunshi/project/hsz/service/StZqrlBService.java @@ -3,7 +3,7 @@ package com.gunshi.project.hsz.service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gunshi.project.hsz.entity.vo.RsvrComplexVo; import com.gunshi.project.hsz.mapper.StZqrlBMapper; -import com.gunshi.project.hsz.model.StRsvrR; +import com.gunshi.project.hsz.common.model.StRsvrR; import com.gunshi.project.hsz.model.StZqrlB; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/gunshi/project/hsz/service/WaterCountAnalysisService.java b/src/main/java/com/gunshi/project/hsz/service/WaterCountAnalysisService.java index fca07fd..56e2aef 100644 --- a/src/main/java/com/gunshi/project/hsz/service/WaterCountAnalysisService.java +++ b/src/main/java/com/gunshi/project/hsz/service/WaterCountAnalysisService.java @@ -3,6 +3,7 @@ package com.gunshi.project.hsz.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.gunshi.db.dto.DateRangeSo; +import com.gunshi.project.hsz.common.model.StRsvrR; import com.gunshi.project.hsz.entity.vo.WaterAnalysisVo; import com.gunshi.project.hsz.entity.vo.WaterCapacityAnalysisVo; import com.gunshi.project.hsz.model.*; @@ -94,7 +95,7 @@ public class WaterCountAnalysisService { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.apply("date_part('hour',tm) = 8") // 获取每天早上八点的数据 .ge(StRsvrR::getTm,dateRangeSo.getStart()) - .le(StRsvrR::getTm,dateRangeSo.getEnd()) + .le(StRsvrR::getTm, dateRangeSo.getEnd()) .eq(StRsvrR::getStcd,attResBase.getStcd()); queryWrapper.orderByDesc(StRsvrR::getTm);//根据时间降序 List stRsvrRS = stRsvrRService.getBaseMapper().selectList(queryWrapper);//获取水库的历史时间段的水位 diff --git a/src/main/java/com/gunshi/project/hsz/timetask/AlarmTask.java b/src/main/java/com/gunshi/project/hsz/timetask/AlarmTask.java index 507ce57..a1e199f 100644 --- a/src/main/java/com/gunshi/project/hsz/timetask/AlarmTask.java +++ b/src/main/java/com/gunshi/project/hsz/timetask/AlarmTask.java @@ -1,15 +1,12 @@ package com.gunshi.project.hsz.timetask; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.gunshi.project.hsz.entity.enums.AlarmTypeEnum; import com.gunshi.project.hsz.entity.vo.AttResBaseVo; import com.gunshi.project.hsz.mapper.AlarmSetMapper; import com.gunshi.project.hsz.mapper.AttResBaseMapper; -import com.gunshi.project.hsz.mapper.StRsvrRRealMapper; import com.gunshi.project.hsz.model.AlarmSet; -import com.gunshi.project.hsz.model.StRiverRReal; -import com.gunshi.project.hsz.model.StRsvrRReal; +import com.gunshi.project.hsz.common.model.StRiverRReal; import com.gunshi.project.hsz.model.WaterAlarm; import com.gunshi.project.hsz.service.StRiverRRealService; import com.gunshi.project.hsz.service.WaterAlarmService; @@ -19,19 +16,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.scheduling.concurrent.ThreadPoolExecutorFactoryBean; import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.time.Instant; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.util.Date; import java.util.List; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.RejectedExecutionHandler; -import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; /** diff --git a/src/main/java/com/gunshi/project/hsz/timetask/DataTaskHsz.java b/src/main/java/com/gunshi/project/hsz/timetask/DataTaskHsz.java index 7863eec..2876202 100644 --- a/src/main/java/com/gunshi/project/hsz/timetask/DataTaskHsz.java +++ b/src/main/java/com/gunshi/project/hsz/timetask/DataTaskHsz.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; -import com.gunshi.project.hsz.common.model.StPptnR; +import com.gunshi.project.hsz.common.model.*; import com.gunshi.project.hsz.model.*; import com.gunshi.project.hsz.service.*; import com.gunshi.project.hsz.util.OkHttpUtil;