From 829c2b9a6432d3616dac61d26c734cde554a3413 Mon Sep 17 00:00:00 2001 From: fengchunyu Date: Thu, 14 Dec 2023 17:20:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BC=93=E5=AD=98=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/application.properties | 2 +- pom.xml | 8 + .../mysqloracletest/cache/DeviceCache.java | 66 +++++++ .../ssf/mysqloracletest/cache/VideoCache.java | 66 +++++++ .../domain/DevopsDeviceInfo.java | 171 ++++++++++++++++++ .../domain/DevopsDeviceStatus.java | 76 ++++++++ .../domain/DevopsVideoInfo.java | 141 +++++++++++++++ .../domain/DevopsVideoStatus.java | 76 ++++++++ .../mapper/DevopsDeviceInfoMapper.java | 16 ++ .../mapper/DevopsDeviceStatusMapper.java | 16 ++ .../mapper/DevopsVideoInfoMapper.java | 16 ++ .../mapper/DevopsVideoStatusMapper.java | 16 ++ .../service/DevopsDeviceInfoService.java | 25 +++ .../service/DevopsDeviceStatusService.java | 25 +++ .../service/DevopsVideoInfoService.java | 25 +++ .../service/DevopsVideoStatusService.java | 25 +++ .../impl/DevopsDeviceInfoServiceImpl.java | 24 +++ .../impl/DevopsDeviceStatusServiceImpl.java | 24 +++ .../impl/DevopsVideoInfoServiceImpl.java | 24 +++ .../impl/DevopsVideoStatusServiceImpl.java | 24 +++ .../ssf/mysqloracletest/task/JcjCjxxTask.java | 3 + 21 files changed, 868 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/ssf/mysqloracletest/cache/DeviceCache.java create mode 100644 src/main/java/com/ssf/mysqloracletest/cache/VideoCache.java create mode 100644 src/main/java/com/ssf/mysqloracletest/domain/DevopsDeviceInfo.java create mode 100644 src/main/java/com/ssf/mysqloracletest/domain/DevopsDeviceStatus.java create mode 100644 src/main/java/com/ssf/mysqloracletest/domain/DevopsVideoInfo.java create mode 100644 src/main/java/com/ssf/mysqloracletest/domain/DevopsVideoStatus.java create mode 100644 src/main/java/com/ssf/mysqloracletest/mapper/DevopsDeviceInfoMapper.java create mode 100644 src/main/java/com/ssf/mysqloracletest/mapper/DevopsDeviceStatusMapper.java create mode 100644 src/main/java/com/ssf/mysqloracletest/mapper/DevopsVideoInfoMapper.java create mode 100644 src/main/java/com/ssf/mysqloracletest/mapper/DevopsVideoStatusMapper.java create mode 100644 src/main/java/com/ssf/mysqloracletest/service/DevopsDeviceInfoService.java create mode 100644 src/main/java/com/ssf/mysqloracletest/service/DevopsDeviceStatusService.java create mode 100644 src/main/java/com/ssf/mysqloracletest/service/DevopsVideoInfoService.java create mode 100644 src/main/java/com/ssf/mysqloracletest/service/DevopsVideoStatusService.java create mode 100644 src/main/java/com/ssf/mysqloracletest/service/impl/DevopsDeviceInfoServiceImpl.java create mode 100644 src/main/java/com/ssf/mysqloracletest/service/impl/DevopsDeviceStatusServiceImpl.java create mode 100644 src/main/java/com/ssf/mysqloracletest/service/impl/DevopsVideoInfoServiceImpl.java create mode 100644 src/main/java/com/ssf/mysqloracletest/service/impl/DevopsVideoStatusServiceImpl.java diff --git a/config/application.properties b/config/application.properties index 88cbeb0..0af0ab6 100644 --- a/config/application.properties +++ b/config/application.properties @@ -32,4 +32,4 @@ wsDownloadPicAreaStart=320924 wsDownloadPicPath=/home/dataaccess wshttpurl=http://50.146.63.16:8080/syx_webservice/getCzrkImgage.xhtml?sfzh= #射阳 实有人口将有房屋号的数据根据户籍表数据清洗，并更新户主关系 -jwzUserInfoToActual=true +jwzUserInfoToActual=false diff --git a/pom.xml b/pom.xml index 70f5c9e..e3b1eb9 100644 --- a/pom.xml +++ b/pom.xml @@ -109,6 +109,14 @@ 4.9.1 + + + + com.github.ben-manes.caffeine + caffeine + 2.9.0 + + diff --git a/src/main/java/com/ssf/mysqloracletest/cache/DeviceCache.java b/src/main/java/com/ssf/mysqloracletest/cache/DeviceCache.java new file mode 100644 index 0000000..864f57b --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/cache/DeviceCache.java @@ -0,0 +1,66 @@ +package com.ssf.mysqloracletest.cache; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.benmanes.caffeine.cache.Cache; +import com.github.benmanes.caffeine.cache.Caffeine; +import com.ssf.mysqloracletest.domain.DevopsDeviceInfo; +import com.ssf.mysqloracletest.service.DevopsDeviceInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 鍖哄煙缂撳瓨 + * + * @since 2023-09-16 11:04 + */ +@Component +public class DeviceCache { + + /** + * + */ + private static final Cache cache = Caffeine.newBuilder().build(); + + private static DevopsDeviceInfoService devopsDeviceInfoService; + + @Autowired + DeviceCache(DevopsDeviceInfoService devopsDeviceInfoService) { + DeviceCache.devopsDeviceInfoService = devopsDeviceInfoService; + //鍒濆鍖 + load(); + } + + public static String get(String key) { + return cache.get(key, s -> { + try { + return String.valueOf(devopsDeviceInfoService.getOne(new LambdaQueryWrapper().eq(DevopsDeviceInfo::getGbsChannelNo, key))); + } catch (Exception e) { + return null; + } + }); + } + + /** + * 缂撳瓨鍒锋柊 + */ + @Scheduled(cron = "0 0 3 * * ?") + public static void refresh() { + load(); + } + + private static void load() { + + List list = devopsDeviceInfoService.list(); + Map dictMap = list.stream().collect(Collectors.toMap(DevopsDeviceInfo::getGbsChannelNo, e -> String.valueOf(e), (v1, v2) -> v2)); + Map dictMapCode = list.stream().collect(Collectors.toMap( + e -> e.getGbsChannelNo(), + e -> String.valueOf(e), (v1, v2) -> v2)); + cache.putAll(dictMap); + cache.putAll(dictMapCode); + } +} diff --git a/src/main/java/com/ssf/mysqloracletest/cache/VideoCache.java b/src/main/java/com/ssf/mysqloracletest/cache/VideoCache.java new file mode 100644 index 0000000..4a79164 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/cache/VideoCache.java @@ -0,0 +1,66 @@ +package com.ssf.mysqloracletest.cache; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.benmanes.caffeine.cache.Cache; +import com.github.benmanes.caffeine.cache.Caffeine; +import com.ssf.mysqloracletest.domain.DevopsVideoInfo; +import com.ssf.mysqloracletest.service.DevopsVideoInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 鍖哄煙缂撳瓨 + * + * @since 2023-09-16 11:04 + */ +@Component +public class VideoCache { + + /** + * + */ + private static final Cache cache = Caffeine.newBuilder().build(); + + private static DevopsVideoInfoService devopsVideoInfoService; + + @Autowired + VideoCache(DevopsVideoInfoService devopsVideoInfoService) { + VideoCache.devopsVideoInfoService = devopsVideoInfoService; + //鍒濆鍖 + load(); + } + + public static String get(String key) { + return cache.get(key, s -> { + try { + return String.valueOf(devopsVideoInfoService.getOne(new LambdaQueryWrapper().eq(DevopsVideoInfo::getGbsChannelNo, key))); + } catch (Exception e) { + return null; + } + }); + } + + /** + * 缂撳瓨鍒锋柊 + */ + @Scheduled(cron = "0 0 3 * * ?") + public static void refresh() { + load(); + } + + private static void load() { + + List list = devopsVideoInfoService.list(); + Map dictMap = list.stream().collect(Collectors.toMap(DevopsVideoInfo::getGbsChannelNo, e -> String.valueOf(e), (v1, v2) -> v2)); + Map dictMapCode = list.stream().collect(Collectors.toMap( + e -> e.getGbsChannelNo(), + e -> String.valueOf(e), (v1, v2) -> v2)); + cache.putAll(dictMap); + cache.putAll(dictMapCode); + } +} diff --git a/src/main/java/com/ssf/mysqloracletest/domain/DevopsDeviceInfo.java b/src/main/java/com/ssf/mysqloracletest/domain/DevopsDeviceInfo.java new file mode 100644 index 0000000..437fa16 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/domain/DevopsDeviceInfo.java @@ -0,0 +1,171 @@ +package com.ssf.mysqloracletest.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 鏅鸿兘璁惧淇℃伅琛(DevopsDeviceInfo)Domain + * + * @author makejava + * @since 2023-12-14 16:26:46 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName(value = "devops_device_info") +public class DevopsDeviceInfo { + + /** + * 涓婚敭 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 鍦烘墍缂栫爜 + */ + private String placeCode; + + /** + * 鍦烘墍鍚嶇О + */ + private String placeName; + + /** + * 璁惧鍚嶇О + */ + private String deviceName; + + /** + * 璁惧缂栫爜 + */ + private String deviceCode; + + /** + * 閫氶亾鍥芥爣缂栫爜 + */ + private String gbsChannelNo; + + /** + * 璁惧绫诲瀷 + */ + private Integer deviceType; + + /** + * 璁惧鑳藉姏闆 + */ + private String structuredCameraType; + + /** + * 瀹夎浣嶇疆 + */ + private String deviceAddress; + + /** + * 璁惧鏂逛綅 + */ + private Integer orientation; + + /** + * 璁惧SN缂栧彿 + */ + private String deviceSn; + + /** + * 璁惧鍝佺墝 + */ + private String deviceBrand; + + /** + * 璁惧ip + */ + private String deviceIp; + + /** + * 璁惧绔彛 + */ + private Integer devicePort; + + /** + * 璁惧MAC + */ + private String deviceMac; + + /** + * 璁惧IMEI + */ + private String deviceImei; + + /** + * 璁惧缁忓害 + */ + private Double longitude; + + /** + * 璁惧绾害 + */ + private Double latitude; + + /** + * U3D缁忓害 + */ + private Double u3dLongitude; + + /** + * U3D绾害 + */ + private Double u3dLatitude; + + /** + * 璁惧楂樺害 + */ + private String deviceHeight; + + /** + * 璁惧鍘傚 + */ + private String manufactor; + + /** + * 璁惧鐧婚檰甯愬彿 + */ + private String account; + + /** + * 璁惧鐧婚檰瀵嗙爜 + */ + private String password; + + /** + * 杩涘嚭鏂瑰悜 + */ + private Integer direction; + + /** + * RTSP娴佸湴鍧 + */ + private String rtspAddress; + + /** + * 鏄惁鍗″彛璁惧 + */ + private Integer isDoorwayVideo; + + /** + * 鍟嗘堡region_id + */ + private String stRegionId; + + /** + * 鍟嗘堡camera_idx + */ + private String stCameraIdx; + + /** + * 閫氶亾鍙 + */ + private Integer channelNo; + +} diff --git a/src/main/java/com/ssf/mysqloracletest/domain/DevopsDeviceStatus.java b/src/main/java/com/ssf/mysqloracletest/domain/DevopsDeviceStatus.java new file mode 100644 index 0000000..28d8216 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/domain/DevopsDeviceStatus.java @@ -0,0 +1,76 @@ +package com.ssf.mysqloracletest.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 璁惧鐘舵佷俊鎭〃(DevopsDeviceStatus)Domain + * + * @author makejava + * @since 2023-12-14 16:26:47 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName(value = "devops_device_status") +public class DevopsDeviceStatus { + + /** + * 涓婚敭 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 鍦烘墍缂栫爜 + */ + private String placeCode; + + /** + * 鍦烘墍鍚嶇О + */ + private String placeName; + + /** + * 璁惧缂栫爜 + */ + private String deviceCode; + + /** + * 閫氶亾鍥芥爣缂栫爜 + */ + private String gbsChannelNo; + + /** + * 璁惧鍚嶇О + */ + private String deviceName; + + /** + * 璁惧ip + */ + private String deviceIp; + + /** + * 璁惧绫诲瀷 + */ + private Integer deviceType; + + /** + * 蹇冭烦鏃堕棿 + */ + private Long heartbeatTime; + + /** + * 鏄惁鍦ㄧ嚎 + */ + private Integer isOnline; + + /** + * 鏄惁瀛樺湪鍛婅 + */ + private Integer isAlarm; + +} diff --git a/src/main/java/com/ssf/mysqloracletest/domain/DevopsVideoInfo.java b/src/main/java/com/ssf/mysqloracletest/domain/DevopsVideoInfo.java new file mode 100644 index 0000000..65a88d4 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/domain/DevopsVideoInfo.java @@ -0,0 +1,141 @@ +package com.ssf.mysqloracletest.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 瑙嗛鐩戞帶璁惧琛(DevopsVideoInfo)Domain + * + * @author makejava + * @since 2023-12-14 16:26:47 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName(value = "devops_video_info") +public class DevopsVideoInfo { + + /** + * 涓婚敭 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 鍦烘墍缂栫爜 + */ + private String placeCode; + + /** + * 鍦烘墍鍚嶇О + */ + private String placeName; + + /** + * 璁惧缂栫爜 + */ + private String deviceCode; + + /** + * 璁惧鍚嶇О + */ + private String deviceName; + + /** + * 鐩戞帶绫诲瀷 + */ + private Integer monitoringType; + + /** + * 瀹夎浣嶇疆 + */ + private String deviceAddress; + + /** + * 璁惧鏂逛綅 + */ + private Integer orientation; + + /** + * 璁惧SN缂栧彿 + */ + private String deviceSn; + + /** + * 璁惧鍝佺墝 + */ + private String deviceBrand; + + /** + * 璁惧ip + */ + private String deviceIp; + + /** + * 璁惧绔彛 + */ + private Integer devicePort; + + /** + * 璁惧MAC + */ + private String deviceMac; + + /** + * 璁惧缁忓害 + */ + private Double longitude; + + /** + * 璁惧绾害 + */ + private Double latitude; + + /** + * U3D缁忓害 + */ + private Double u3dLongitude; + + /** + * U3D绾害 + */ + private Double u3dLatitude; + + /** + * 璁惧楂樺害 + */ + private String deviceHeight; + + /** + * 璁惧鍘傚 + */ + private String manufactor; + + /** + * 鐧婚檰甯愬彿 + */ + private String account; + + /** + * 鐧婚檰瀵嗙爜 + */ + private String password; + + /** + * 閫氶亾鍥芥爣缂栫爜 + */ + private String gbsChannelNo; + + /** + * NVR璁惧缂栫爜 + */ + private String gbsNvrNo; + + /** + * 閫氶亾鍙 + */ + private Integer channelNo; + +} diff --git a/src/main/java/com/ssf/mysqloracletest/domain/DevopsVideoStatus.java b/src/main/java/com/ssf/mysqloracletest/domain/DevopsVideoStatus.java new file mode 100644 index 0000000..0b99e9b --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/domain/DevopsVideoStatus.java @@ -0,0 +1,76 @@ +package com.ssf.mysqloracletest.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 瑙嗛鐩戞帶鐘舵佽〃(DevopsVideoStatus)Domain + * + * @author makejava + * @since 2023-12-14 16:26:47 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName(value = "devops_video_status") +public class DevopsVideoStatus { + + /** + * 涓婚敭 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 鍦烘墍缂栫爜 + */ + private String placeCode; + + /** + * 鍦烘墍鍚嶇О + */ + private String placeName; + + /** + * 璁惧缂栫爜 + */ + private String deviceCode; + + /** + * NVR璁惧缂栫爜 + */ + private String gbsNvrNo; + + /** + * 閫氶亾鍥芥爣缂栫爜 + */ + private String gbsChannelNo; + + /** + * 璁惧鍚嶇О + */ + private String deviceName; + + /** + * 璁惧ip + */ + private String deviceIp; + + /** + * 鐩戞帶绫诲瀷 + */ + private Integer monitoringType; + + /** + * 蹇冭烦鏃堕棿 + */ + private Long heartbeatTime; + + /** + * 鏄惁鍦ㄧ嚎 + */ + private Integer isOnline; + +} diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/DevopsDeviceInfoMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/DevopsDeviceInfoMapper.java new file mode 100644 index 0000000..e8a7669 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/mapper/DevopsDeviceInfoMapper.java @@ -0,0 +1,16 @@ +package com.ssf.mysqloracletest.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ssf.mysqloracletest.domain.DevopsDeviceInfo; +import org.apache.ibatis.annotations.Mapper; + +/** + * 鏅鸿兘璁惧淇℃伅琛(DevopsDeviceInfo)Mapper + * + * @author makejava + * @since 2023-12-14 16:26:46 + */ +@Mapper +public interface DevopsDeviceInfoMapper extends BaseMapper { + +} diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/DevopsDeviceStatusMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/DevopsDeviceStatusMapper.java new file mode 100644 index 0000000..eda7872 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/mapper/DevopsDeviceStatusMapper.java @@ -0,0 +1,16 @@ +package com.ssf.mysqloracletest.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ssf.mysqloracletest.domain.DevopsDeviceStatus; +import org.apache.ibatis.annotations.Mapper; + +/** + * 璁惧鐘舵佷俊鎭〃(DevopsDeviceStatus)Mapper + * + * @author makejava + * @since 2023-12-14 16:26:47 + */ +@Mapper +public interface DevopsDeviceStatusMapper extends BaseMapper { + +} diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/DevopsVideoInfoMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/DevopsVideoInfoMapper.java new file mode 100644 index 0000000..021ef04 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/mapper/DevopsVideoInfoMapper.java @@ -0,0 +1,16 @@ +package com.ssf.mysqloracletest.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ssf.mysqloracletest.domain.DevopsVideoInfo; +import org.apache.ibatis.annotations.Mapper; + +/** + * 瑙嗛鐩戞帶璁惧琛(DevopsVideoInfo)Mapper + * + * @author makejava + * @since 2023-12-14 16:26:47 + */ +@Mapper +public interface DevopsVideoInfoMapper extends BaseMapper { + +} diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/DevopsVideoStatusMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/DevopsVideoStatusMapper.java new file mode 100644 index 0000000..90e5454 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/mapper/DevopsVideoStatusMapper.java @@ -0,0 +1,16 @@ +package com.ssf.mysqloracletest.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ssf.mysqloracletest.domain.DevopsVideoStatus; +import org.apache.ibatis.annotations.Mapper; + +/** + * 瑙嗛鐩戞帶鐘舵佽〃(DevopsVideoStatus)Mapper + * + * @author makejava + * @since 2023-12-14 16:26:47 + */ +@Mapper +public interface DevopsVideoStatusMapper extends BaseMapper { + +} diff --git a/src/main/java/com/ssf/mysqloracletest/service/DevopsDeviceInfoService.java b/src/main/java/com/ssf/mysqloracletest/service/DevopsDeviceInfoService.java new file mode 100644 index 0000000..a8e429f --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/service/DevopsDeviceInfoService.java @@ -0,0 +1,25 @@ +package com.ssf.mysqloracletest.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ssf.mysqloracletest.domain.DevopsDeviceInfo; + +import java.util.List; + +/** + * 鏅鸿兘璁惧淇℃伅琛(DevopsDeviceInfo)Service + * + * @author makejava + * @since 2023-12-14 16:26:46 + */ +public interface DevopsDeviceInfoService extends IService { + + /** + * 鏂板鎴栬呮洿鏂版櫤鑳借澶囦俊鎭〃 + * + * @param devopsDeviceInfo 鏅鸿兘璁惧淇℃伅琛ㄥ璞 + * @return 缁撴灉 + */ + boolean insertOrUpdate(DevopsDeviceInfo devopsDeviceInfo); + +} diff --git a/src/main/java/com/ssf/mysqloracletest/service/DevopsDeviceStatusService.java b/src/main/java/com/ssf/mysqloracletest/service/DevopsDeviceStatusService.java new file mode 100644 index 0000000..0a128a0 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/service/DevopsDeviceStatusService.java @@ -0,0 +1,25 @@ +package com.ssf.mysqloracletest.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ssf.mysqloracletest.domain.DevopsDeviceStatus; + +import java.util.List; + +/** + * 璁惧鐘舵佷俊鎭〃(DevopsDeviceStatus)Service + * + * @author makejava + * @since 2023-12-14 16:26:46 + */ +public interface DevopsDeviceStatusService extends IService { + + /** + * 鏂板鎴栬呮洿鏂拌澶囩姸鎬佷俊鎭〃 + * + * @param devopsDeviceStatus 璁惧鐘舵佷俊鎭〃瀵硅薄 + * @return 缁撴灉 + */ + boolean insertOrUpdate(DevopsDeviceStatus devopsDeviceStatus); + +} diff --git a/src/main/java/com/ssf/mysqloracletest/service/DevopsVideoInfoService.java b/src/main/java/com/ssf/mysqloracletest/service/DevopsVideoInfoService.java new file mode 100644 index 0000000..24f1aa0 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/service/DevopsVideoInfoService.java @@ -0,0 +1,25 @@ +package com.ssf.mysqloracletest.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ssf.mysqloracletest.domain.DevopsVideoInfo; + +import java.util.List; + +/** + * 瑙嗛鐩戞帶璁惧琛(DevopsVideoInfo)Service + * + * @author makejava + * @since 2023-12-14 16:26:47 + */ +public interface DevopsVideoInfoService extends IService { + + /** + * 鏂板鎴栬呮洿鏂拌棰戠洃鎺ц澶囪〃 + * + * @param devopsVideoInfo 瑙嗛鐩戞帶璁惧琛ㄥ璞 + * @return 缁撴灉 + */ + boolean insertOrUpdate(DevopsVideoInfo devopsVideoInfo); + +} diff --git a/src/main/java/com/ssf/mysqloracletest/service/DevopsVideoStatusService.java b/src/main/java/com/ssf/mysqloracletest/service/DevopsVideoStatusService.java new file mode 100644 index 0000000..f8ace86 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/service/DevopsVideoStatusService.java @@ -0,0 +1,25 @@ +package com.ssf.mysqloracletest.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ssf.mysqloracletest.domain.DevopsVideoStatus; + +import java.util.List; + +/** + * 瑙嗛鐩戞帶鐘舵佽〃(DevopsVideoStatus)Service + * + * @author makejava + * @since 2023-12-14 16:26:47 + */ +public interface DevopsVideoStatusService extends IService { + + /** + * 鏂板鎴栬呮洿鏂拌棰戠洃鎺х姸鎬佽〃 + * + * @param devopsVideoStatus 瑙嗛鐩戞帶鐘舵佽〃瀵硅薄 + * @return 缁撴灉 + */ + boolean insertOrUpdate(DevopsVideoStatus devopsVideoStatus); + +} diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/DevopsDeviceInfoServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/DevopsDeviceInfoServiceImpl.java new file mode 100644 index 0000000..d3751b5 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/DevopsDeviceInfoServiceImpl.java @@ -0,0 +1,24 @@ +package com.ssf.mysqloracletest.service.impl; + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ssf.mysqloracletest.domain.DevopsDeviceInfo; +import com.ssf.mysqloracletest.mapper.DevopsDeviceInfoMapper; +import com.ssf.mysqloracletest.service.DevopsDeviceInfoService; +import org.springframework.stereotype.Service; + +/** + * 鏅鸿兘璁惧淇℃伅琛(DevopsDeviceInfo)ServiceImpl + * + * @author makejava + * @since 2023-12-14 16:26:46 + */ +@Service +public class DevopsDeviceInfoServiceImpl extends ServiceImpl implements DevopsDeviceInfoService { + + @Override + public boolean insertOrUpdate(DevopsDeviceInfo devopsDeviceInfo) { + return false; + } + +} diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/DevopsDeviceStatusServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/DevopsDeviceStatusServiceImpl.java new file mode 100644 index 0000000..98f602b --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/DevopsDeviceStatusServiceImpl.java @@ -0,0 +1,24 @@ +package com.ssf.mysqloracletest.service.impl; + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ssf.mysqloracletest.domain.DevopsDeviceStatus; +import com.ssf.mysqloracletest.mapper.DevopsDeviceStatusMapper; +import com.ssf.mysqloracletest.service.DevopsDeviceStatusService; +import org.springframework.stereotype.Service; + +/** + * 璁惧鐘舵佷俊鎭〃(DevopsDeviceStatus)ServiceImpl + * + * @author makejava + * @since 2023-12-14 16:26:47 + */ +@Service +public class DevopsDeviceStatusServiceImpl extends ServiceImpl implements DevopsDeviceStatusService { + + @Override + public boolean insertOrUpdate(DevopsDeviceStatus devopsDeviceStatus) { + return false; + } + +} diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/DevopsVideoInfoServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/DevopsVideoInfoServiceImpl.java new file mode 100644 index 0000000..3ba0e2c --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/DevopsVideoInfoServiceImpl.java @@ -0,0 +1,24 @@ +package com.ssf.mysqloracletest.service.impl; + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ssf.mysqloracletest.domain.DevopsVideoInfo; +import com.ssf.mysqloracletest.mapper.DevopsVideoInfoMapper; +import com.ssf.mysqloracletest.service.DevopsVideoInfoService; +import org.springframework.stereotype.Service; + +/** + * 瑙嗛鐩戞帶璁惧琛(DevopsVideoInfo)ServiceImpl + * + * @author makejava + * @since 2023-12-14 16:26:47 + */ +@Service +public class DevopsVideoInfoServiceImpl extends ServiceImpl implements DevopsVideoInfoService { + + @Override + public boolean insertOrUpdate(DevopsVideoInfo devopsVideoInfo) { + return false; + } + +} diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/DevopsVideoStatusServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/DevopsVideoStatusServiceImpl.java new file mode 100644 index 0000000..3c7c048 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/DevopsVideoStatusServiceImpl.java @@ -0,0 +1,24 @@ +package com.ssf.mysqloracletest.service.impl; + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ssf.mysqloracletest.domain.DevopsVideoStatus; +import com.ssf.mysqloracletest.mapper.DevopsVideoStatusMapper; +import com.ssf.mysqloracletest.service.DevopsVideoStatusService; +import org.springframework.stereotype.Service; + +/** + * 瑙嗛鐩戞帶鐘舵佽〃(DevopsVideoStatus)ServiceImpl + * + * @author makejava + * @since 2023-12-14 16:26:47 + */ +@Service +public class DevopsVideoStatusServiceImpl extends ServiceImpl implements DevopsVideoStatusService { + + @Override + public boolean insertOrUpdate(DevopsVideoStatus devopsVideoStatus) { + return false; + } + +} diff --git a/src/main/java/com/ssf/mysqloracletest/task/JcjCjxxTask.java b/src/main/java/com/ssf/mysqloracletest/task/JcjCjxxTask.java index 5100199..8dd5ad6 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/JcjCjxxTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/JcjCjxxTask.java @@ -49,6 +49,9 @@ public class JcjCjxxTask { @Scheduled(initialDelay = 100, fixedDelay = 3000) public void transcjxx() { +// String value = DeviceCache.get("32092451211328052004"); +// System.out.println(); + if (cjxxTag) { return; } From 1829fd77f70aee69ba2aaecadf4fe0df830fe860 Mon Sep 17 00:00:00 2001 From: hanrenchun Date: Thu, 14 Dec 2023 17:27:36 +0800 Subject: [PATCH 2/3] =?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 閽堝琛ㄣ恡ransit_user_record(浜鸿劯璁板綍琛)銆戠殑鏁版嵁搴撴搷浣淢apper +* @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 閽堝琛ㄣ恡ransit_vehicle_record(杞﹁締璁板綍琛)銆戠殑鏁版嵁搴撴搷浣淢apper +* @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 閽堝琛ㄣ恡ransit_user_record(浜鸿劯璁板綍琛)銆戠殑鏁版嵁搴撴搷浣淪ervice +* @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 閽堝琛ㄣ恡ransit_vehicle_record(杞﹁締璁板綍琛)銆戠殑鏁版嵁搴撴搷浣淪ervice +* @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 閽堝琛ㄣ恡ransit_user_record(浜鸿劯璁板綍琛)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇 +* @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 閽堝琛ㄣ恡ransit_vehicle_record(杞﹁締璁板綍琛)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇 +* @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 鍘籱ysql鏌ュ嚭褰撳墠鏈澶ф椂闂 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 鍘籱ysql鏌ュ嚭褰撳墠鏈澶ф椂闂 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 790c8c3a73af4ffce98b43ffb7585afb19b16926 Mon Sep 17 00:00:00 2001 From: hanrenchun Date: Thu, 14 Dec 2023 17:31:13 +0800 Subject: [PATCH 3/3] =?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 --- .../task/MetaHandleAlarmTask.java | 141 ++++++++++++++++++ 1 file changed, 141 insertions(+) create mode 100644 src/main/java/com/ssf/mysqloracletest/task/MetaHandleAlarmTask.java diff --git a/src/main/java/com/ssf/mysqloracletest/task/MetaHandleAlarmTask.java b/src/main/java/com/ssf/mysqloracletest/task/MetaHandleAlarmTask.java new file mode 100644 index 0000000..54dfcc9 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/task/MetaHandleAlarmTask.java @@ -0,0 +1,141 @@ +package com.ssf.mysqloracletest.task; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ssf.mysqloracletest.domain.JcjCjxxViewMysql; +import com.ssf.mysqloracletest.domain.MetaHandleAlarmInfo; +import com.ssf.mysqloracletest.service.JcjCjxxViewMysqlService; +import com.ssf.mysqloracletest.service.MetaHandleAlarmInfoService; +import com.ssf.mysqloracletest.utils.ConfigParam; +import com.ssf.mysqloracletest.utils.StringKit; +import lombok.RequiredArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.concurrent.CountDownLatch; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * 鐢ㄦ埛鏁版嵁鎺ュ叆 + */ +@Component +@RequiredArgsConstructor +public class MetaHandleAlarmTask { + + private static final Logger logger = LoggerFactory.getLogger(MetaHandleAlarmTask.class); + + private final MetaHandleAlarmInfoService metaHandleAlarmInfoService; + private final JcjCjxxViewMysqlService jcjCjxxViewMysqlService; + + @Scheduled(initialDelay = 100, fixedDelay = 3000) + public void transcjxx() { + + + if (!"true".equals(ConfigParam.metaHandleAlarmSwitch)) { + return; + } + + + try { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.isNull("status"); + Page page = new Page<>(1, 1000); + List resultList = jcjCjxxViewMysqlService.page(page, queryWrapper).getRecords(); + CountDownLatch latch = new CountDownLatch(resultList.size()); +// ExecutorService cjxxPool = Executors.newFixedThreadPool(5); + + for (JcjCjxxViewMysql bean : resultList) { +// cjxxPool.submit(() -> { + cleanCjxx(bean); + latch.countDown(); +// }); + } + + + try { + // Wait for all threads to complete + latch.await(); + } catch (InterruptedException e) { + e.printStackTrace(); + } + // 鍏抽棴绾跨▼姹 +// cjxxPool.shutdown(); + + } catch (Exception e) { + logger.info(StringKit.getTrace(e)); + } + } + + private void cleanCjxx(JcjCjxxViewMysql bean) { + JcjCjxxViewMysql cjxx = new JcjCjxxViewMysql(); + try { + BeanUtils.copyProperties(bean, cjxx); + MetaHandleAlarmInfo metaHandleAlarmInfo = new MetaHandleAlarmInfo(); + metaHandleAlarmInfo.setAlarmCode(cjxx.getJJBH()); + metaHandleAlarmInfo.setHandleAlarmUnit(cjxx.getCJDWMC()); + metaHandleAlarmInfo.setHandleAlarmTime(cjxx.getCJSJ()); + metaHandleAlarmInfo.setHandleAlarmContent(cjxx.getCLJGNR()); + metaHandleAlarmInfo.setHandleAlarmAddress(cjxx.getCJXXDD()); + if (!containsChinese(cjxx.getCJR())) { + metaHandleAlarmInfo.setHandleAlarmUser(cjxx.getCJRHZXS()); + metaHandleAlarmInfo.setHandleAlarmUserCode(cjxx.getCJR()); + }else { + String s = extractChinese(cjxx.getCJR()); + String s1 = extractNonChinese(cjxx.getCJR()); + String substring = s1.substring(0, s1.length() - 1); + if (cjxx.getCJRHZXS()!=null) { + metaHandleAlarmInfo.setHandleAlarmUser(cjxx.getCJRHZXS() +","+ s); + }else { + metaHandleAlarmInfo.setHandleAlarmUser(s); + } + metaHandleAlarmInfo.setHandleAlarmUserCode(substring); + } + metaHandleAlarmInfo.setHandleAlarmResult(cjxx.getCJJGMC()); + boolean save = metaHandleAlarmInfoService.save(metaHandleAlarmInfo); + if (save) { + cjxx.setStatus("1"); + jcjCjxxViewMysqlService.updateCjxxById(cjxx); + } + } catch (Exception e) { + logger.info(StringKit.getTrace(e)); + cjxx.setStatus("2"); + jcjCjxxViewMysqlService.updateCjxxById(cjxx); + } + + } + + private static boolean containsChinese(String str) { + Pattern pattern = Pattern.compile("[\u4e00-\u9fa5]"); + Matcher matcher = pattern.matcher(str); + return matcher.find(); + } + + // 鎻愬彇瀛楃涓蹭腑鐨勪腑鏂 + private static String extractChinese(String str) { + Pattern pattern = Pattern.compile("[\u4e00-\u9fa5]"); + Matcher matcher = pattern.matcher(str); + + StringBuilder chineseCharacters = new StringBuilder(); + while (matcher.find()) { + chineseCharacters.append(matcher.group()); + } + return chineseCharacters.toString(); + } + + private static String extractNonChinese(String str) { + Pattern pattern = Pattern.compile("[^\u4e00-\u9fa5]"); + Matcher matcher = pattern.matcher(str); + + StringBuilder nonChineseCharacters = new StringBuilder(); + while (matcher.find()) { + nonChineseCharacters.append(matcher.group()); + } + + return nonChineseCharacters.toString(); + } +}