From 65b11a3eec101c8925c3fec4ba566fa893f3abee Mon Sep 17 00:00:00 2001 From: fengchunyu Date: Fri, 8 Dec 2023 19:49:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=9C=89=E4=BA=BA=E5=8F=A3=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mysqloracletest/task/AlarmInfoTask.java | 2 +- .../task/MetaActualUnitUserInfoTask.java | 2 +- .../task/MetaActualUserInfoTask.java | 2 +- .../task/MetaHandleAlarmTask.java | 2 +- .../task/MetaImpUserInfoTask.java | 2 +- .../task/RentalHousingTask.java | 2 +- .../mysqloracletest/task/UnitInfoTask.java | 2 +- .../mysqloracletest/task/VLgryGjxxTask.java | 146 ++++++++---------- .../mysqloracletest/task/VSwryGjxxTask.java | 12 -- src/main/resources/application.yml | 2 +- .../resources/mapper/VSySyrkMysqlMapper.xml | 3 +- 11 files changed, 75 insertions(+), 102 deletions(-) diff --git a/src/main/java/com/ssf/mysqloracletest/task/AlarmInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/AlarmInfoTask.java index 768eee5..aad22fe 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/AlarmInfoTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/AlarmInfoTask.java @@ -51,7 +51,7 @@ public class AlarmInfoTask { try { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.isNull("STATUS"); - Page page = new Page<>(1, 1000); + Page page = new Page<>(1, 200); List resultList = jjxxViewMysqlService.page(page, queryWrapper).getRecords(); CountDownLatch latch = new CountDownLatch(resultList.size()); diff --git a/src/main/java/com/ssf/mysqloracletest/task/MetaActualUnitUserInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/MetaActualUnitUserInfoTask.java index ed08f3b..a5a2f63 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/MetaActualUnitUserInfoTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/MetaActualUnitUserInfoTask.java @@ -43,7 +43,7 @@ public class MetaActualUnitUserInfoTask { try { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.isNull("status"); - Page page = new Page<>(1, 1000); + Page page = new Page<>(1, 200); List resultList = vSySydwCyryMysqlService.page(page, queryWrapper).getRecords(); CountDownLatch latch = new CountDownLatch(resultList.size()); diff --git a/src/main/java/com/ssf/mysqloracletest/task/MetaActualUserInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/MetaActualUserInfoTask.java index a5a3607..f61388b 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/MetaActualUserInfoTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/MetaActualUserInfoTask.java @@ -61,7 +61,7 @@ public class MetaActualUserInfoTask { try { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.isNull("status"); - Page page = new Page<>(1, 1000); + Page page = new Page<>(1, 200); List resultList = vSySyrkMysqlService.page(page, queryWrapper).getRecords(); logger.info("VSySyrkMysql size:" + resultList.size()); diff --git a/src/main/java/com/ssf/mysqloracletest/task/MetaHandleAlarmTask.java b/src/main/java/com/ssf/mysqloracletest/task/MetaHandleAlarmTask.java index 2200256..8994b12 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/MetaHandleAlarmTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/MetaHandleAlarmTask.java @@ -46,7 +46,7 @@ public class MetaHandleAlarmTask { try { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.isNull("status"); - Page page = new Page<>(1, 1000); + Page page = new Page<>(1, 200); List resultList = jcjCjxxViewMysqlService.page(page, queryWrapper).getRecords(); CountDownLatch latch = new CountDownLatch(resultList.size()); ExecutorService cjxxPool = Executors.newFixedThreadPool(5); diff --git a/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserInfoTask.java index c53c940..1ed702b 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserInfoTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserInfoTask.java @@ -46,7 +46,7 @@ public class MetaImpUserInfoTask { try { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.isNull("status"); - Page page = new Page<>(1, 1000); + Page page = new Page<>(1, 200); List resultList = zdryMysqlService.page(page, queryWrapper).getRecords(); for (ZhxfZdrygkRyjbxxViewMysql bean : resultList) { diff --git a/src/main/java/com/ssf/mysqloracletest/task/RentalHousingTask.java b/src/main/java/com/ssf/mysqloracletest/task/RentalHousingTask.java index 532928c..3f8578a 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/RentalHousingTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/RentalHousingTask.java @@ -39,7 +39,7 @@ public class RentalHousingTask { try { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.isNull("STATUS"); - Page page = new Page<>(1, 1000); + Page page = new Page<>(1, 200); List resultList = syfwMysqlService.page(page, queryWrapper).getRecords(); CountDownLatch latch = new CountDownLatch(resultList.size()); diff --git a/src/main/java/com/ssf/mysqloracletest/task/UnitInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/UnitInfoTask.java index 8119eda..72a73de 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/UnitInfoTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/UnitInfoTask.java @@ -49,7 +49,7 @@ public class UnitInfoTask { try { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.isNull("STATUS"); - Page page = new Page<>(1, 1000); + Page page = new Page<>(1, 200); List resultList = vSySydwMysqlService.page(page, queryWrapper).getRecords(); CountDownLatch latch = new CountDownLatch(resultList.size()); diff --git a/src/main/java/com/ssf/mysqloracletest/task/VLgryGjxxTask.java b/src/main/java/com/ssf/mysqloracletest/task/VLgryGjxxTask.java index 5fa3304..93fa66b 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/VLgryGjxxTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/VLgryGjxxTask.java @@ -23,9 +23,6 @@ import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; /** * 用户数据接入 @@ -87,90 +84,79 @@ public class VLgryGjxxTask { lgryMap.put("maxTime", currentFormattedDate); lgryMap.put("minTime", oneYearLaterFormattedDate); List list = vLgryGjxxOracleService.getLgryListByTime(lgryMap); - CountDownLatch latch = new CountDownLatch(list.size()); - - try { - for (VLgryGjxxOracle lgry : list) { - if ("10".equals(lgry.getYJLX())) { - TransitImpVehicleRecord transitImpVehicleRecord = new TransitImpVehicleRecord(); - transitImpVehicleRecord.setDeviceCode(lgry.getHDFSDDDM()); - transitImpVehicleRecord.setLongitude(NumKit.checkBigDecimal(lgry.getYJJDZB())); - transitImpVehicleRecord.setLatitude(NumKit.checkBigDecimal(lgry.getYJWDZB())); - transitImpVehicleRecord.setDeviceAddress(lgry.getHDFSDD()); - transitImpVehicleRecord.setOrientation(lgry.getVALUE7()); - transitImpVehicleRecord.setPlateNo(lgry.getVALUE2()); - transitImpVehicleRecord.setGlobalPic(lgry.getZPDT()); - transitImpVehicleRecord.setPlatePic(lgry.getZPXT()); - transitImpVehicleRecord.setUserPic(lgry.getRXURL()); - transitImpVehicleRecord.setOwnerName(lgry.getYJDXMC()); - transitImpVehicleRecord.setIdCard(lgry.getYJDXHM()); - transitImpVehicleRecord.setPassTime(NumKit.checkLong(lgry.getYJFBSJ())); - transitImpVehicleRecord.setPartitionField(dateFormat.parse(lgry.getYJFBSJ())); - transitImpVehicleRecord.setPoliceStationName(lgry.getVALUE8()); - transitImpVehicleRecord.setControlBasis(lgry.getVALUE9()); - transitImpVehicleRecord.setControlBasisNotes(lgry.getVALUE10()); - transitImpVehicleRecord.setImpUserTypeName("列管人员"); - TransitImpVehicleRecord one = transitImpVehicleRecordService.lambdaQuery().eq(TransitImpVehicleRecord::getGlobalPic, lgry.getZPDT()).one(); - if (one == null) { - boolean save = transitImpVehicleRecordService.save(transitImpVehicleRecord); - if (save) { - logger.info("Lgry-" + lgry.getYJXXID() + ":插入成功"); - } - } else { - UpdateWrapper transitImpVehicleRecordUpdateWrapper = new UpdateWrapper<>(); - transitImpVehicleRecordUpdateWrapper.eq("global_pic", lgry.getZPDT()); - boolean update = transitImpVehicleRecordService.update(transitImpVehicleRecord, transitImpVehicleRecordUpdateWrapper); - if (update) { - logger.info("Lgry-" + lgry.getYJXXID() + ":更新成功"); - } + try { + for (VLgryGjxxOracle lgry : list) { + if ("10".equals(lgry.getYJLX())) { + TransitImpVehicleRecord transitImpVehicleRecord = new TransitImpVehicleRecord(); + transitImpVehicleRecord.setDeviceCode(lgry.getHDFSDDDM()); + transitImpVehicleRecord.setLongitude(NumKit.checkBigDecimal(lgry.getYJJDZB())); + transitImpVehicleRecord.setLatitude(NumKit.checkBigDecimal(lgry.getYJWDZB())); + transitImpVehicleRecord.setDeviceAddress(lgry.getHDFSDD()); + transitImpVehicleRecord.setOrientation(lgry.getVALUE7()); + transitImpVehicleRecord.setPlateNo(lgry.getVALUE2()); + transitImpVehicleRecord.setGlobalPic(lgry.getZPDT()); + transitImpVehicleRecord.setPlatePic(lgry.getZPXT()); + transitImpVehicleRecord.setUserPic(lgry.getRXURL()); + transitImpVehicleRecord.setOwnerName(lgry.getYJDXMC()); + transitImpVehicleRecord.setIdCard(lgry.getYJDXHM()); + transitImpVehicleRecord.setPassTime(NumKit.checkLong(lgry.getYJFBSJ())); + transitImpVehicleRecord.setPartitionField(dateFormat.parse(lgry.getYJFBSJ())); + transitImpVehicleRecord.setPoliceStationName(lgry.getVALUE8()); + transitImpVehicleRecord.setControlBasis(lgry.getVALUE9()); + transitImpVehicleRecord.setControlBasisNotes(lgry.getVALUE10()); + transitImpVehicleRecord.setImpUserTypeName("列管人员"); + TransitImpVehicleRecord one = transitImpVehicleRecordService.lambdaQuery().eq(TransitImpVehicleRecord::getGlobalPic, lgry.getZPDT()).one(); + if (one == null) { + boolean save = transitImpVehicleRecordService.save(transitImpVehicleRecord); + if (save) { + logger.info("Lgry-" + lgry.getYJXXID() + ":插入成功"); + } + } else { + UpdateWrapper transitImpVehicleRecordUpdateWrapper = new UpdateWrapper<>(); + transitImpVehicleRecordUpdateWrapper.eq("global_pic", lgry.getZPDT()); + boolean update = transitImpVehicleRecordService.update(transitImpVehicleRecord, transitImpVehicleRecordUpdateWrapper); + if (update) { + logger.info("Lgry-" + lgry.getYJXXID() + ":更新成功"); } } - if ("09".equals(lgry.getYJLX())) { - TransitImpUserRecord transitImpUserRecord = new TransitImpUserRecord(); - transitImpUserRecord.setDeviceCode(lgry.getHDFSDDDM()); - transitImpUserRecord.setLongitude(NumKit.checkBigDecimal(lgry.getYJJDZB())); - transitImpUserRecord.setLatitude(NumKit.checkBigDecimal(lgry.getYJWDZB())); - transitImpUserRecord.setDeviceAddress(lgry.getHDFSDD()); - transitImpUserRecord.setGlobalPic(lgry.getZPDT()); - transitImpUserRecord.setUserPic(lgry.getZPXT()); - transitImpUserRecord.setSimilarity(lgry.getVALUE2()); - transitImpUserRecord.setOwnerName(lgry.getYJDXMC()); - transitImpUserRecord.setIdCard(lgry.getYJDXHM()); - transitImpUserRecord.setPassTime(NumKit.checkLong(lgry.getYJFBSJ())); - transitImpUserRecord.setPartitionField(dateFormat.parse(lgry.getYJFBSJ())); - transitImpUserRecord.setPoliceStationName(lgry.getVALUE8()); - transitImpUserRecord.setControlBasis(lgry.getVALUE9()); - transitImpUserRecord.setControlBasisNotes(lgry.getVALUE10()); - transitImpUserRecord.setImpUserTypeName("列管人员"); - TransitImpUserRecord one = transitImpUserRecordService.lambdaQuery().eq(TransitImpUserRecord::getGlobalPic, lgry.getZPDT()).one(); - if (one == null) { - boolean save = transitImpUserRecordService.save(transitImpUserRecord); - if (save) { - logger.info("Lgry-" + lgry.getYJXXID() + ":插入成功"); - } - } else { - UpdateWrapper transitImpUserRecordUpdateWrapper = new UpdateWrapper<>(); - transitImpUserRecordUpdateWrapper.eq("global_pic", lgry.getZPDT()); - boolean update = transitImpUserRecordService.update(transitImpUserRecord, transitImpUserRecordUpdateWrapper); - if (update) { - logger.info("Lgry-" + lgry.getYJXXID() + ":更新成功"); - } + } + if ("09".equals(lgry.getYJLX())) { + TransitImpUserRecord transitImpUserRecord = new TransitImpUserRecord(); + transitImpUserRecord.setDeviceCode(lgry.getHDFSDDDM()); + transitImpUserRecord.setLongitude(NumKit.checkBigDecimal(lgry.getYJJDZB())); + transitImpUserRecord.setLatitude(NumKit.checkBigDecimal(lgry.getYJWDZB())); + transitImpUserRecord.setDeviceAddress(lgry.getHDFSDD()); + transitImpUserRecord.setGlobalPic(lgry.getZPDT()); + transitImpUserRecord.setUserPic(lgry.getZPXT()); + transitImpUserRecord.setSimilarity(lgry.getVALUE2()); + transitImpUserRecord.setOwnerName(lgry.getYJDXMC()); + transitImpUserRecord.setIdCard(lgry.getYJDXHM()); + transitImpUserRecord.setPassTime(NumKit.checkLong(lgry.getYJFBSJ())); + transitImpUserRecord.setPartitionField(dateFormat.parse(lgry.getYJFBSJ())); + transitImpUserRecord.setPoliceStationName(lgry.getVALUE8()); + transitImpUserRecord.setControlBasis(lgry.getVALUE9()); + transitImpUserRecord.setControlBasisNotes(lgry.getVALUE10()); + transitImpUserRecord.setImpUserTypeName("列管人员"); + TransitImpUserRecord one = transitImpUserRecordService.lambdaQuery().eq(TransitImpUserRecord::getGlobalPic, lgry.getZPDT()).one(); + if (one == null) { + boolean save = transitImpUserRecordService.save(transitImpUserRecord); + if (save) { + logger.info("Lgry-" + lgry.getYJXXID() + ":插入成功"); + } + } else { + UpdateWrapper transitImpUserRecordUpdateWrapper = new UpdateWrapper<>(); + transitImpUserRecordUpdateWrapper.eq("global_pic", lgry.getZPDT()); + boolean update = transitImpUserRecordService.update(transitImpUserRecord, transitImpUserRecordUpdateWrapper); + if (update) { + logger.info("Lgry-" + lgry.getYJXXID() + ":更新成功"); } - } } - } catch (Exception e) { - logger.info("Lgrys:" + StringKit.getTrace(e)); - } - latch.countDown(); - - try { - // Wait for all threads to complete - latch.await(); - } catch (InterruptedException e) { - e.printStackTrace(); + } + } catch (Exception e) { + logger.info("Lgrys:" + StringKit.getTrace(e)); } } catch ( diff --git a/src/main/java/com/ssf/mysqloracletest/task/VSwryGjxxTask.java b/src/main/java/com/ssf/mysqloracletest/task/VSwryGjxxTask.java index 966cd8b..f91ed0c 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/VSwryGjxxTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/VSwryGjxxTask.java @@ -87,8 +87,6 @@ public class VSwryGjxxTask { SwryMap.put("maxTime", currentFormattedDate); SwryMap.put("minTime", oneYearLaterFormattedDate); List Swrys = vSySwryGjxxOracleService.getSwryListByTime(SwryMap); - CountDownLatch latch = new CountDownLatch(Swrys.size()); - try { for (VSwryGjxxOracle swry : Swrys) { if ("02".equals(swry.getGJLX())) { @@ -155,16 +153,6 @@ public class VSwryGjxxTask { } catch (Exception e) { logger.info("Swrys:" + StringKit.getTrace(e)); } - latch.countDown(); - - - try { - // Wait for all threads to complete - latch.await(); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } catch ( Exception e) { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 4994c83..1a89314 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1 +1 @@ -server: port: 1204 spring: datasource: dynamic: primary: mysql #设置默认的数据源或者数据源组,默认值即为master strict: false #设置严格模式,默认false不启动. 启动后再为匹配到指定数据源时候回抛出异常,不启动会使用默认数据源. datasource: oracleSydz: url: jdbc:mysql://121.41.91.94:12036/yhzafk?useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT&connectTimeout=150000 driver-class-name: com.mysql.cj.jdbc.Driver username: root password: '!QAZ1qaz' mysql: url: jdbc:mysql://121.41.91.94:12036/yhzafk?useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT&connectTimeout=150000 driver-class-name: com.mysql.cj.jdbc.Driver username: root password: '!QAZ1qaz' mybatis-plus: configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl mapper-locations: - classpath:mapper/*.xml mybatis: configuration: map-underscore-to-camel-case: true mapper-locations: mybatis/**/*Mapper.xml typeAliasesPackage: com.ssf.mysqloracletest.**.domain logging: level: root: info com.ssf.mysqloracletest: debug \ No newline at end of file +server: port: 1204 connection-timeout: 60000 spring: datasource: dynamic: primary: mysql #设置默认的数据源或者数据源组,默认值即为master strict: false #设置严格模式,默认false不启动. 启动后再为匹配到指定数据源时候回抛出异常,不启动会使用默认数据源. datasource: oracleSydz: url: jdbc:mysql://121.41.91.94:12036/yhzafk?useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT&connectTimeout=150000 driver-class-name: com.mysql.cj.jdbc.Driver username: root password: '!QAZ1qaz' mysql: url: jdbc:mysql://121.41.91.94:12036/yhzafk?useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT&connectTimeout=150000 driver-class-name: com.mysql.cj.jdbc.Driver username: root password: '!QAZ1qaz' hikari: max-pool-size: 100 min-idle: 5 connection-timeout: 60000 mybatis-plus: configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl mapper-locations: - classpath:mapper/*.xml mybatis: configuration: map-underscore-to-camel-case: true mapper-locations: mybatis/**/*Mapper.xml typeAliasesPackage: com.ssf.mysqloracletest.**.domain logging: level: root: info com.ssf.mysqloracletest: debug \ No newline at end of file diff --git a/src/main/resources/mapper/VSySyrkMysqlMapper.xml b/src/main/resources/mapper/VSySyrkMysqlMapper.xml index bef18c8..56ab791 100644 --- a/src/main/resources/mapper/VSySyrkMysqlMapper.xml +++ b/src/main/resources/mapper/VSySyrkMysqlMapper.xml @@ -55,8 +55,7 @@