From 7644ac767f009d6faf3478f36107fbfff10f6391 Mon Sep 17 00:00:00 2001 From: hanrenchun Date: Fri, 8 Dec 2023 18:30:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=89=E7=A8=B3,=E5=88=97=E7=AE=A1=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E6=B8=85=E6=B4=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mysqloracletest/task/VLgryGjxxTask.java | 7 +- .../mysqloracletest/task/VSwryGjxxTask.java | 127 +++++++++--------- 2 files changed, 64 insertions(+), 70 deletions(-) diff --git a/src/main/java/com/ssf/mysqloracletest/task/VLgryGjxxTask.java b/src/main/java/com/ssf/mysqloracletest/task/VLgryGjxxTask.java index a5b8e92..5fa3304 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/VLgryGjxxTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/VLgryGjxxTask.java @@ -88,8 +88,7 @@ public class VLgryGjxxTask { lgryMap.put("minTime", oneYearLaterFormattedDate); List list = vLgryGjxxOracleService.getLgryListByTime(lgryMap); CountDownLatch latch = new CountDownLatch(list.size()); - ExecutorService LgryPool = Executors.newFixedThreadPool(5); - LgryPool.submit(() -> { + try { for (VLgryGjxxOracle lgry : list) { if ("10".equals(lgry.getYJLX())) { @@ -165,7 +164,7 @@ public class VLgryGjxxTask { logger.info("Lgrys:" + StringKit.getTrace(e)); } latch.countDown(); - }); + try { // Wait for all threads to complete @@ -173,8 +172,6 @@ public class VLgryGjxxTask { } catch (InterruptedException e) { e.printStackTrace(); } - // 关闭线程池 - LgryPool.shutdown(); } catch ( Exception e) { diff --git a/src/main/java/com/ssf/mysqloracletest/task/VSwryGjxxTask.java b/src/main/java/com/ssf/mysqloracletest/task/VSwryGjxxTask.java index 09f4ebf..966cd8b 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/VSwryGjxxTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/VSwryGjxxTask.java @@ -88,76 +88,75 @@ public class VSwryGjxxTask { SwryMap.put("minTime", oneYearLaterFormattedDate); List Swrys = vSySwryGjxxOracleService.getSwryListByTime(SwryMap); CountDownLatch latch = new CountDownLatch(Swrys.size()); - ExecutorService SwryPool = Executors.newFixedThreadPool(5); - SwryPool.submit(() -> { - try { - for (VSwryGjxxOracle swry : Swrys) { - if ("02".equals(swry.getGJLX())) { - TransitImpVehicleRecord transitImpVehicleRecord = new TransitImpVehicleRecord(); - transitImpVehicleRecord.setDeviceCode(swry.getVALUE3()); - transitImpVehicleRecord.setLongitude(NumKit.checkBigDecimal(swry.getJDZB())); - transitImpVehicleRecord.setLatitude(NumKit.checkBigDecimal(swry.getWDZB())); - transitImpVehicleRecord.setDeviceAddress(swry.getVALUE1()); - transitImpVehicleRecord.setPlateNo(swry.getVALUE2()); - transitImpVehicleRecord.setGlobalPic(swry.getVALUE5()); - transitImpVehicleRecord.setPlatePic(swry.getVALUE4()); - transitImpVehicleRecord.setOwnerName(swry.getZDRYXM()); - transitImpVehicleRecord.setIdCard(swry.getZDRYSFZH()); - transitImpVehicleRecord.setPassTime(NumKit.checkLong(swry.getGJSJ())); - transitImpVehicleRecord.setPartitionField(dateFormat.parse(swry.getGJSJ())); - transitImpVehicleRecord.setImpUserTypeName("涉稳人员"); - TransitImpVehicleRecord one = transitImpVehicleRecordService.lambdaQuery().eq(TransitImpVehicleRecord::getGlobalPic, swry.getVALUE5()).one(); - if (one == null) { - boolean save = transitImpVehicleRecordService.save(transitImpVehicleRecord); - if (save) { - logger.info("Swry-" + swry.getGJXXID() + ":插入成功"); - } - } else { - UpdateWrapper transitImpVehicleRecordUpdateWrapper = new UpdateWrapper<>(); - transitImpVehicleRecordUpdateWrapper.eq("global_pic", swry.getVALUE5()); - boolean update = transitImpVehicleRecordService.update(transitImpVehicleRecord, transitImpVehicleRecordUpdateWrapper); - if (update) { - logger.info("Swry-" + swry.getGJXXID() + ":更新成功"); - } + + try { + for (VSwryGjxxOracle swry : Swrys) { + if ("02".equals(swry.getGJLX())) { + TransitImpVehicleRecord transitImpVehicleRecord = new TransitImpVehicleRecord(); + transitImpVehicleRecord.setDeviceCode(swry.getVALUE3()); + transitImpVehicleRecord.setLongitude(NumKit.checkBigDecimal(swry.getJDZB())); + transitImpVehicleRecord.setLatitude(NumKit.checkBigDecimal(swry.getWDZB())); + transitImpVehicleRecord.setDeviceAddress(swry.getVALUE1()); + transitImpVehicleRecord.setPlateNo(swry.getVALUE2()); + transitImpVehicleRecord.setGlobalPic(swry.getVALUE5()); + transitImpVehicleRecord.setPlatePic(swry.getVALUE4()); + transitImpVehicleRecord.setOwnerName(swry.getZDRYXM()); + transitImpVehicleRecord.setIdCard(swry.getZDRYSFZH()); + transitImpVehicleRecord.setPassTime(NumKit.checkLong(swry.getGJSJ())); + transitImpVehicleRecord.setPartitionField(dateFormat.parse(swry.getGJSJ())); + transitImpVehicleRecord.setImpUserTypeName("涉稳人员"); + TransitImpVehicleRecord one = transitImpVehicleRecordService.lambdaQuery().eq(TransitImpVehicleRecord::getGlobalPic, swry.getVALUE5()).one(); + if (one == null) { + boolean save = transitImpVehicleRecordService.save(transitImpVehicleRecord); + if (save) { + logger.info("Swry-" + swry.getGJXXID() + ":插入成功"); + } + } else { + UpdateWrapper transitImpVehicleRecordUpdateWrapper = new UpdateWrapper<>(); + transitImpVehicleRecordUpdateWrapper.eq("global_pic", swry.getVALUE5()); + boolean update = transitImpVehicleRecordService.update(transitImpVehicleRecord, transitImpVehicleRecordUpdateWrapper); + if (update) { + logger.info("Swry-" + swry.getGJXXID() + ":更新成功"); } } - if ("03".equals(swry.getGJLX())) { - TransitImpUserRecord transitImpUserRecord = new TransitImpUserRecord(); - transitImpUserRecord.setDeviceCode(swry.getVALUE6()); - transitImpUserRecord.setLongitude(NumKit.checkBigDecimal(swry.getJDZB())); - transitImpUserRecord.setLatitude(NumKit.checkBigDecimal(swry.getWDZB())); - transitImpUserRecord.setDeviceAddress(swry.getVALUE1()); - transitImpUserRecord.setGlobalPic(swry.getVALUE4()); - transitImpUserRecord.setUserPic(swry.getVALUE3()); - transitImpUserRecord.setSimilarity(swry.getVALUE2()); - transitImpUserRecord.setOwnerName(swry.getZDRYXM()); - transitImpUserRecord.setIdCard(swry.getZDRYSFZH()); - transitImpUserRecord.setPassTime(NumKit.checkLong(swry.getGJSJ())); - transitImpUserRecord.setPartitionField(dateFormat.parse(swry.getGJSJ())); - transitImpUserRecord.setImpUserTypeName("涉稳人员"); - TransitImpUserRecord one = transitImpUserRecordService.lambdaQuery().eq(TransitImpUserRecord::getGlobalPic, swry.getVALUE4()).one(); - if (one == null) { - boolean save = transitImpUserRecordService.save(transitImpUserRecord); - if (save) { - logger.info("Swry-" + swry.getGJXXID() + ":插入成功"); - } - } else { - UpdateWrapper transitImpUserRecordUpdateWrapper = new UpdateWrapper<>(); - transitImpUserRecordUpdateWrapper.eq("global_pic", swry.getVALUE4()); - boolean update = transitImpUserRecordService.update(transitImpUserRecord, transitImpUserRecordUpdateWrapper); - if (update) { - logger.info("Swry-" + swry.getGJXXID() + ":更新成功"); - } + } + if ("03".equals(swry.getGJLX())) { + TransitImpUserRecord transitImpUserRecord = new TransitImpUserRecord(); + transitImpUserRecord.setDeviceCode(swry.getVALUE6()); + transitImpUserRecord.setLongitude(NumKit.checkBigDecimal(swry.getJDZB())); + transitImpUserRecord.setLatitude(NumKit.checkBigDecimal(swry.getWDZB())); + transitImpUserRecord.setDeviceAddress(swry.getVALUE1()); + transitImpUserRecord.setGlobalPic(swry.getVALUE4()); + transitImpUserRecord.setUserPic(swry.getVALUE3()); + transitImpUserRecord.setSimilarity(swry.getVALUE2()); + transitImpUserRecord.setOwnerName(swry.getZDRYXM()); + transitImpUserRecord.setIdCard(swry.getZDRYSFZH()); + transitImpUserRecord.setPassTime(NumKit.checkLong(swry.getGJSJ())); + transitImpUserRecord.setPartitionField(dateFormat.parse(swry.getGJSJ())); + transitImpUserRecord.setImpUserTypeName("涉稳人员"); + TransitImpUserRecord one = transitImpUserRecordService.lambdaQuery().eq(TransitImpUserRecord::getGlobalPic, swry.getVALUE4()).one(); + if (one == null) { + boolean save = transitImpUserRecordService.save(transitImpUserRecord); + if (save) { + logger.info("Swry-" + swry.getGJXXID() + ":插入成功"); + } + } else { + UpdateWrapper transitImpUserRecordUpdateWrapper = new UpdateWrapper<>(); + transitImpUserRecordUpdateWrapper.eq("global_pic", swry.getVALUE4()); + boolean update = transitImpUserRecordService.update(transitImpUserRecord, transitImpUserRecordUpdateWrapper); + if (update) { + logger.info("Swry-" + swry.getGJXXID() + ":更新成功"); } - } } - } catch (Exception e) { - logger.info("Swrys:" + StringKit.getTrace(e)); + } - latch.countDown(); - }); + } catch (Exception e) { + logger.info("Swrys:" + StringKit.getTrace(e)); + } + latch.countDown(); + try { // Wait for all threads to complete @@ -165,8 +164,6 @@ public class VSwryGjxxTask { } catch (InterruptedException e) { e.printStackTrace(); } - // 关闭线程池 - SwryPool.shutdown(); } catch (