From 1829fd77f70aee69ba2aaecadf4fe0df830fe860 Mon Sep 17 00:00:00 2001 From: hanrenchun Date: Thu, 14 Dec 2023 17:27:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=A4=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/JcjCjxxViewOracle.java | 1 - .../domain/JcjJjxxViewMysql.java | 3 +- .../mysqloracletest/domain/MetaAlarmInfo.java | 35 ++- .../domain/MetaHandleAlarmInfo.java | 30 ++- .../domain/TransitUserRecord.java | 207 ++++++++++++++++ .../domain/TransitVehicleRecord.java | 232 ++++++++++++++++++ .../mapper/JcjCjxxViewMysqlMapper.java | 1 - .../mapper/JcjCjxxViewOracleMapper.java | 1 + .../mapper/JcjJjxxViewOracleMapper.java | 2 +- .../mapper/MetaAlarmInfoMapper.java | 2 +- .../mapper/MetaHandleAlarmInfoMapper.java | 2 +- .../mapper/TransitUserRecordMapper.java | 18 ++ .../mapper/TransitVehicleRecordMapper.java | 18 ++ .../service/JcjCjxxViewMysqlService.java | 2 - .../service/JcjJjxxViewMysqlService.java | 2 +- .../service/MetaAlarmInfoService.java | 2 +- .../service/MetaHandleAlarmInfoService.java | 2 +- .../service/TransitUserRecordService.java | 13 + .../service/TransitVehicleRecordService.java | 13 + .../impl/JcjCjxxViewMysqlServiceImpl.java | 1 - .../impl/JcjJjxxViewOracleServiceImpl.java | 3 - .../impl/MetaAlarmInfoServiceImpl.java | 2 +- .../impl/MetaHandleAlarmInfoServiceImpl.java | 2 +- .../impl/TransitUserRecordServiceImpl.java | 26 ++ .../impl/TransitVehicleRecordServiceImpl.java | 26 ++ .../mysqloracletest/task/AlarmInfoTask.java | 21 +- .../ssf/mysqloracletest/task/JcjCjxxTask.java | 4 +- .../ssf/mysqloracletest/task/JcjJjxxTask.java | 4 - .../mapper/TransitUserRecordMapper.xml | 48 ++++ .../mapper/TransitVehicleRecordMapper.xml | 53 ++++ 30 files changed, 735 insertions(+), 41 deletions(-) create mode 100644 src/main/java/com/ssf/mysqloracletest/domain/TransitUserRecord.java create mode 100644 src/main/java/com/ssf/mysqloracletest/domain/TransitVehicleRecord.java create mode 100644 src/main/java/com/ssf/mysqloracletest/mapper/TransitUserRecordMapper.java create mode 100644 src/main/java/com/ssf/mysqloracletest/mapper/TransitVehicleRecordMapper.java create mode 100644 src/main/java/com/ssf/mysqloracletest/service/TransitUserRecordService.java create mode 100644 src/main/java/com/ssf/mysqloracletest/service/TransitVehicleRecordService.java create mode 100644 src/main/java/com/ssf/mysqloracletest/service/impl/TransitUserRecordServiceImpl.java create mode 100644 src/main/java/com/ssf/mysqloracletest/service/impl/TransitVehicleRecordServiceImpl.java create mode 100644 src/main/resources/mapper/TransitUserRecordMapper.xml create mode 100644 src/main/resources/mapper/TransitVehicleRecordMapper.xml diff --git a/src/main/java/com/ssf/mysqloracletest/domain/JcjCjxxViewOracle.java b/src/main/java/com/ssf/mysqloracletest/domain/JcjCjxxViewOracle.java index c51f22a..1a9fb18 100644 --- a/src/main/java/com/ssf/mysqloracletest/domain/JcjCjxxViewOracle.java +++ b/src/main/java/com/ssf/mysqloracletest/domain/JcjCjxxViewOracle.java @@ -1,6 +1,5 @@ package com.ssf.mysqloracletest.domain; -import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.io.Serializable; diff --git a/src/main/java/com/ssf/mysqloracletest/domain/JcjJjxxViewMysql.java b/src/main/java/com/ssf/mysqloracletest/domain/JcjJjxxViewMysql.java index 3078daa..373b11a 100644 --- a/src/main/java/com/ssf/mysqloracletest/domain/JcjJjxxViewMysql.java +++ b/src/main/java/com/ssf/mysqloracletest/domain/JcjJjxxViewMysql.java @@ -3,11 +3,10 @@ package com.ssf.mysqloracletest.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import java.io.Serializable; -import lombok.Data; - /** * @TableName jcj_jjxx_view */ diff --git a/src/main/java/com/ssf/mysqloracletest/domain/MetaAlarmInfo.java b/src/main/java/com/ssf/mysqloracletest/domain/MetaAlarmInfo.java index 0549066..0a6b65c 100644 --- a/src/main/java/com/ssf/mysqloracletest/domain/MetaAlarmInfo.java +++ b/src/main/java/com/ssf/mysqloracletest/domain/MetaAlarmInfo.java @@ -4,10 +4,11 @@ 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.io.Serializable; import java.math.BigDecimal; import java.util.Date; -import lombok.Data; /** * 接警信息表 @@ -22,71 +23,103 @@ public class MetaAlarmInfo implements Serializable { @TableId(type = IdType.AUTO) private Long id; + @TableField(value = "alarm_code") private String alarmCode; /** * 接警人姓名 */ + @TableField(value = "police_receiver_name") private String policeReceiverName; /** * 接警单位 */ + @TableField(value = "alarm_response_unit") private String alarmResponseUnit; /** * 接警时间 */ + @TableField(value = "alarm_response_time") private String alarmResponseTime; /** * 报警内容 */ + @TableField(value = "alarm_response_content") private String alarmResponseContent; /** * 报警类型名称 */ + @TableField(value = "alarm_response_type_name") private String alarmResponseTypeName; /** * 报警人姓名 */ + @TableField(value = "informant_name") private String informantName; /** * 报警人联系方式 */ + @TableField(value = "informant_phone") private String informantPhone; /** * 报警时间 */ + @TableField(value = "informant_time") private String informantTime; /** * 接警事发地址 */ + @TableField(value = "alarm_address") private String alarmAddress; /** * 经度 */ + @TableField(value = "longitude") private BigDecimal longitude; /** * 纬度 */ + @TableField(value = "latitude") private BigDecimal latitude; /** * 创建时间 */ + @TableField(value = "create_time") private Date createTime; + /** + * 创建者 + */ + @TableField(value = "create_by") + private Integer createBy; + + /** + * 更新时间 + */ + @TableField(value = "update_time") + private Date updateTime; + + /** + * 更新者 + */ + @TableField(value = "update_by") + private Integer updateBy; + /** * 0:不活跃,1:活跃 */ + @TableField(value = "is_active") private Integer isActive; // @TableField(exist = false) diff --git a/src/main/java/com/ssf/mysqloracletest/domain/MetaHandleAlarmInfo.java b/src/main/java/com/ssf/mysqloracletest/domain/MetaHandleAlarmInfo.java index 860d5f5..3e4100f 100644 --- a/src/main/java/com/ssf/mysqloracletest/domain/MetaHandleAlarmInfo.java +++ b/src/main/java/com/ssf/mysqloracletest/domain/MetaHandleAlarmInfo.java @@ -4,9 +4,10 @@ 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.io.Serializable; import java.util.Date; -import lombok.Data; /** * 处警信息表 @@ -24,51 +25,78 @@ public class MetaHandleAlarmInfo implements Serializable { /** * 警情编码 */ + @TableField(value = "alarm_code") private String alarmCode; /** * 处警单位名称 */ + @TableField(value = "handle_alarm_unit") private String handleAlarmUnit; /** * 处警时间 */ + @TableField(value = "handle_alarm_time") private String handleAlarmTime; /** * 处警简要警情 */ + @TableField(value = "handle_alarm_content") private String handleAlarmContent; /** * 处警详细地点 */ + @TableField(value = "handle_alarm_address") private String handleAlarmAddress; /** * 处警人姓名 */ + @TableField(value = "handle_alarm_user") private String handleAlarmUser; /** * 处境人姓名和编码 */ + @TableField(value = "handle_alarm_user_code") private String handleAlarmUserCode; /** * 处警结果 */ + @TableField(value = "handle_alarm_result") private String handleAlarmResult; /** * 创建时间 */ + @TableField(value = "create_time") private Date createTime; + /** + * 创建者 + */ + @TableField(value = "create_by") + private Integer createBy; + + /** + * 更新时间 + */ + @TableField(value = "update_time") + private Date updateTime; + + /** + * 更新者 + */ + @TableField(value = "update_by") + private Integer updateBy; /** * 0:不活跃,1:活跃 */ + @TableField(value = "is_active") private Integer isActive; @TableField(exist = false) diff --git a/src/main/java/com/ssf/mysqloracletest/domain/TransitUserRecord.java b/src/main/java/com/ssf/mysqloracletest/domain/TransitUserRecord.java new file mode 100644 index 0000000..2b65ae5 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/domain/TransitUserRecord.java @@ -0,0 +1,207 @@ +package com.ssf.mysqloracletest.domain; + +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 java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 人脸记录表 + * @TableName transit_user_record + */ +@TableName(value ="transit_user_record") +@Data +public class TransitUserRecord implements Serializable { + /** + * 主键 + */ + @TableId(type = IdType.AUTO) + private Long id; + + /** + * 抓拍时间（分区） + */ + @TableId + private Date partitionField; + + /** + * 场所编码 + */ + private String placeCode; + + /** + * 场所名称 + */ + private String placeName; + + /** + * 设备编码 + */ + private String deviceCode; + + /** + * 设备名称 + */ + private String deviceName; + + /** + * 通道国标编码 + */ + private String gbsChannelNo; + + /** + * 安装位置 + */ + private String deviceAddress; + + /** + * 方位 + */ + private Integer orientation; + + /** + * 设备ip + */ + private String deviceIp; + + /** + * 全景图 + */ + private String globalPic; + + /** + * 人脸图 + */ + private String personPic; + + /** + * 人体全景图 + */ + private String bodyGlobalPic; + + /** + * 人体小图 + */ + private String bodyPic; + + /** + * 常口库标准照片 + */ + private String userStandardPic; + + /** + * 人员姓名 + */ + private String userName; + + /** + * 档案编号 + */ + private String dossierCode; + + /** + * 证件号码 + */ + private String idCard; + + /** + * 联系电话 + */ + private String phone; + + /** + * 记录唯一标识 + */ + private String recordId; + + /** + * 人车同拍唯一记录 + */ + private String userVehicleRecordId; + + /** + * 人体关联ID + */ + private String userBodyRecordId; + + /** + * 商汤人脸记录 + */ + private String stUserRecordId; + + /** + * 数据来源唯一ID + */ + private String sourceId; + + /** + * 人脸小图唯一ID + */ + private String personImageId; + + /** + * 人脸大图唯一ID + */ + private String globalImageId; + + /** + * 相似度 + */ + private String similarity; + + /** + * 是否已比对人脸 + */ + private Integer isCompare; + + /** + * 进出方向 + */ + private Integer direction; + + /** + * 抓拍时间 + */ + private Long passTime; + + /** + * 轴系坐标 + */ + private String axis; + + /** + * 数据来源 + */ + private Integer dataSrc; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 创建者 + */ + private Integer createBy; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 更新者 + */ + private Integer updateBy; + + /** + * 0:不活跃,1:活跃 + */ + private Integer isActive; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/ssf/mysqloracletest/domain/TransitVehicleRecord.java b/src/main/java/com/ssf/mysqloracletest/domain/TransitVehicleRecord.java new file mode 100644 index 0000000..3e0ece6 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/domain/TransitVehicleRecord.java @@ -0,0 +1,232 @@ +package com.ssf.mysqloracletest.domain; + +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 java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 车辆记录表 + * @TableName transit_vehicle_record + */ +@TableName(value ="transit_vehicle_record") +@Data +public class TransitVehicleRecord implements Serializable { + /** + * 主键 + */ + @TableId(type = IdType.AUTO) + private Long id; + + /** + * 过车时间（分区） + */ + @TableId + private Date partitionField; + + /** + * 场所编码 + */ + private String placeCode; + + /** + * 场所名称 + */ + private String placeName; + + /** + * 设备编码 + */ + private String deviceCode; + + /** + * 设备名称 + */ + private String deviceName; + + /** + * 通道国标编码 + */ + private String gbsChannelNo; + + /** + * 安装位置 + */ + private String deviceAddress; + + /** + * 方位 + */ + private Integer orientation; + + /** + * 设备ip + */ + private String deviceIp; + + /** + * 车牌号码 + */ + private String plateNo; + + /** + * 全景图 + */ + private String globalPic; + + /** + * 车牌图 + */ + private String platePic; + + /** + * 记录唯一ID + */ + private String recordId; + + /** + * 数据来源唯一ID + */ + private String sourceId; + + /** + * 车牌号小图唯一ID + */ + private String plateImageId; + + /** + * 车辆全景图唯一ID + */ + private String globalImageId; + + /** + * 人车同拍唯一记录 + */ + private String userVehicleRecordId; + + /** + * 车主人脸图 + */ + private String ownerPersonPic; + + /** + * 车主全景图 + */ + private String ownerGlobalPic; + + /** + * 车主姓名 + */ + private String ownerName; + + /** + * 证件号码 + */ + private String idCard; + + /** + * 联系电话 + */ + private String phone; + + /** + * 副驾驶人脸图 + */ + private String copilotPersonPic; + + /** + * 副驾驶全景图 + */ + private String copilotGlobalPic; + + /** + * 副驾驶姓名 + */ + private String copilotOwnerName; + + /** + * 副驾驶证件号码 + */ + private String copilotIdcard; + + /** + * 副驾驶联系电话 + */ + private String copilotPhone; + + /** + * 进出方向 + */ + private Integer direction; + + /** + * 卡口编码 + */ + private String doorwayCode; + + /** + * 车道编码 + */ + private String roadCode; + + /** + * 过车时间 + */ + private Long passTime; + + /** + * 车牌颜色 + */ + private String plateColor; + + /** + * 车身颜色 + */ + private String vehicleColor; + + /** + * 车辆类型 + */ + private String vehicleType; + + /** + * 车辆品牌 + */ + private String vehicleBrand; + + /** + * 数据来源 + */ + private Integer dataSrc; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 创建者 + */ + private Integer createBy; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 更新者 + */ + private Integer updateBy; + + /** + * 0:不活跃,1:活跃 + */ + private Integer isActive; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/JcjCjxxViewMysqlMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/JcjCjxxViewMysqlMapper.java index 458aa29..8ea65a0 100644 --- a/src/main/java/com/ssf/mysqloracletest/mapper/JcjCjxxViewMysqlMapper.java +++ b/src/main/java/com/ssf/mysqloracletest/mapper/JcjCjxxViewMysqlMapper.java @@ -2,7 +2,6 @@ package com.ssf.mysqloracletest.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ssf.mysqloracletest.domain.JcjCjxxViewMysql; -import com.ssf.mysqloracletest.domain.JcjJjxxViewMysql; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/JcjCjxxViewOracleMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/JcjCjxxViewOracleMapper.java index 497e189..bad760a 100644 --- a/src/main/java/com/ssf/mysqloracletest/mapper/JcjCjxxViewOracleMapper.java +++ b/src/main/java/com/ssf/mysqloracletest/mapper/JcjCjxxViewOracleMapper.java @@ -3,6 +3,7 @@ package com.ssf.mysqloracletest.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ssf.mysqloracletest.domain.JcjCjxxViewOracle; import org.apache.ibatis.annotations.Mapper; + import java.util.List; import java.util.Map; diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/JcjJjxxViewOracleMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/JcjJjxxViewOracleMapper.java index 6891ac4..f2cf97a 100644 --- a/src/main/java/com/ssf/mysqloracletest/mapper/JcjJjxxViewOracleMapper.java +++ b/src/main/java/com/ssf/mysqloracletest/mapper/JcjJjxxViewOracleMapper.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Map; @Mapper -public interface JcjJjxxViewOracleMapper extends BaseMapper { +public interface JcjJjxxViewOracleMapper extends BaseMapper { public int countJjxx(); public List getJjxxList(Map map); diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/MetaAlarmInfoMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/MetaAlarmInfoMapper.java index d6a6387..685557e 100644 --- a/src/main/java/com/ssf/mysqloracletest/mapper/MetaAlarmInfoMapper.java +++ b/src/main/java/com/ssf/mysqloracletest/mapper/MetaAlarmInfoMapper.java @@ -1,7 +1,7 @@ package com.ssf.mysqloracletest.mapper; -import com.ssf.mysqloracletest.domain.MetaAlarmInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ssf.mysqloracletest.domain.MetaAlarmInfo; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/MetaHandleAlarmInfoMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/MetaHandleAlarmInfoMapper.java index d35213d..65ac7f5 100644 --- a/src/main/java/com/ssf/mysqloracletest/mapper/MetaHandleAlarmInfoMapper.java +++ b/src/main/java/com/ssf/mysqloracletest/mapper/MetaHandleAlarmInfoMapper.java @@ -1,7 +1,7 @@ package com.ssf.mysqloracletest.mapper; -import com.ssf.mysqloracletest.domain.MetaHandleAlarmInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ssf.mysqloracletest.domain.MetaHandleAlarmInfo; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/TransitUserRecordMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/TransitUserRecordMapper.java new file mode 100644 index 0000000..fa11bd5 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/mapper/TransitUserRecordMapper.java @@ -0,0 +1,18 @@ +package com.ssf.mysqloracletest.mapper; + +import com.ssf.mysqloracletest.domain.TransitUserRecord; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author 28758 +* @description 针对表【transit_user_record(人脸记录表)】的数据库操作Mapper +* @createDate 2023-12-14 16:46:10 +* @Entity com.ssf.mysqloracletest.domain.TransitUserRecord +*/ +public interface TransitUserRecordMapper extends BaseMapper { + +} + + + + diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/TransitVehicleRecordMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/TransitVehicleRecordMapper.java new file mode 100644 index 0000000..6b6c24f --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/mapper/TransitVehicleRecordMapper.java @@ -0,0 +1,18 @@ +package com.ssf.mysqloracletest.mapper; + +import com.ssf.mysqloracletest.domain.TransitVehicleRecord; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author 28758 +* @description 针对表【transit_vehicle_record(车辆记录表)】的数据库操作Mapper +* @createDate 2023-12-14 16:47:49 +* @Entity com.ssf.mysqloracletest.domain.TransitVehicleRecord +*/ +public interface TransitVehicleRecordMapper extends BaseMapper { + +} + + + + diff --git a/src/main/java/com/ssf/mysqloracletest/service/JcjCjxxViewMysqlService.java b/src/main/java/com/ssf/mysqloracletest/service/JcjCjxxViewMysqlService.java index 2f0f096..d74201d 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/JcjCjxxViewMysqlService.java +++ b/src/main/java/com/ssf/mysqloracletest/service/JcjCjxxViewMysqlService.java @@ -2,8 +2,6 @@ package com.ssf.mysqloracletest.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ssf.mysqloracletest.domain.JcjCjxxViewMysql; -import com.ssf.mysqloracletest.domain.JcjCjxxViewMysql; -import com.ssf.mysqloracletest.domain.JcjJjxxViewMysql; /** * @author 28758 diff --git a/src/main/java/com/ssf/mysqloracletest/service/JcjJjxxViewMysqlService.java b/src/main/java/com/ssf/mysqloracletest/service/JcjJjxxViewMysqlService.java index ec2e244..b485a53 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/JcjJjxxViewMysqlService.java +++ b/src/main/java/com/ssf/mysqloracletest/service/JcjJjxxViewMysqlService.java @@ -1,7 +1,7 @@ package com.ssf.mysqloracletest.service; -import com.ssf.mysqloracletest.domain.JcjJjxxViewMysql; import com.baomidou.mybatisplus.extension.service.IService; +import com.ssf.mysqloracletest.domain.JcjJjxxViewMysql; /** * @author 10503 diff --git a/src/main/java/com/ssf/mysqloracletest/service/MetaAlarmInfoService.java b/src/main/java/com/ssf/mysqloracletest/service/MetaAlarmInfoService.java index f80e28f..cb7de64 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/MetaAlarmInfoService.java +++ b/src/main/java/com/ssf/mysqloracletest/service/MetaAlarmInfoService.java @@ -1,7 +1,7 @@ package com.ssf.mysqloracletest.service; -import com.ssf.mysqloracletest.domain.MetaAlarmInfo; import com.baomidou.mybatisplus.extension.service.IService; +import com.ssf.mysqloracletest.domain.MetaAlarmInfo; /** * @author 10503 diff --git a/src/main/java/com/ssf/mysqloracletest/service/MetaHandleAlarmInfoService.java b/src/main/java/com/ssf/mysqloracletest/service/MetaHandleAlarmInfoService.java index f24e401..935dc74 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/MetaHandleAlarmInfoService.java +++ b/src/main/java/com/ssf/mysqloracletest/service/MetaHandleAlarmInfoService.java @@ -1,7 +1,7 @@ package com.ssf.mysqloracletest.service; -import com.ssf.mysqloracletest.domain.MetaHandleAlarmInfo; import com.baomidou.mybatisplus.extension.service.IService; +import com.ssf.mysqloracletest.domain.MetaHandleAlarmInfo; /** * @author 28758 diff --git a/src/main/java/com/ssf/mysqloracletest/service/TransitUserRecordService.java b/src/main/java/com/ssf/mysqloracletest/service/TransitUserRecordService.java new file mode 100644 index 0000000..ba8b350 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/service/TransitUserRecordService.java @@ -0,0 +1,13 @@ +package com.ssf.mysqloracletest.service; + +import com.ssf.mysqloracletest.domain.TransitUserRecord; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author 28758 +* @description 针对表【transit_user_record(人脸记录表)】的数据库操作Service +* @createDate 2023-12-14 16:46:10 +*/ +public interface TransitUserRecordService extends IService { + +} diff --git a/src/main/java/com/ssf/mysqloracletest/service/TransitVehicleRecordService.java b/src/main/java/com/ssf/mysqloracletest/service/TransitVehicleRecordService.java new file mode 100644 index 0000000..031f92d --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/service/TransitVehicleRecordService.java @@ -0,0 +1,13 @@ +package com.ssf.mysqloracletest.service; + +import com.ssf.mysqloracletest.domain.TransitVehicleRecord; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author 28758 +* @description 针对表【transit_vehicle_record(车辆记录表)】的数据库操作Service +* @createDate 2023-12-14 16:47:49 +*/ +public interface TransitVehicleRecordService extends IService { + +} diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/JcjCjxxViewMysqlServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/JcjCjxxViewMysqlServiceImpl.java index c8cbc05..0189f89 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/JcjCjxxViewMysqlServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/JcjCjxxViewMysqlServiceImpl.java @@ -3,7 +3,6 @@ package com.ssf.mysqloracletest.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ssf.mysqloracletest.domain.JcjCjxxViewMysql; -import com.ssf.mysqloracletest.domain.JcjJjxxViewMysql; import com.ssf.mysqloracletest.mapper.JcjCjxxViewMysqlMapper; import com.ssf.mysqloracletest.service.JcjCjxxViewMysqlService; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/JcjJjxxViewOracleServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/JcjJjxxViewOracleServiceImpl.java index 24dd003..f69315d 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/JcjJjxxViewOracleServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/JcjJjxxViewOracleServiceImpl.java @@ -2,11 +2,8 @@ package com.ssf.mysqloracletest.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ssf.mysqloracletest.domain.JcjJjxxViewMysql; import com.ssf.mysqloracletest.domain.JcjJjxxViewOracle; import com.ssf.mysqloracletest.mapper.JcjJjxxViewOracleMapper; -import com.ssf.mysqloracletest.mapper.JcjJxxViewMysqlMapper; -import com.ssf.mysqloracletest.service.JcjJjxxViewMysqlService; import com.ssf.mysqloracletest.service.JcjJjxxViewOracleService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/MetaAlarmInfoServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/MetaAlarmInfoServiceImpl.java index 20dfca5..6fe8583 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/MetaAlarmInfoServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/MetaAlarmInfoServiceImpl.java @@ -3,8 +3,8 @@ package com.ssf.mysqloracletest.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ssf.mysqloracletest.domain.MetaAlarmInfo; -import com.ssf.mysqloracletest.service.MetaAlarmInfoService; import com.ssf.mysqloracletest.mapper.MetaAlarmInfoMapper; +import com.ssf.mysqloracletest.service.MetaAlarmInfoService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/MetaHandleAlarmInfoServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/MetaHandleAlarmInfoServiceImpl.java index 27e5fec..1e149cc 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/MetaHandleAlarmInfoServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/MetaHandleAlarmInfoServiceImpl.java @@ -3,8 +3,8 @@ package com.ssf.mysqloracletest.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ssf.mysqloracletest.domain.MetaHandleAlarmInfo; -import com.ssf.mysqloracletest.service.MetaHandleAlarmInfoService; import com.ssf.mysqloracletest.mapper.MetaHandleAlarmInfoMapper; +import com.ssf.mysqloracletest.service.MetaHandleAlarmInfoService; import org.springframework.stereotype.Service; /** diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/TransitUserRecordServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/TransitUserRecordServiceImpl.java new file mode 100644 index 0000000..8c6b88d --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/TransitUserRecordServiceImpl.java @@ -0,0 +1,26 @@ +package com.ssf.mysqloracletest.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ssf.mysqloracletest.domain.TransitUserRecord; +import com.ssf.mysqloracletest.service.TransitUserRecordService; +import com.ssf.mysqloracletest.mapper.TransitUserRecordMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +/** +* @author 28758 +* @description 针对表【transit_user_record(人脸记录表)】的数据库操作Service实现 +* @createDate 2023-12-14 16:46:10 +*/ +@Service +@RequiredArgsConstructor +@DS("mysql") +public class TransitUserRecordServiceImpl extends ServiceImpl + implements TransitUserRecordService{ + +} + + + + diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/TransitVehicleRecordServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/TransitVehicleRecordServiceImpl.java new file mode 100644 index 0000000..467fca2 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/TransitVehicleRecordServiceImpl.java @@ -0,0 +1,26 @@ +package com.ssf.mysqloracletest.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ssf.mysqloracletest.domain.TransitVehicleRecord; +import com.ssf.mysqloracletest.service.TransitVehicleRecordService; +import com.ssf.mysqloracletest.mapper.TransitVehicleRecordMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +/** +* @author 28758 +* @description 针对表【transit_vehicle_record(车辆记录表)】的数据库操作Service实现 +* @createDate 2023-12-14 16:47:49 +*/ +@Service +@RequiredArgsConstructor +@DS("mysql") +public class TransitVehicleRecordServiceImpl extends ServiceImpl + implements TransitVehicleRecordService{ + +} + + + + diff --git a/src/main/java/com/ssf/mysqloracletest/task/AlarmInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/AlarmInfoTask.java index aad22fe..b59061c 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/AlarmInfoTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/AlarmInfoTask.java @@ -7,6 +7,7 @@ import com.ssf.mysqloracletest.domain.MetaAlarmInfo; import com.ssf.mysqloracletest.service.JcjJjxxViewMysqlService; import com.ssf.mysqloracletest.service.MetaAlarmInfoService; import com.ssf.mysqloracletest.utils.ConfigParam; +import com.ssf.mysqloracletest.utils.NumKit; import com.ssf.mysqloracletest.utils.StringKit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -15,7 +16,6 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; -import java.math.BigDecimal; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; @@ -82,6 +82,7 @@ public class AlarmInfoTask { JcjJjxxViewMysql jjxxViewMysqlCp = new JcjJjxxViewMysql(); try { BeanUtils.copyProperties(bean, jjxxViewMysqlCp); + JcjJjxxViewMysql jwd = jjxxViewMysqlService.selectJcjJxxByJJBH(bean.getJJBH()); MetaAlarmInfo alarmInfo = new MetaAlarmInfo(); //设置目标字段的值 //alarm_code<-----JJBH 接警编号 @@ -105,23 +106,15 @@ public class AlarmInfoTask { //alarm_response_unit<-----JJDWMC接警单位名称 alarmInfo.setAlarmResponseUnit(jjxxViewMysqlCp.getJJDWMC()); - if (jjxxViewMysqlCp.getWDZB() != null) { - //转换类型 - BigDecimal WDZBDecimal = new BigDecimal(jjxxViewMysqlCp.getWDZB()); - //latitude(纬度)<-----WDZB纬度坐标 - alarmInfo.setLatitude(WDZBDecimal); - } else { + if (jwd.getGIS_Y() != null) { + //latitude(纬度)<-----WDZB纬度坐标 - alarmInfo.setLatitude(null); + alarmInfo.setLatitude(NumKit.checkBigDecimal(jwd.getGIS_Y())); } - if (jjxxViewMysqlCp.getJDZB() != null) { - BigDecimal JDZBDecimal = new BigDecimal(jjxxViewMysqlCp.getJDZB()); - //longitude(经度)<-----JDZB经度坐标 - alarmInfo.setLatitude(JDZBDecimal); - } else { + if (jwd.getGIS_X() != null) { //longitude(经度)<-----JDZB经度坐标 - alarmInfo.setLongitude(null); + alarmInfo.setLongitude(NumKit.checkBigDecimal(jwd.getGIS_X())); } boolean b = alarmInfoService.save(alarmInfo); diff --git a/src/main/java/com/ssf/mysqloracletest/task/JcjCjxxTask.java b/src/main/java/com/ssf/mysqloracletest/task/JcjCjxxTask.java index 8dd5ad6..2fcbaed 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/JcjCjxxTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/JcjCjxxTask.java @@ -3,7 +3,6 @@ package com.ssf.mysqloracletest.task; import cn.hutool.core.io.FileUtil; import com.ssf.mysqloracletest.domain.JcjCjxxViewMysql; import com.ssf.mysqloracletest.domain.JcjCjxxViewOracle; -import com.ssf.mysqloracletest.domain.JcjJjxxViewMysql; import com.ssf.mysqloracletest.service.JcjCjxxViewMysqlService; import com.ssf.mysqloracletest.service.JcjCjxxViewOracleService; import com.ssf.mysqloracletest.utils.ConfigParam; @@ -17,7 +16,6 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.io.File; -import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CountDownLatch; @@ -168,7 +166,7 @@ public class JcjCjxxTask { //1 去mysql查出当前最大时间 JcjCjxxViewMysql cjxxViewMysql = cjxxMysqlService.selectRecordOrderByRksj(); //2 用得到的最大时间去oracle 查询大于这个时间的记录 - List list = cjxxOracleService.getRealTimeRecording(cjxxViewMysql.getCJSJ()); + List list = cjxxOracleService.getRealTimeRecording(cjxxViewMysql.getWS_RKSJ()); //3 解析入库 for (JcjCjxxViewOracle cjxx : list) { JcjCjxxViewMysql sBean = new JcjCjxxViewMysql(); diff --git a/src/main/java/com/ssf/mysqloracletest/task/JcjJjxxTask.java b/src/main/java/com/ssf/mysqloracletest/task/JcjJjxxTask.java index a268934..52a5061 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/JcjJjxxTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/JcjJjxxTask.java @@ -118,10 +118,6 @@ public class JcjJjxxTask { return; } - if (!"true".equals(ConfigParam.JjxxSwitch)) { - return; - } - //1 去mysql查出当前最大时间 JcjJjxxViewMysql jcjJjxxViewMysql = jcjJjxxViewMysqlService.selectRecordOrderByRksj(); //2 用得到的最大时间去oracle 查询大于这个时间的记录 diff --git a/src/main/resources/mapper/TransitUserRecordMapper.xml b/src/main/resources/mapper/TransitUserRecordMapper.xml new file mode 100644 index 0000000..8b10da6 --- /dev/null +++ b/src/main/resources/mapper/TransitUserRecordMapper.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/TransitVehicleRecordMapper.xml b/src/main/resources/mapper/TransitVehicleRecordMapper.xml new file mode 100644 index 0000000..186b67c --- /dev/null +++ b/src/main/resources/mapper/TransitVehicleRecordMapper.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +