From 041c9fc107677d83038d4f513d8b88f121cf81eb Mon Sep 17 00:00:00 2001 From: hanrenchun Date: Tue, 2 Jan 2024 09:00:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=A1=A3=E6=A1=88=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mysqloracletest/domain/BoneVehicle.java | 34 +++++++++++++++++++ .../mapper/BoneVehicleMapper.java | 23 +++++++++++++ .../service/BoneVehicleService.java | 14 ++++++++ .../service/impl/BoneVehicleServiceImpl.java | 26 ++++++++++++++ .../task/TMotorvehicleTask.java | 22 +++++++----- .../task/TStrhEntityInfoKsTask.java | 11 ++++-- .../mysqloracletest/utils/ConfigParam.java | 3 ++ 7 files changed, 123 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/ssf/mysqloracletest/domain/BoneVehicle.java create mode 100644 src/main/java/com/ssf/mysqloracletest/mapper/BoneVehicleMapper.java create mode 100644 src/main/java/com/ssf/mysqloracletest/service/BoneVehicleService.java create mode 100644 src/main/java/com/ssf/mysqloracletest/service/impl/BoneVehicleServiceImpl.java diff --git a/src/main/java/com/ssf/mysqloracletest/domain/BoneVehicle.java b/src/main/java/com/ssf/mysqloracletest/domain/BoneVehicle.java new file mode 100644 index 0000000..94fe5dc --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/domain/BoneVehicle.java @@ -0,0 +1,34 @@ +package com.ssf.mysqloracletest.domain; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * @TableName bone_vehicle + */ +@TableName(value ="bone_vehicle") +@Data +public class BoneVehicle implements Serializable { + private Long id; + + + @TableField(value = "no") + private String no; + + @TableField(value = "owner_person_name") + private String ownerPersonName; + + @TableField(value = "owner_person_idcard") + private String ownerPersonIdcard; + + @TableField(value = "owner_person_phone") + private String ownerPersonPhone; + + + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/BoneVehicleMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/BoneVehicleMapper.java new file mode 100644 index 0000000..7b0777f --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/mapper/BoneVehicleMapper.java @@ -0,0 +1,23 @@ +package com.ssf.mysqloracletest.mapper; + + + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ssf.mysqloracletest.domain.BoneVehicle; +import org.apache.ibatis.annotations.Mapper; + +/** +* @author 28758 +* @description 针对表【bone_vehicle(小区机动车表 )】的数据库操作Mapper +* @createDate 2023-12-26 21:35:05 +* @Entity generator.domain.BoneVehicle +*/ +@Mapper +public interface BoneVehicleMapper extends BaseMapper { + +} + + + + diff --git a/src/main/java/com/ssf/mysqloracletest/service/BoneVehicleService.java b/src/main/java/com/ssf/mysqloracletest/service/BoneVehicleService.java new file mode 100644 index 0000000..38f71a7 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/service/BoneVehicleService.java @@ -0,0 +1,14 @@ +package com.ssf.mysqloracletest.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ssf.mysqloracletest.domain.BoneVehicle; + +/** +* @author 28758 +* @description 针对表【bone_vehicle(小区机动车表 )】的数据库操作Service +* @createDate 2023-12-26 21:35:05 +*/ +public interface BoneVehicleService extends IService { + +} diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/BoneVehicleServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/BoneVehicleServiceImpl.java new file mode 100644 index 0000000..794a7dc --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/BoneVehicleServiceImpl.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.BoneVehicle; +import com.ssf.mysqloracletest.mapper.BoneVehicleMapper; +import com.ssf.mysqloracletest.service.BoneVehicleService; +import org.springframework.stereotype.Service; + +/** +* @author 28758 +* @description 针对表【bone_vehicle(小区机动车表 )】的数据库操作Service实现 +* @createDate 2023-12-26 21:35:05 +*/ +@Service +@DS("mysql") +public class BoneVehicleServiceImpl extends ServiceImpl + implements BoneVehicleService { + +} + + + + diff --git a/src/main/java/com/ssf/mysqloracletest/task/TMotorvehicleTask.java b/src/main/java/com/ssf/mysqloracletest/task/TMotorvehicleTask.java index fe873ca..1be97ec 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/TMotorvehicleTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/TMotorvehicleTask.java @@ -4,16 +4,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ssf.mysqloracletest.domain.BoneVehicle; import com.ssf.mysqloracletest.domain.TMotorvehicle; -import com.ssf.mysqloracletest.domain.TStrhEntityInfoKs; -import com.ssf.mysqloracletest.domain.TransitUserRecord; import com.ssf.mysqloracletest.domain.TransitVehicleRecord; +import com.ssf.mysqloracletest.service.BoneVehicleService; import com.ssf.mysqloracletest.service.TMotorvehicleService; import com.ssf.mysqloracletest.service.TransitVehicleRecordService; import com.ssf.mysqloracletest.utils.ConfigParam; import com.ssf.mysqloracletest.utils.StringKit; import lombok.RequiredArgsConstructor; -import org.checkerframework.checker.units.qual.C; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.Scheduled; @@ -34,8 +33,10 @@ public class TMotorvehicleTask { private final TransitVehicleRecordService vehicleRecordService; + private final BoneVehicleService boneVehicleService; + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); - String maxTime = "20231225000000"; + String maxTime = "20231226000000"; @Scheduled(initialDelay = 100, fixedDelay = 3000) public void setVehicleRecordService() { @@ -60,19 +61,24 @@ public class TMotorvehicleTask { calendar.setTime(maxDate); calendar.add(Calendar.DAY_OF_MONTH, 2); Date twoDaysAgo = calendar.getTime(); - - + String format = dateFormat.format(twoDaysAgo); LambdaQueryWrapper Wrapper = Wrappers.lambdaQuery(); Wrapper.gt(TMotorvehicle::getPasstime, maxTime); - Wrapper.le(TMotorvehicle::getPasstime, twoDaysAgo); + Wrapper.le(TMotorvehicle::getPasstime, format); int countTM = tMotorvehicleService.count(Wrapper); if (countTM > 0) { int count = countTM / 1000; + Page page = new Page<>( 1, 1000); for (int i = 0; i <= count; i++) { - Page page = new Page<>(i + 1, 1000); + page.setCurrent(i + 1); List resultList = tMotorvehicleService.page(page, Wrapper).getRecords(); for (TMotorvehicle Tmvehicle : resultList) { TransitVehicleRecord vehicleRecord = new TransitVehicleRecord(); + BoneVehicle one2 = boneVehicleService.lambdaQuery().eq(BoneVehicle::getNo, Tmvehicle.getPlateno()).one(); + if (one2 != null){ + vehicleRecord.setOwnerName(one2.getOwnerPersonName()); + vehicleRecord.setIdCard(one2.getOwnerPersonIdcard()); + } vehicleRecord.setDoorwayCode(Tmvehicle.getTollgateid()); vehicleRecord.setGbsChannelNo(Tmvehicle.getDeviceid()); vehicleRecord.setGlobalPic(Tmvehicle.getStorageurl1()); diff --git a/src/main/java/com/ssf/mysqloracletest/task/TStrhEntityInfoKsTask.java b/src/main/java/com/ssf/mysqloracletest/task/TStrhEntityInfoKsTask.java index f667936..08bedb7 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/TStrhEntityInfoKsTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/TStrhEntityInfoKsTask.java @@ -1,6 +1,7 @@ package com.ssf.mysqloracletest.task; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -9,6 +10,7 @@ import com.ssf.mysqloracletest.domain.TransitUserRecord; import com.ssf.mysqloracletest.service.TStrhEntityInfoKsService; import com.ssf.mysqloracletest.service.TransitUserRecordService; 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; @@ -21,6 +23,9 @@ import java.util.Calendar; import java.util.Date; import java.util.List; import java.util.TimeZone; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; /** @@ -51,8 +56,10 @@ public class TStrhEntityInfoKsTask { queryWrapper.orderByDesc(TransitUserRecord::getPartitionField); queryWrapper.last("LIMIT 1"); TransitUserRecord one = transitUserRecordService.getOne(queryWrapper); - Date partitionField = one.getPartitionField(); - maxTime = dateFormat.format(partitionField); + if (one != null){ + Date partitionField = one.getPartitionField(); + maxTime = dateFormat.format(partitionField); + } //将maxTime转换为Date对象 diff --git a/src/main/java/com/ssf/mysqloracletest/utils/ConfigParam.java b/src/main/java/com/ssf/mysqloracletest/utils/ConfigParam.java index 9e181f2..822e4cb 100644 --- a/src/main/java/com/ssf/mysqloracletest/utils/ConfigParam.java +++ b/src/main/java/com/ssf/mysqloracletest/utils/ConfigParam.java @@ -60,5 +60,8 @@ public class ConfigParam { public static String wsDownloadPicAreaStart = PropertiesUtil.queryPropertiesByKey("wsDownloadPicAreaStart"); public static String TStrhEntityInfoSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("TStrhEntityInfoSwitch")); + public static String DeleteOldSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("DeleteOldSwitch")); + public static String TMotorvehicleSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("TMotorvehicleSwitch")); + public static String DeleteOldVehicleSwtich = StringKit.toString(PropertiesUtil.queryPropertiesByKey("DeleteOldVehicleSwtich")); }