diff --git a/src/main/java/com/gunshi/project/hsz/mapper/StPptnRMapper.java b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StPptnRMapper.java similarity index 95% rename from src/main/java/com/gunshi/project/hsz/mapper/StPptnRMapper.java rename to module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StPptnRMapper.java index e9f588d..b227607 100644 --- a/src/main/java/com/gunshi/project/hsz/mapper/StPptnRMapper.java +++ b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StPptnRMapper.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.StPptnR; +import com.gunshi.project.hsz.common.model.StPptnR; 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/StPptnRRealMapper.java b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StPptnRRealMapper.java similarity index 88% rename from src/main/java/com/gunshi/project/hsz/mapper/StPptnRRealMapper.java rename to module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StPptnRRealMapper.java index 499c0df..9115b6b 100644 --- a/src/main/java/com/gunshi/project/hsz/mapper/StPptnRRealMapper.java +++ b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StPptnRRealMapper.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.StPptnRReal; +import com.gunshi.project.hsz.common.model.StPptnRReal; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StStbprpBElemMapper.java b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StStbprpBElemMapper.java index 869cc38..a1bc4da 100644 --- a/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StStbprpBElemMapper.java +++ b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StStbprpBElemMapper.java @@ -3,6 +3,10 @@ package com.gunshi.project.hsz.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.gunshi.project.hsz.common.model.StStbprpBElem; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * 描述: 测站监测值类型 @@ -11,5 +15,12 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface StStbprpBElemMapper extends BaseMapper { - + @Select(""" + + """) + List selectByElem(@Param("elem") String elem); } \ No newline at end of file diff --git a/module-common/src/main/java/com/gunshi/project/hsz/common/model/InspectTask.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/InspectTask.java index 04f6592..2d88f09 100644 --- a/module-common/src/main/java/com/gunshi/project/hsz/common/model/InspectTask.java +++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/InspectTask.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.gunshi.core.dateformat.DateFormatString; +import com.gunshi.db.annotation.IgnoreAutoMapperAndDao; import com.gunshi.project.hsz.common.validate.markers.Update; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; @@ -27,6 +28,7 @@ import java.util.List; @Schema(description="巡检任务") @Data @TableName("public.inspect_task") +@IgnoreAutoMapperAndDao public class InspectTask implements Serializable { diff --git a/module-common/src/main/java/com/gunshi/project/hsz/common/model/InspectTaskDetail.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/InspectTaskDetail.java index 4b7d272..bbbac54 100644 --- a/module-common/src/main/java/com/gunshi/project/hsz/common/model/InspectTaskDetail.java +++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/InspectTaskDetail.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.gunshi.core.dateformat.DateFormatString; +import com.gunshi.db.annotation.IgnoreAutoMapperAndDao; import com.gunshi.project.hsz.common.validate.markers.Update; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; @@ -26,6 +27,7 @@ import java.util.Date; @Schema(description="巡查信息") @Data @TableName("public.inspect_task_detail") +@IgnoreAutoMapperAndDao public class InspectTaskDetail implements Serializable { public final static String thisTableName = "InspectTaskDetail"; diff --git a/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskByBD.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskByBD.java index 7bd4ad5..d8826a5 100644 --- a/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskByBD.java +++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/JcskByBD.java @@ -2,6 +2,7 @@ package com.gunshi.project.hsz.common.model; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.gunshi.db.annotation.IgnoreAutoMapperAndDao; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -13,6 +14,7 @@ import java.math.BigDecimal; */ @Data @TableName("public.jcsk_by_b_d") +@IgnoreAutoMapperAndDao public class JcskByBD { /** diff --git a/src/main/java/com/gunshi/project/hsz/model/StPptnR.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/StPptnR.java similarity index 95% rename from src/main/java/com/gunshi/project/hsz/model/StPptnR.java rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/StPptnR.java index 15f66b2..c4ff514 100644 --- a/src/main/java/com/gunshi/project/hsz/model/StPptnR.java +++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/StPptnR.java @@ -1,7 +1,8 @@ -package com.gunshi.project.hsz.model; +package com.gunshi.project.hsz.common.model; import java.io.Serializable; +import java.time.LocalDateTime; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; @@ -12,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.gunshi.core.dateformat.DateFormatString; +import com.gunshi.db.annotation.IgnoreAutoMapperAndDao; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -27,6 +29,7 @@ import lombok.Data; @Data @TableName("public.st_pptn_r") @JsonIgnoreProperties(ignoreUnknown = true) +@IgnoreAutoMapperAndDao public class StPptnR implements Serializable { diff --git a/src/main/java/com/gunshi/project/hsz/model/StPptnRReal.java b/module-common/src/main/java/com/gunshi/project/hsz/common/model/StPptnRReal.java similarity index 97% rename from src/main/java/com/gunshi/project/hsz/model/StPptnRReal.java rename to module-common/src/main/java/com/gunshi/project/hsz/common/model/StPptnRReal.java index 071b564..cd359ca 100644 --- a/src/main/java/com/gunshi/project/hsz/model/StPptnRReal.java +++ b/module-common/src/main/java/com/gunshi/project/hsz/common/model/StPptnRReal.java @@ -1,4 +1,4 @@ -package com.gunshi.project.hsz.model; +package com.gunshi.project.hsz.common.model; import com.baomidou.mybatisplus.annotation.IdType; @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.gunshi.core.dateformat.DateFormatString; +import com.gunshi.db.annotation.IgnoreAutoMapperAndDao; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -27,6 +28,7 @@ import java.util.Date; @Data @TableName("public.st_pptn_r_real") @JsonIgnoreProperties(ignoreUnknown = true) +@IgnoreAutoMapperAndDao public class StPptnRReal implements Serializable { diff --git a/src/main/resources/mapper/StPptnRMapper.xml b/module-common/src/main/resources/mapper/StPptnRMapper.xml similarity index 94% rename from src/main/resources/mapper/StPptnRMapper.xml rename to module-common/src/main/resources/mapper/StPptnRMapper.xml index d0d89f1..ff0fe8f 100644 --- a/src/main/resources/mapper/StPptnRMapper.xml +++ b/module-common/src/main/resources/mapper/StPptnRMapper.xml @@ -1,8 +1,8 @@ - + - SELECT stb.stcd, r.tm stm, stb.source, @@ -14,7 +14,7 @@ WHERE stb.source in ('QX', 'SW', 'SH', 'SHYLRES') - SELECT stb.stcd, r.tm etm, stb.source, diff --git a/src/main/resources/mapper/StPptnRRealMapper.xml b/module-common/src/main/resources/mapper/StPptnRRealMapper.xml similarity index 97% rename from src/main/resources/mapper/StPptnRRealMapper.xml rename to module-common/src/main/resources/mapper/StPptnRRealMapper.xml index cc70f8f..184a186 100644 --- a/src/main/resources/mapper/StPptnRRealMapper.xml +++ b/module-common/src/main/resources/mapper/StPptnRRealMapper.xml @@ -1,6 +1,6 @@ - + with m1 as (select stcd,max(tm) as tmx from st_pptn_r where stcd = #{stcd} diff --git a/module-common/src/main/resources/mapper/StStbprpBElemMapper.xml b/module-common/src/main/resources/mapper/StStbprpBElemMapper.xml deleted file mode 100644 index f2230bb..0000000 --- a/module-common/src/main/resources/mapper/StStbprpBElemMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/module-common/src/main/resources/mapper/StStbprpBMapper.xml b/module-common/src/main/resources/mapper/StStbprpBMapper.xml deleted file mode 100644 index 455ebf9..0000000 --- a/module-common/src/main/resources/mapper/StStbprpBMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - 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 40325a2..ac89f30 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,6 +1,5 @@ package com.gunshi.project.hsz.datasync.config; -import com.gunshi.project.hsz.datasync.service.impl.SyncByRService; 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; @@ -20,9 +19,6 @@ import java.util.concurrent.Executor; @Slf4j public class SyncTaskScheduler implements ApplicationRunner { - @Autowired - private SyncByRService syncByRService; - @Autowired private SyncGnssRService syncGnssRService; @@ -60,34 +56,6 @@ public class SyncTaskScheduler implements ApplicationRunner { log.info("应用初始化完成，定时任务将在下次调度时开始执行"); } - /** - * 白蚁数据同步任务 - 每5分钟执行一次 - * 确保上一次执行完毕后才会再次执行 - */ - @Scheduled(cron = "0 */5 * * * ?") - public void scheduleSyncByR() { - if (!isApplicationReady) { - return; - } - - // 检查任务是否正在运行，如果是则跳过本次执行 - if (isSyncByRRunning) { - log.info("白蚁数据同步任务正在执行中，跳过本次调度"); - return; - } - - try { - isSyncByRRunning = true; // 标记任务开始执行 - log.info("开始执行白蚁数据同步任务"); - syncByRService.syncData(); - log.info("白蚁数据同步任务执行完成"); - } catch (Exception e) { - log.error("白蚁数据同步任务执行异常", e); - } finally { - isSyncByRRunning = false; // 无论成功失败，都标记任务执行完毕 - } - } - /** * 位移数据同步任务 - 每15分钟执行一次 * 确保上一次执行完毕后才会再次执行 diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/AttMqttCalcData.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/AttMqttCalcData.java index c951fc6..017ba9c 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/AttMqttCalcData.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/AttMqttCalcData.java @@ -2,6 +2,7 @@ package com.gunshi.project.hsz.datasync.entity.jcsk; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.gunshi.db.annotation.IgnoreAutoMapperAndDao; import com.gunshi.project.hsz.common.model.JcskGnssR; import lombok.Data; @@ -16,6 +17,7 @@ import java.math.BigDecimal; */ @Data @TableName("SJZT_MD.\"att_mqtt_calc_data\"") +@IgnoreAutoMapperAndDao public class AttMqttCalcData { /** * 水库编码设备编码 diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/AttWyCdBase.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/AttWyCdBase.java index 364db52..6f1edcb 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/AttWyCdBase.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/AttWyCdBase.java @@ -2,6 +2,7 @@ package com.gunshi.project.hsz.datasync.entity.jcsk; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.gunshi.db.annotation.IgnoreAutoMapperAndDao; import com.gunshi.project.hsz.common.model.JcskGnssB; import lombok.Data; @@ -14,6 +15,7 @@ import lombok.Data; */ @Data @TableName("SJZT_MD.\"att_wy_cd_base\"") +@IgnoreAutoMapperAndDao public class AttWyCdBase { /** * 测点编码 diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/DsmSpgSppr.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/DsmSpgSppr.java index 804f36a..5e9a633 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/DsmSpgSppr.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/DsmSpgSppr.java @@ -2,6 +2,7 @@ package com.gunshi.project.hsz.datasync.entity.jcsk; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.gunshi.db.annotation.IgnoreAutoMapperAndDao; import com.gunshi.project.hsz.common.model.JcskSyR; import lombok.Data; @@ -17,6 +18,7 @@ import java.time.LocalDateTime; */ @Data @TableName("SJZT_ODS.\"dsm_spg_sppr\"") +@IgnoreAutoMapperAndDao public class DsmSpgSppr { /** * 水库代码 diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/DsmSpgSpprmp.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/DsmSpgSpprmp.java index 816a55c..e69d5f5 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/DsmSpgSpprmp.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/DsmSpgSpprmp.java @@ -2,6 +2,7 @@ package com.gunshi.project.hsz.datasync.entity.jcsk; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.gunshi.db.annotation.IgnoreAutoMapperAndDao; import com.gunshi.project.hsz.common.model.JcskSyB; import lombok.Data; @@ -18,6 +19,7 @@ import java.time.LocalDateTime; */ @Data @TableName("SJZT_ODS.\"dsm_spg_spprmp\"") +@IgnoreAutoMapperAndDao public class DsmSpgSpprmp { /** * 水库代码 diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/DsmSpgSpqn.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/DsmSpgSpqn.java index cbc9e6d..752df73 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/DsmSpgSpqn.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/DsmSpgSpqn.java @@ -2,6 +2,7 @@ package com.gunshi.project.hsz.datasync.entity.jcsk; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.gunshi.db.annotation.IgnoreAutoMapperAndDao; import com.gunshi.project.hsz.common.model.JcskSlR; import lombok.Data; @@ -17,6 +18,7 @@ import java.time.LocalDateTime; */ @Data @TableName("SJZT_ODS.\"dsm_spg_spqn\"") +@IgnoreAutoMapperAndDao public class DsmSpgSpqn { /** * 水库代码 diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/DsmSpgSpqnmp.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/DsmSpgSpqnmp.java index 89bed3b..bea3ac9 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/DsmSpgSpqnmp.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/DsmSpgSpqnmp.java @@ -2,6 +2,7 @@ package com.gunshi.project.hsz.datasync.entity.jcsk; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.gunshi.db.annotation.IgnoreAutoMapperAndDao; import com.gunshi.project.hsz.common.model.JcskSlB; import lombok.Data; @@ -18,6 +19,7 @@ import java.time.LocalDateTime; */ @Data @TableName("SJZT_ODS.\"dsm_spg_spqnmp\"") +@IgnoreAutoMapperAndDao public class DsmSpgSpqnmp { /** * 水库代码 diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/WaterDataTermites.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/WaterDataTermites.java deleted file mode 100644 index 854b224..0000000 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/WaterDataTermites.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.gunshi.project.hsz.datasync.entity.jcsk; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.gunshi.project.hsz.common.model.JcskByR; -import lombok.Data; - -import java.time.LocalDateTime; - -/** - * 白蚁数据表(数据源表) - * 对应数据库表：SJZT_ODS.water_data_termites - * 数据来源：该表数据同步至jcsk_by_r表 - * @see WaterDevice - * @see JcskByR - */ -@Data -@TableName("SJZT_ODS.\"water_data_termites\"") -public class WaterDataTermites { - /** - * 设备编码 - */ - @TableField("\"mn_no\"") - private String mnNo; - - /** - * 白蚁蚁情状态,有白蚁入侵为1 - */ - @TableField("\"status\"") - private Integer status; - - /** - * 白蚁设备电量 - */ - @TableField("\"electricity\"") - private Integer electricity; - - /** - * 白蚁设备安装的点位顺序 - */ - @TableField("\"order\"") - private String order; - - /** - * 创建时间 - */ - @TableField("\"created_at\"") - private LocalDateTime createdAt; - - /** - * 观测时间 - */ - @TableField("\"ob_time\"") - private String obTime; - - /** - * 观测时间2 - */ - @TableField("\"ob_date\"") - private LocalDateTime obDate; - - /** - * 主键id - */ - @TableId("\"id\"") - private Integer id; - - /** - * 水库id - */ - @TableField("\"station_id\"") - private Integer stationId; - - /** - * 站点名称 - */ - @TableField("\"station_name\"") - private String stationName; - - /** - * 设备id - */ - @TableField("\"device_id\"") - private Integer deviceId; - - /** - * 设备名称 - */ - @TableField("\"device_name\"") - private String deviceName; - - /** - * 任务状态 - */ - @TableField("\"task_status\"") - private String taskStatus; - - /** - * 任务id - */ - @TableField("\"task_id\"") - private String taskId; - - /** - * 接收类型 - */ - @TableField("\"receive_type\"") - private Short receiveType; -} \ No newline at end of file diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/WaterDevice.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/WaterDevice.java deleted file mode 100644 index 3f695b4..0000000 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/WaterDevice.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.gunshi.project.hsz.datasync.entity.jcsk; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.gunshi.project.hsz.common.model.JcskByB; -import lombok.Data; - -import java.math.BigDecimal; - -/** - * 白蚁设备表(数据源表) - * 对应数据库表：SJZT_ODS.water_device - * 数据来源：该表数据同步至jcsk_by_b表 - * @see JcskByB - * @see WaterDataTermites - */ -@Data -@TableName("SJZT_ODS.\"water_device\"") -public class WaterDevice { - /** - * 主键 - */ - @TableField("\"id\"") - private Integer id; - - /** - * 设备名称 - */ - @TableField("\"name\"") - private String name; - - /** - * 设备编码 - */ - @TableField("\"code\"") - private String code; - - /** - * 站点接入编码 - */ - @TableField("\"mn_no\"") - private String mnNo; - - /** - * 厂家id - */ - @TableField("\"factory_id\"") - private Integer factoryId; - - /** - * 服务站点id - */ - @TableField("\"station_id\"") - private Integer stationId; - - /** - * 服务站点名称 - */ - @TableField("\"station_name\"") - private String stationName; - - /** - * 创建时间 - */ - @TableField("\"created_at\"") - private Integer createdAt; - - /** - * 创建人id - */ - @TableField("\"created_user\"") - private Integer createdUser; - - /** - * 修改时间 - */ - @TableField("\"updated_at\"") - private Integer updatedAt; - - /** - * 修改人id - */ - @TableField("\"updated_user\"") - private Integer updatedUser; - - /** - * 状态 - */ - @TableField("\"status\"") - private Integer status; - - /** - * 纬度 - */ - @TableField("\"lat\"") - private BigDecimal lat; - - /** - * 经度 - */ - @TableField("\"lon\"") - private BigDecimal lon; - - /** - * 省份id - */ - @TableField("\"province_id\"") - private Long provinceId; - - /** - * 省份名称 - */ - @TableField("\"province_name\"") - private String provinceName; - - /** - * 城市id - */ - @TableField("\"city_id\"") - private Long cityId; - - /** - * 城市名称 - */ - @TableField("\"city_name\"") - private String cityName; - - /** - * 区域名称 - */ - @TableField("\"area_name\"") - private String areaName; - - /** - * 区域id - */ - @TableField("\"area_id\"") - private Long areaId; - - /** - * 设备类型 - */ - @TableField("\"type\"") - private Integer type; - - /** - * 设备类型详情 - */ - @TableField("\"send_type\"") - private String sendType; - - /** - * 联系人 - */ - @TableField("\"contact\"") - private String contact; - - /** - * 联系电话 - */ - @TableField("\"telephone\"") - private String telephone; - - /** - * 流域 - */ - @TableField("\"river\"") - private String river; - - /** - * 安装地点 - */ - @TableField("\"address\"") - private String address; - - /** - * 产品型号 - */ - @TableField("\"model\"") - private String model; - - /** - * 备注 - */ - @TableField("\"remark\"") - private String remark; - - /** - * 通信方式 - */ - @TableField("\"communication_type\"") - private Integer communicationType; - - /** - * 设备图片 - */ - @TableField("\"image_url\"") - private String imageUrl; - - /** - * 设备视频流地址的ip - */ - @TableField("\"video_ip\"") - private String videoIp; - - /** - * 设备视频id - */ - @TableField("\"video_id\"") - private String videoId; -} \ No newline at end of file diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/service/impl/SyncFlowRService.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/flow/SyncFlowService.java similarity index 88% rename from service-datasync/src/main/java/com/gunshi/project/hsz/datasync/service/impl/SyncFlowRService.java rename to service-datasync/src/main/java/com/gunshi/project/hsz/datasync/flow/SyncFlowService.java index b41794b..70cfd30 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/service/impl/SyncFlowRService.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/flow/SyncFlowService.java @@ -1,12 +1,12 @@ -package com.gunshi.project.hsz.datasync.service.impl; +package com.gunshi.project.hsz.datasync.flow; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.gunshi.project.hsz.common.mapper.StFlowRMapper; import com.gunshi.project.hsz.common.model.StFlowR; import com.gunshi.project.hsz.common.model.StStbprpBElem; -import com.gunshi.project.hsz.datasync.entity.jcsk.JcskStFlowR; -import com.gunshi.project.hsz.datasync.mapper.StFlowRMapper; -import com.gunshi.project.hsz.datasync.mapper.StbprpElemMapper; -import com.gunshi.project.hsz.datasync.mapper.jcsk.JcskStFlowRMapper; +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 lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -24,7 +24,7 @@ import java.util.List; */ @Slf4j @Service -public class SyncFlowRService implements SyncTableRService { +public class SyncFlowService implements SyncTableRService { @Autowired private JcskStFlowRMapper jcskStFlowRMapper; @@ -32,7 +32,7 @@ public class SyncFlowRService implements SyncTableRService private StFlowRMapper stFlowRMapper; @Autowired - private StbprpElemMapper stbprpMapper; + private StStbprpBElemMapper stbprpMapper; @Scheduled(cron = "0 */15 * * * ?") @Override diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/JcskStFlowR.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/flow/datasource/JcskStFlowR.java similarity index 88% rename from service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/JcskStFlowR.java rename to service-datasync/src/main/java/com/gunshi/project/hsz/datasync/flow/datasource/JcskStFlowR.java index 342a273..7971373 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/entity/jcsk/JcskStFlowR.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/flow/datasource/JcskStFlowR.java @@ -1,9 +1,10 @@ -package com.gunshi.project.hsz.datasync.entity.jcsk; +package com.gunshi.project.hsz.datasync.flow.datasource; 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 com.gunshi.db.annotation.IgnoreAutoMapperAndDao; import lombok.Data; import java.math.BigDecimal; @@ -15,6 +16,7 @@ import java.time.LocalDateTime; */ @Data @TableName("SJZT_ODS.\"st_flow_r\"") +@IgnoreAutoMapperAndDao public class JcskStFlowR { /** diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/JcskStFlowRMapper.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/flow/datasource/JcskStFlowRMapper.java similarity index 71% rename from service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/JcskStFlowRMapper.java rename to service-datasync/src/main/java/com/gunshi/project/hsz/datasync/flow/datasource/JcskStFlowRMapper.java index a7f042f..55c8a40 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/jcsk/JcskStFlowRMapper.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/flow/datasource/JcskStFlowRMapper.java @@ -1,8 +1,7 @@ -package com.gunshi.project.hsz.datasync.mapper.jcsk; +package com.gunshi.project.hsz.datasync.flow.datasource; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gunshi.project.hsz.datasync.entity.jcsk.JcskStFlowR; import org.apache.ibatis.annotations.Mapper; /** diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/gate/GateOpeningHeight.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/gate/GateOpeningHeight.java deleted file mode 100644 index 8d65ecc..0000000 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/gate/GateOpeningHeight.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.gunshi.project.hsz.datasync.gate; - -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; - -/** - * @author lyf - * @since 2025-10-20 - */ -@Data -@TableName("st_gate_r") -public class GateOpeningHeight { - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - @TableField(value="stcd") - private String stcd; - - @TableField(value="gtop") - private BigDecimal gtop; - - @TableField(value="tm") - private LocalDateTime tm; - - @TableField(value="recv_tm") - private LocalDateTime recvTm; -} diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/gate/GateOpeningHeightMapper.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/gate/GateOpeningHeightMapper.java deleted file mode 100644 index c368316..0000000 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/gate/GateOpeningHeightMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.gunshi.project.hsz.datasync.gate; - -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 GateOpeningHeightMapper extends BaseMapper { -} diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/gate/GateOpeningHeightService.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/gate/GateOpeningHeightService.java deleted file mode 100644 index 4ecf5f6..0000000 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/gate/GateOpeningHeightService.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.gunshi.project.hsz.datasync.gate; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.time.LocalDateTime; - -/** - * @author lyf - * @since 2025-10-20 - */ -@Service -public class GateOpeningHeightService { - - @Autowired - private GateOpeningHeightMapper targetMapper; - - @Scheduled(cron = "0 */5 * * * ?") - public int syncData() { - LocalDateTime tm = LocalDateTime.now(); - //抹去分和秒 - tm = tm.withMinute(0).withSecond(0).withNano(0); - GateOpeningHeight target = new GateOpeningHeight(); - BigDecimal height; - GateOpeningHeight exist; - - target.setStcd("30111"); - target.setTm(tm); - height = BigDecimal.valueOf(Math.random() * 10).setScale(0, RoundingMode.HALF_UP); - target.setGtop(height); - target.setRecvTm(tm); - exist = targetMapper.selectOne( - new LambdaQueryWrapper() - .eq(GateOpeningHeight::getStcd, target.getStcd()) - .eq(GateOpeningHeight::getTm, target.getTm()) - ); - if (exist == null) { - targetMapper.insert(target); - } - - target.setStcd("30222"); - target.setTm(tm); - height = BigDecimal.valueOf(Math.random() * 10).setScale(0, RoundingMode.HALF_UP); - target.setGtop(height); - target.setRecvTm(tm); - exist = targetMapper.selectOne( - new LambdaQueryWrapper() - .eq(GateOpeningHeight::getStcd, target.getStcd()) - .eq(GateOpeningHeight::getTm, target.getTm()) - ); - if (exist == null) { - targetMapper.insert(target); - } - - return 0; - } - -} diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/StFlowRMapper.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/StFlowRMapper.java deleted file mode 100644 index e325534..0000000 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/StFlowRMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.gunshi.project.hsz.datasync.mapper; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gunshi.project.hsz.common.model.StFlowR; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author lyf - * @since 2025-10-16 - */ -@DS("tsg") -@Mapper -public interface StFlowRMapper extends BaseMapper { -} diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/StbprpElemMapper.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/StbprpElemMapper.java deleted file mode 100644 index 9c5d1b1..0000000 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/mapper/StbprpElemMapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.gunshi.project.hsz.datasync.mapper; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.gunshi.project.hsz.common.model.StStbprpBElem; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - -/** - * @author lyf - * @since 2025-10-16 - */ -@DS("tsg") -@Mapper -public interface StbprpElemMapper { - - @Select(""" - - """) - List selectByElem(@Param("elem") String elem); -} diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/Rainfall.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/Rainfall.java deleted file mode 100644 index bbe46d4..0000000 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/Rainfall.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gunshi.project.hsz.datasync.rainfall; - -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_pptn_r") -public class Rainfall { - /** - * 测站编码 - */ - @TableField("stcd") - private String stcd; - - /** - * 时段降水量 - */ - @TableField("drp") - private BigDecimal drp; - - /** - * 时间 - */ - @TableField("tm") - private LocalDateTime tm; - - /** - * 时段长 - */ - @TableField("intv") - private BigDecimal intv; - - /** - * 天气状况 - */ - @TableField("wth") - private String wth; - -} diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/RainfallMapper.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/RainfallMapper.java deleted file mode 100644 index 7638cfd..0000000 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/RainfallMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.gunshi.project.hsz.datasync.rainfall; - -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 RainfallMapper extends BaseMapper { -} diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/RainfallReal.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/RainfallReal.java deleted file mode 100644 index 5c2b870..0000000 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/RainfallReal.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.gunshi.project.hsz.datasync.rainfall; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -/** - * @author lyf - * @since 2025-10-20 - */ -@Data -@TableName("st_pptn_r_real") -public class RainfallReal { -} diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/RainfallRealMapper.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/RainfallRealMapper.java deleted file mode 100644 index 7e08270..0000000 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/RainfallRealMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.gunshi.project.hsz.datasync.rainfall; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -/** - * @author lyf - * @since 2025-10-20 - */ -@DS("tsg") -@Mapper -public interface RainfallRealMapper extends BaseMapper { - int updateReal(@Param("stcd") String stcd); -} diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/RainfallService.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/SyncRainfallService.java similarity index 68% rename from service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/RainfallService.java rename to service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/SyncRainfallService.java index ded9017..f7c4454 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/RainfallService.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/SyncRainfallService.java @@ -1,8 +1,11 @@ package com.gunshi.project.hsz.datasync.rainfall; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.gunshi.project.hsz.common.mapper.StPptnRMapper; +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.datasync.mapper.StbprpElemMapper; 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; @@ -20,18 +23,18 @@ import java.util.List; * @since 2025-10-20 */ @Service -public class RainfallService implements SyncTableRService { +public class SyncRainfallService implements SyncTableRService { @Autowired private JcskStPptnRMapper sourceMapper; @Autowired - private RainfallRealMapper targetRealMapper; + private StPptnRRealMapper targetRealMapper; @Autowired - private RainfallMapper targetMapper; + private StPptnRMapper targetMapper; @Autowired - private StbprpElemMapper stbprpMapper; + private StStbprpBElemMapper stbprpMapper; @Scheduled(cron = "0 */5 * * * ?") @Override @@ -41,10 +44,10 @@ public class RainfallService implements SyncTableRService int cnt = 0; for (StStbprpBElem StStbprpBElem : stbprps) { - Rainfall targetParams = new Rainfall(); + StPptnR targetParams = new StPptnR(); targetParams.setStcd(StStbprpBElem.getStcd()); - Rainfall latestTarget = getLatestTargetEntity(targetParams); + StPptnR latestTarget = getLatestTargetEntity(targetParams); List sourceEntityList = getSourceEntityListByLatestTargetEntity(latestTarget); cnt += saveToTarget(sourceEntityList); } @@ -53,18 +56,18 @@ public class RainfallService implements SyncTableRService @NonNull @Override - public Rainfall getLatestTargetEntity(Rainfall targetParams) { + public StPptnR getLatestTargetEntity(StPptnR targetParams) { String stcd = targetParams.getStcd(); - Rainfall target = targetMapper.selectOne( - new LambdaQueryWrapper() - .eq(Rainfall::getStcd, stcd) - .orderByDesc(Rainfall::getTm) + StPptnR target = targetMapper.selectOne( + new LambdaQueryWrapper() + .eq(StPptnR::getStcd, stcd) + .orderByDesc(StPptnR::getTm) .last("limit 1") ); if (target == null) { - target = new Rainfall(); + target = new StPptnR(); target.setStcd(stcd); target.setTm(LocalDateTime.of(2025, 10, 20, 15, 0, 0)); } @@ -73,7 +76,7 @@ public class RainfallService implements SyncTableRService } @Override - public List getSourceEntityListByLatestTargetEntity(@NonNull Rainfall targetEntity) { + public List getSourceEntityListByLatestTargetEntity(@NonNull StPptnR targetEntity) { String stcd = targetEntity.getStcd(); LocalDateTime tm = targetEntity.getTm(); return sourceMapper.selectList( @@ -89,14 +92,14 @@ public class RainfallService implements SyncTableRService for (JcskStPptnR sourceEntity : sourceEntityList) { String stcd = sourceEntity.getStcd(); LocalDateTime tm = sourceEntity.getTm(); - Rainfall existingTarget = targetMapper.selectOne( - new LambdaQueryWrapper() - .eq(Rainfall::getStcd, stcd) - .eq(Rainfall::getTm, tm) + StPptnR existingTarget = targetMapper.selectOne( + new LambdaQueryWrapper() + .eq(StPptnR::getStcd, stcd) + .eq(StPptnR::getTm, tm) ); if (existingTarget == null) { - Rainfall targetEntity = new Rainfall(); + StPptnR targetEntity = new StPptnR(); BeanUtils.copyProperties(sourceEntity, targetEntity); targetMapper.insert(targetEntity); } @@ -106,7 +109,7 @@ public class RainfallService implements SyncTableRService if (!sourceEntityList.isEmpty()) { JcskStPptnR sourceEntity = sourceEntityList.getFirst(); String stcd = sourceEntity.getStcd(); - targetRealMapper.updateReal(stcd); + targetRealMapper.updatePptnRReal(stcd); } return count; } diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/datasource/JcskStPptnR.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/datasource/JcskStPptnR.java index 74c0e37..3023a67 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/datasource/JcskStPptnR.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/rainfall/datasource/JcskStPptnR.java @@ -2,6 +2,7 @@ package com.gunshi.project.hsz.datasync.rainfall.datasource; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.gunshi.db.annotation.IgnoreAutoMapperAndDao; import lombok.Data; import java.math.BigDecimal; @@ -13,6 +14,7 @@ import java.time.LocalDateTime; */ @Data @TableName("SJZT_MD.\"st_pptn_r\"") +@IgnoreAutoMapperAndDao public class JcskStPptnR { /** * 测站编码 diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/riverWaterLevel/RiverWaterLevelService.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/riverWaterLevel/SyncRiverWaterLevelService.java similarity index 95% rename from service-datasync/src/main/java/com/gunshi/project/hsz/datasync/riverWaterLevel/RiverWaterLevelService.java rename to service-datasync/src/main/java/com/gunshi/project/hsz/datasync/riverWaterLevel/SyncRiverWaterLevelService.java index 7324f40..189391c 100644 --- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/riverWaterLevel/RiverWaterLevelService.java +++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/riverWaterLevel/SyncRiverWaterLevelService.java @@ -2,7 +2,7 @@ package com.gunshi.project.hsz.datasync.riverWaterLevel; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.gunshi.project.hsz.common.model.StStbprpBElem; -import com.gunshi.project.hsz.datasync.mapper.StbprpElemMapper; +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; @@ -21,7 +21,7 @@ import java.util.List; * 荆楚水库的河道水位和水库水位共用一张表 */ @Service -public class RiverWaterLevelService implements SyncTableRService { +public class SyncRiverWaterLevelService implements SyncTableRService { @Autowired private JcskStRsvrRMapper sourceMapper; @@ -32,7 +32,7 @@ public class RiverWaterLevelService implements SyncTableRService { +public class SyncRsvrWaterLevelService implements SyncTableRService { @Autowired private JcskStRsvrRMapper sourceMapper; @@ -31,7 +31,7 @@ public class RsvrWaterLevelService implements SyncTableRService { - - @Autowired - private WaterDataTermitesMapper sourceMapper; - - @Autowired - private JcskByBMapper targetBMapper; - - @Autowired - private JcskByRMapper targetMapper; - - @Override - public int syncData() { - List targetBList = targetBMapper.selectList(null); - - int cnt = 0; - for (JcskByB targetB : targetBList) { - JcskByR targetParams = new JcskByR(); - targetParams.setDeviceId(targetB.getId()); - - JcskByR latestTarget = getLatestTargetEntity(targetParams); - List sourceEntityList = getSourceEntityListByLatestTargetEntity(latestTarget); - cnt += saveToTarget(sourceEntityList); - } - return cnt; - } - - @NonNull - @Override - public JcskByR getLatestTargetEntity(JcskByR targetParams) { - Integer deviceId = targetParams.getDeviceId(); - - JcskByR target = targetMapper.selectOne( - new LambdaQueryWrapper() - .eq(JcskByR::getDeviceId, deviceId) - .orderByDesc(JcskByR::getObDate) - .last("limit 1") - ); - - if (target == null) { - target = new JcskByR(); - target.setDeviceId(deviceId); - //数据源最早的数据时间 - target.setObDate(LocalDateTime.of(2025, 8, 22, 10, 15, 0)); - } - - return target; - } - - @Override - public List getSourceEntityListByLatestTargetEntity(@NonNull JcskByR targetEntity) { - Integer deviceId = targetEntity.getDeviceId(); - LocalDateTime stm = targetEntity.getObDate(); - LocalDateTime etm = calculateEtm(stm); - return sourceMapper.selectList( - new LambdaQueryWrapper() - .gt(WaterDataTermites::getObDate, stm) - .le(WaterDataTermites::getObDate, etm) - .eq(WaterDataTermites::getDeviceId, deviceId) - .ne(WaterDataTermites::getOrder, "000000") - ); - } - - @Override - public int saveToTarget(List sourceEntityList) { - int count = 0; - for (WaterDataTermites sourceEntity : sourceEntityList) { - Integer deviceId = sourceEntity.getId(); - LocalDateTime tm = sourceEntity.getObDate(); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(JcskByR::getDeviceId, deviceId) - .eq(JcskByR::getObDate, tm) - .last("limit 1"); - JcskByR existingTarget = targetMapper.selectOne(queryWrapper); - - if (existingTarget == null) { - JcskByR targetEntity = new JcskByR(); - BeanUtils.copyProperties(sourceEntity, targetEntity); - targetMapper.insert(targetEntity); - } - count++; - } - return count; - } -} diff --git a/src/main/java/com/gunshi/project/hsz/controller/RainBasinDivisionController.java b/src/main/java/com/gunshi/project/hsz/controller/RainBasinDivisionController.java index 1d20a8c..f426a2f 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/RainBasinDivisionController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/RainBasinDivisionController.java @@ -7,7 +7,7 @@ import com.gunshi.project.hsz.entity.so.StPptnSo; import com.gunshi.project.hsz.entity.vo.CartogramVo; import com.gunshi.project.hsz.entity.vo.StPptnDetailsVo; import com.gunshi.project.hsz.entity.vo.StPptnVo; -import com.gunshi.project.hsz.model.StPptnRReal; +import com.gunshi.project.hsz.common.model.StPptnRReal; import com.gunshi.project.hsz.service.RainBasinDivisionService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; 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 e5f9718..f1001e3 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/ReservoirWaterController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/ReservoirWaterController.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.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/StPptnRController.java b/src/main/java/com/gunshi/project/hsz/controller/StPptnRController.java index 38bea51..4830a32 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/StPptnRController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/StPptnRController.java @@ -1,7 +1,7 @@ package com.gunshi.project.hsz.controller; import com.gunshi.core.result.R; -import com.gunshi.project.hsz.model.StPptnR; +import com.gunshi.project.hsz.common.model.StPptnR; import com.gunshi.project.hsz.service.StPptnRService; 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/StPptnRRealController.java b/src/main/java/com/gunshi/project/hsz/controller/StPptnRRealController.java index 1ee7be7..ae0d019 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/StPptnRRealController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/StPptnRRealController.java @@ -1,7 +1,7 @@ package com.gunshi.project.hsz.controller; import com.gunshi.core.result.R; -import com.gunshi.project.hsz.model.StPptnRReal; +import com.gunshi.project.hsz.common.model.StPptnRReal; import com.gunshi.project.hsz.service.StPptnRRealService; 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/AttRiverNowDataVo.java b/src/main/java/com/gunshi/project/hsz/entity/vo/AttRiverNowDataVo.java index f6dd051..8ab3b1f 100644 --- a/src/main/java/com/gunshi/project/hsz/entity/vo/AttRiverNowDataVo.java +++ b/src/main/java/com/gunshi/project/hsz/entity/vo/AttRiverNowDataVo.java @@ -1,7 +1,7 @@ package com.gunshi.project.hsz.entity.vo; -import com.gunshi.project.hsz.model.StPptnRReal; +import com.gunshi.project.hsz.common.model.StPptnRReal; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/StPptnDetailsVo.java b/src/main/java/com/gunshi/project/hsz/entity/vo/StPptnDetailsVo.java index e4cb294..6c0ee47 100644 --- a/src/main/java/com/gunshi/project/hsz/entity/vo/StPptnDetailsVo.java +++ b/src/main/java/com/gunshi/project/hsz/entity/vo/StPptnDetailsVo.java @@ -2,7 +2,7 @@ package com.gunshi.project.hsz.entity.vo; import com.fasterxml.jackson.annotation.JsonFormat; import com.gunshi.core.dateformat.DateFormatString; -import com.gunshi.project.hsz.model.StPptnRReal; +import com.gunshi.project.hsz.common.model.StPptnRReal; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/gunshi/project/hsz/mapper/RealRainMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/RealRainMapper.java index f2fcf66..8e49750 100644 --- a/src/main/java/com/gunshi/project/hsz/mapper/RealRainMapper.java +++ b/src/main/java/com/gunshi/project/hsz/mapper/RealRainMapper.java @@ -4,7 +4,7 @@ import com.gunshi.project.hsz.entity.vo.ForeRainVo; import com.gunshi.project.hsz.entity.vo.RealRainListVo; import com.gunshi.project.hsz.entity.vo.StPptnVo; import com.gunshi.project.hsz.model.StPptnRD; -import com.gunshi.project.hsz.model.StPptnRReal; +import com.gunshi.project.hsz.common.model.StPptnRReal; 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/StPptnRAverage.java b/src/main/java/com/gunshi/project/hsz/model/StPptnRAverage.java index f58202b..5b8c08d 100644 --- a/src/main/java/com/gunshi/project/hsz/model/StPptnRAverage.java +++ b/src/main/java/com/gunshi/project/hsz/model/StPptnRAverage.java @@ -3,33 +3,34 @@ package com.gunshi.project.hsz.model; import com.fasterxml.jackson.annotation.JsonFormat; import com.gunshi.core.dateformat.DateFormatString; +import com.gunshi.project.hsz.common.model.StPptnR; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.Date; /** -* 描述: 降水量表-面雨量 -*/ + * 描述: 降水量表-面雨量 + */ @Data public class StPptnRAverage extends StPptnR { - /** - * 时段降水量 - */ - @Schema(description="时段降水量") - private String drp; + /** + * 时段降水量 + */ + @Schema(description = "时段降水量") + private String drp; - /** - * 时间 - */ - @Schema(description="时间") - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") - private Date tm; + /** + * 时间 + */ + @Schema(description = "时间") + @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") + private Date tm; - public StPptnRAverage(Date tm, String drp) { - this.tm = tm; - this.drp = drp; - } + public StPptnRAverage(Date tm, String drp) { + this.tm = tm; + this.drp = drp; + } } 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 68cd743..9af78ff 100644 --- a/src/main/java/com/gunshi/project/hsz/service/ForecastResultsService.java +++ b/src/main/java/com/gunshi/project/hsz/service/ForecastResultsService.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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.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/RainBasinDivisionService.java b/src/main/java/com/gunshi/project/hsz/service/RainBasinDivisionService.java index 460e4b9..58e2977 100644 --- a/src/main/java/com/gunshi/project/hsz/service/RainBasinDivisionService.java +++ b/src/main/java/com/gunshi/project/hsz/service/RainBasinDivisionService.java @@ -6,9 +6,9 @@ import com.gunshi.project.hsz.entity.vo.CartogramVo; import com.gunshi.project.hsz.entity.vo.StPptnDetailsVo; import com.gunshi.project.hsz.entity.vo.StPptnVo; import com.gunshi.project.hsz.mapper.RealRainMapper; -import com.gunshi.project.hsz.mapper.StPptnRMapper; +import com.gunshi.project.hsz.common.mapper.StPptnRMapper; import com.gunshi.project.hsz.model.StPptnRD; -import com.gunshi.project.hsz.model.StPptnRReal; +import com.gunshi.project.hsz.common.model.StPptnRReal; import jakarta.annotation.Resource; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/gunshi/project/hsz/service/ResBriefRService.java b/src/main/java/com/gunshi/project/hsz/service/ResBriefRService.java index 6a7e338..56514a4 100644 --- a/src/main/java/com/gunshi/project/hsz/service/ResBriefRService.java +++ b/src/main/java/com/gunshi/project/hsz/service/ResBriefRService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.gunshi.project.hsz.entity.vo.ResBriefVo; import com.gunshi.project.hsz.model.AttResBase; import com.gunshi.project.hsz.model.ResBriefR; -import com.gunshi.project.hsz.model.StPptnR; +import com.gunshi.project.hsz.common.model.StPptnR; import com.gunshi.project.hsz.common.model.StStbprpB; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; 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 e5b546f..e0e59b1 100644 --- a/src/main/java/com/gunshi/project/hsz/service/RiverWaterService.java +++ b/src/main/java/com/gunshi/project/hsz/service/RiverWaterService.java @@ -3,6 +3,7 @@ package com.gunshi.project.hsz.service; 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.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/StPptnRRealService.java b/src/main/java/com/gunshi/project/hsz/service/StPptnRRealService.java index a007310..2195ca8 100644 --- a/src/main/java/com/gunshi/project/hsz/service/StPptnRRealService.java +++ b/src/main/java/com/gunshi/project/hsz/service/StPptnRRealService.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.StPptnRRealMapper; -import com.gunshi.project.hsz.model.StPptnRReal; +import com.gunshi.project.hsz.common.mapper.StPptnRRealMapper; +import com.gunshi.project.hsz.common.model.StPptnRReal; 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/StPptnRService.java b/src/main/java/com/gunshi/project/hsz/service/StPptnRService.java index 159c9f0..7cc54e2 100644 --- a/src/main/java/com/gunshi/project/hsz/service/StPptnRService.java +++ b/src/main/java/com/gunshi/project/hsz/service/StPptnRService.java @@ -8,8 +8,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.StPptnRMapper; -import com.gunshi.project.hsz.model.StPptnR; +import com.gunshi.project.hsz.common.mapper.StPptnRMapper; +import com.gunshi.project.hsz.common.model.StPptnR; import lombok.extern.slf4j.Slf4j; 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 ca6da9e..7863eec 100644 --- a/src/main/java/com/gunshi/project/hsz/timetask/DataTaskHsz.java +++ b/src/main/java/com/gunshi/project/hsz/timetask/DataTaskHsz.java @@ -6,6 +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.model.*; import com.gunshi.project.hsz.service.*; import com.gunshi.project.hsz.util.OkHttpUtil; @@ -14,7 +15,6 @@ import okhttp3.FormBody; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import org.checkerframework.checker.units.qual.A; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -28,10 +28,6 @@ import java.io.IOException; import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.time.Instant; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.format.DateTimeFormatter; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.function.Function; diff --git a/src/main/java/com/gunshi/project/hsz/timetask/PaDataTask.java b/src/main/java/com/gunshi/project/hsz/timetask/PaDataTask.java index 5dee3a6..9174402 100644 --- a/src/main/java/com/gunshi/project/hsz/timetask/PaDataTask.java +++ b/src/main/java/com/gunshi/project/hsz/timetask/PaDataTask.java @@ -8,7 +8,7 @@ import com.gunshi.project.hsz.model.AttResBase; import com.gunshi.project.hsz.model.ForecastK; import com.gunshi.project.hsz.model.ForecastPa; import com.gunshi.project.hsz.model.ForecastUseparam; -import com.gunshi.project.hsz.model.StPptnR; +import com.gunshi.project.hsz.common.model.StPptnR; import com.gunshi.project.hsz.common.model.StStbprpB; import com.gunshi.project.hsz.service.AttResBaseService; import com.gunshi.project.hsz.service.ForecastKService; diff --git a/src/main/java/com/gunshi/project/hsz/timetask/PptnRDataTask.java b/src/main/java/com/gunshi/project/hsz/timetask/PptnRDataTask.java index 842496c..6ae6892 100644 --- a/src/main/java/com/gunshi/project/hsz/timetask/PptnRDataTask.java +++ b/src/main/java/com/gunshi/project/hsz/timetask/PptnRDataTask.java @@ -4,7 +4,7 @@ package com.gunshi.project.hsz.timetask; 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.gunshi.project.hsz.model.StPptnR; +import com.gunshi.project.hsz.common.model.StPptnR; import com.gunshi.project.hsz.model.StPptnRD; import com.gunshi.project.hsz.model.StPptnRH; import com.gunshi.project.hsz.service.StPptnRDService;