From 43af7a16f636d0d80d4c60300750fd04ce65c14d Mon Sep 17 00:00:00 2001 From: Angel <1050374295@qq.com> Date: Sat, 2 Dec 2023 10:18:26 +0800 Subject: [PATCH] =?UTF-8?q?1.JcjJjxxTask=20=E5=92=8C=20AlarmInfoTask=20?= =?UTF-8?q?=E4=BC=9A=E5=86=B2=E7=AA=81=EF=BC=8C=E6=B3=A8=E9=94=80JcjJjxxTa?= =?UTF-8?q?sk=202.=20=E4=BF=AE=E6=94=B9XXXService.update=E7=9A=84=E8=AF=AD?= =?UTF-8?q?=E6=B3=95=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mysqloracletest/task/AlarmInfoTask.java | 5 +- .../ssf/mysqloracletest/task/JcjJjxxTask.java | 230 +++++++++--------- .../mysqloracletest/task/UnitInfoTask.java | 3 +- 3 files changed, 120 insertions(+), 118 deletions(-) diff --git a/src/main/java/com/ssf/mysqloracletest/task/AlarmInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/AlarmInfoTask.java index 89b946d..04a57f8 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/AlarmInfoTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/AlarmInfoTask.java @@ -1,6 +1,7 @@ package com.ssf.mysqloracletest.task; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.ssf.mysqloracletest.domain.JcjJjxxViewMysql; import com.ssf.mysqloracletest.domain.MetaAlarmInfo; import com.ssf.mysqloracletest.service.JcjJjxxViewMysqlService; @@ -114,12 +115,12 @@ public class AlarmInfoTask { alarmInfo.setLatitude(null); } //确定一个数据是否唯一 - MetaAlarmInfo one = alarmInfoService.lambdaQuery().eq(MetaAlarmInfo::getId, Njjxx.getJJBH()).one(); + MetaAlarmInfo one = alarmInfoService.lambdaQuery().eq(MetaAlarmInfo::getAlarmCode, Njjxx.getJJBH()).one(); if (one == null) { alarmInfoService.save(alarmInfo); logger.info("Njjxx-" + Njjxx.getJJBH() + ":插入成功"); } else { - alarmInfoService.update(new QueryWrapper<>(alarmInfo)); + alarmInfoService.update(alarmInfo,new UpdateWrapper<>(alarmInfo)); logger.info("Njjxx-" + Njjxx.getJJBH() + ":更新成功"); } } diff --git a/src/main/java/com/ssf/mysqloracletest/task/JcjJjxxTask.java b/src/main/java/com/ssf/mysqloracletest/task/JcjJjxxTask.java index 9cc2e0b..bcffce9 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/JcjJjxxTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/JcjJjxxTask.java @@ -1,115 +1,115 @@ -package com.ssf.mysqloracletest.task; - -import com.ssf.mysqloracletest.domain.JcjJjxxViewMysql; -import com.ssf.mysqloracletest.domain.JcjJjxxViewOracle; -import com.ssf.mysqloracletest.service.JcjJjxxViewMysqlService; -import com.ssf.mysqloracletest.service.JcjJjxxViewOracleService; -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; -import org.springframework.beans.BeanUtils; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -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; - -/** - * 用户数据接入 - */ -@Component -public class JcjJjxxTask { - - private static final Logger logger = LoggerFactory.getLogger(JcjJjxxTask.class); - - @Resource - private JcjJjxxViewMysqlService jcjJjxxViewMysqlService; - - @Resource - private JcjJjxxViewOracleService jcjJjxxViewOracleService; - - final int oncesCounts = NumKit.checkInt(ConfigParam.oncesCounts) == 0 ? 1000 : NumKit.checkInt(ConfigParam.oncesCounts); - - private boolean JjxxTag = false; - - /** - * 连云港 对接海康平台获取人员基础数据 - * // - */ - @Scheduled(initialDelay = 100, fixedDelay = 3000) - public void transJjxx() { - - if (JjxxTag) { - return; - } - - if (!"true".equals(ConfigParam.JjxxSwitch)) { - return; - } - - - try { - int countJjxx = jcjJjxxViewOracleService.countJjxx(); - logger.info("countJjxx:" + countJjxx); - - logger.info("countJjxx:" + countJjxx); - if (countJjxx > 0) { - - JjxxTag = true; - - int count = countJjxx / oncesCounts; - CountDownLatch latch = new CountDownLatch(count); - ExecutorService JjxxPool = Executors.newFixedThreadPool(50); - - for (int i = 0; i <= count; i++) { - Map JjxxMap = new HashMap(); - JjxxMap.put("rowStart", i * oncesCounts); - JjxxMap.put("rowEnd", (i + 1) * oncesCounts); - JjxxPool.submit(() -> { - try { - List Jjxxs = jcjJjxxViewOracleService.getJjxxList(JjxxMap); - for (JcjJjxxViewOracle Jjxx : Jjxxs) { - JcjJjxxViewMysql sBean = new JcjJjxxViewMysql(); - BeanUtils.copyProperties(Jjxx, sBean); - //确定一个数据是否唯一 - JcjJjxxViewMysql checkJjxx = jcjJjxxViewMysqlService.selectJcjJxxByJJBH(Jjxx.getJJBH()); - if (checkJjxx == null) { - jcjJjxxViewMysqlService.insertJjxx(sBean); - logger.info("Jjxx-" + Jjxx.getJJBH() + ":插入成功"); - } else { - jcjJjxxViewMysqlService.updateJjxxByJJBH(sBean); - logger.info("Jjxx-" + Jjxx.getJJBH() + ":更新成功"); - } - } - } catch (Exception e) { - logger.info("Jjxxs:" + StringKit.getTrace(e)); - } - latch.countDown(); - }); - logger.info("JjxxMap数据总量:" + countJjxx + "," + "当前处理下标:" + JjxxMap.get("rowStart") + "/" + JjxxMap.get("rowEnd")); - } - - try { - // Wait for all threads to complete - latch.await(); - } catch (InterruptedException e) { - e.printStackTrace(); - } - // 关闭线程池 - JjxxPool.shutdown(); - } - - } catch (Exception e) { - logger.info(StringKit.getTrace(e)); - } - } - - -} +//package com.ssf.mysqloracletest.task; +// +//import com.ssf.mysqloracletest.domain.JcjJjxxViewMysql; +//import com.ssf.mysqloracletest.domain.JcjJjxxViewOracle; +//import com.ssf.mysqloracletest.service.JcjJjxxViewMysqlService; +//import com.ssf.mysqloracletest.service.JcjJjxxViewOracleService; +//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; +//import org.springframework.beans.BeanUtils; +//import org.springframework.scheduling.annotation.Scheduled; +//import org.springframework.stereotype.Component; +// +//import javax.annotation.Resource; +//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; +// +///** +// * 用户数据接入 +// */ +//@Component +//public class JcjJjxxTask { +// +// private static final Logger logger = LoggerFactory.getLogger(JcjJjxxTask.class); +// +// @Resource +// private JcjJjxxViewMysqlService jcjJjxxViewMysqlService; +// +// @Resource +// private JcjJjxxViewOracleService jcjJjxxViewOracleService; +// +// final int oncesCounts = NumKit.checkInt(ConfigParam.oncesCounts) == 0 ? 1000 : NumKit.checkInt(ConfigParam.oncesCounts); +// +// private boolean JjxxTag = false; +// +// /** +// * 连云港 对接海康平台获取人员基础数据 +// * // +// */ +// @Scheduled(initialDelay = 100, fixedDelay = 3000) +// public void transJjxx() { +// +// if (JjxxTag) { +// return; +// } +// +// if (!"true".equals(ConfigParam.JjxxSwitch)) { +// return; +// } +// +// +// try { +// int countJjxx = jcjJjxxViewOracleService.countJjxx(); +// logger.info("countJjxx:" + countJjxx); +// +// logger.info("countJjxx:" + countJjxx); +// if (countJjxx > 0) { +// +// JjxxTag = true; +// +// int count = countJjxx / oncesCounts; +// CountDownLatch latch = new CountDownLatch(count); +// ExecutorService JjxxPool = Executors.newFixedThreadPool(50); +// +// for (int i = 0; i <= count; i++) { +// Map JjxxMap = new HashMap(); +// JjxxMap.put("rowStart", i * oncesCounts); +// JjxxMap.put("rowEnd", (i + 1) * oncesCounts); +// JjxxPool.submit(() -> { +// try { +// List Jjxxs = jcjJjxxViewOracleService.getJjxxList(JjxxMap); +// for (JcjJjxxViewOracle Jjxx : Jjxxs) { +// JcjJjxxViewMysql sBean = new JcjJjxxViewMysql(); +// BeanUtils.copyProperties(Jjxx, sBean); +// //确定一个数据是否唯一 +// JcjJjxxViewMysql checkJjxx = jcjJjxxViewMysqlService.selectJcjJxxByJJBH(Jjxx.getJJBH()); +// if (checkJjxx == null) { +// jcjJjxxViewMysqlService.insertJjxx(sBean); +// logger.info("Jjxx-" + Jjxx.getJJBH() + ":插入成功"); +// } else { +// jcjJjxxViewMysqlService.updateJjxxByJJBH(sBean); +// logger.info("Jjxx-" + Jjxx.getJJBH() + ":更新成功"); +// } +// } +// } catch (Exception e) { +// logger.info("Jjxxs:" + StringKit.getTrace(e)); +// } +// latch.countDown(); +// }); +// logger.info("JjxxMap数据总量:" + countJjxx + "," + "当前处理下标:" + JjxxMap.get("rowStart") + "/" + JjxxMap.get("rowEnd")); +// } +// +// try { +// // Wait for all threads to complete +// latch.await(); +// } catch (InterruptedException e) { +// e.printStackTrace(); +// } +// // 关闭线程池 +// JjxxPool.shutdown(); +// } +// +// } catch (Exception e) { +// logger.info(StringKit.getTrace(e)); +// } +// } +// +// +//} diff --git a/src/main/java/com/ssf/mysqloracletest/task/UnitInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/UnitInfoTask.java index 99e818c..9b1ea70 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/UnitInfoTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/UnitInfoTask.java @@ -1,6 +1,7 @@ package com.ssf.mysqloracletest.task; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.ssf.mysqloracletest.domain.MetaActualUnitInfo; import com.ssf.mysqloracletest.domain.VSySydwmMysql; import com.ssf.mysqloracletest.service.MetaActualUnitInfoService; @@ -119,7 +120,7 @@ public class UnitInfoTask { metaActualUnitInfoService.save(unitInfo); logger.info("Nsydw-" + Nsydw.getID() + ":插入成功"); } else { - metaActualUnitInfoService.update(new QueryWrapper<>(unitInfo)); + metaActualUnitInfoService.update(unitInfo,new UpdateWrapper<>(unitInfo)); logger.info("Nsydw-" + Nsydw.getID() + ":更新成功"); } }