fengchunyu
/
dataCompareSy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.JcjJjxxTask 和 AlarmInfoTask 会冲突，注销JcjJjxxTask

Browse Source 
2. 修改XXXService.update的语法错误
develop
Angel 10 months ago
parent 9ad736dfdb
commit 43af7a16f6
3 changed files with 120 additions and 118 deletions
Show Stats Download Patch File Download Diff File

5
src/main/java/com/ssf/mysqloracletest/task/AlarmInfoTask.java
Unescape View File

@ -1,6 +1,7 @@
package com.ssf.mysqloracletest.task; package com.ssf.mysqloracletest.task;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.JcjJjxxViewMysql;
import com.ssf.mysqloracletest.domain.MetaAlarmInfo; import com.ssf.mysqloracletest.domain.MetaAlarmInfo;
import com.ssf.mysqloracletest.service.JcjJjxxViewMysqlService; import com.ssf.mysqloracletest.service.JcjJjxxViewMysqlService;
@ -114,12 +115,12 @@ public class AlarmInfoTask {
alarmInfo.setLatitude(null); 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) { if (one == null) {
alarmInfoService.save(alarmInfo); alarmInfoService.save(alarmInfo);
logger.info("Njjxx-" + Njjxx.getJJBH() + ":插入成功"); logger.info("Njjxx-" + Njjxx.getJJBH() + ":插入成功");
} else { } else {
alarmInfoService.update(new QueryWrapper<>(alarmInfo)); alarmInfoService.update(alarmInfo,new UpdateWrapper<>(alarmInfo));
logger.info("Njjxx-" + Njjxx.getJJBH() + ":更新成功"); logger.info("Njjxx-" + Njjxx.getJJBH() + ":更新成功");
} }
} }

230
src/main/java/com/ssf/mysqloracletest/task/JcjJjxxTask.java
Unescape View File

@ -1,115 +1,115 @@
package com.ssf.mysqloracletest.task; //package com.ssf.mysqloracletest.task;
//
import com.ssf.mysqloracletest.domain.JcjJjxxViewMysql; //import com.ssf.mysqloracletest.domain.JcjJjxxViewMysql;
import com.ssf.mysqloracletest.domain.JcjJjxxViewOracle; //import com.ssf.mysqloracletest.domain.JcjJjxxViewOracle;
import com.ssf.mysqloracletest.service.JcjJjxxViewMysqlService; //import com.ssf.mysqloracletest.service.JcjJjxxViewMysqlService;
import com.ssf.mysqloracletest.service.JcjJjxxViewOracleService; //import com.ssf.mysqloracletest.service.JcjJjxxViewOracleService;
import com.ssf.mysqloracletest.utils.ConfigParam; //import com.ssf.mysqloracletest.utils.ConfigParam;
import com.ssf.mysqloracletest.utils.NumKit; //import com.ssf.mysqloracletest.utils.NumKit;
import com.ssf.mysqloracletest.utils.StringKit; //import com.ssf.mysqloracletest.utils.StringKit;
import org.slf4j.Logger; //import org.slf4j.Logger;
import org.slf4j.LoggerFactory; //import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils; //import org.springframework.beans.BeanUtils;
import org.springframework.scheduling.annotation.Scheduled; //import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; //import org.springframework.stereotype.Component;
//
import javax.annotation.Resource; //import javax.annotation.Resource;
import java.util.HashMap; //import java.util.HashMap;
import java.util.List; //import java.util.List;
import java.util.Map; //import java.util.Map;
import java.util.concurrent.CountDownLatch; //import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService; //import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; //import java.util.concurrent.Executors;
//
/** ///**
* 用户数据接入 // * 用户数据接入
*/ // */
@Component //@Component
public class JcjJjxxTask { //public class JcjJjxxTask {
//
private static final Logger logger = LoggerFactory.getLogger(JcjJjxxTask.class); // private static final Logger logger = LoggerFactory.getLogger(JcjJjxxTask.class);
//
@Resource // @Resource
private JcjJjxxViewMysqlService jcjJjxxViewMysqlService; // private JcjJjxxViewMysqlService jcjJjxxViewMysqlService;
//
@Resource // @Resource
private JcjJjxxViewOracleService jcjJjxxViewOracleService; // private JcjJjxxViewOracleService jcjJjxxViewOracleService;
//
final int oncesCounts = NumKit.checkInt(ConfigParam.oncesCounts) == 0 ? 1000 : NumKit.checkInt(ConfigParam.oncesCounts); // final int oncesCounts = NumKit.checkInt(ConfigParam.oncesCounts) == 0 ? 1000 : NumKit.checkInt(ConfigParam.oncesCounts);
//
private boolean JjxxTag = false; // private boolean JjxxTag = false;
//
/** // /**
* 连云港 对接海康平台获取人员基础数据 // * 连云港 对接海康平台获取人员基础数据
* // // * //
*/ // */
@Scheduled(initialDelay = 100, fixedDelay = 3000) // @Scheduled(initialDelay = 100, fixedDelay = 3000)
public void transJjxx() { // public void transJjxx() {
//
if (JjxxTag) { // if (JjxxTag) {
return; // return;
} // }
//
if (!"true".equals(ConfigParam.JjxxSwitch)) { // if (!"true".equals(ConfigParam.JjxxSwitch)) {
return; // return;
} // }
//
//
try { // try {
int countJjxx = jcjJjxxViewOracleService.countJjxx(); // int countJjxx = jcjJjxxViewOracleService.countJjxx();
logger.info("countJjxx:" + countJjxx); // logger.info("countJjxx:" + countJjxx);
//
logger.info("countJjxx:" + countJjxx); // logger.info("countJjxx:" + countJjxx);
if (countJjxx > 0) { // if (countJjxx > 0) {
//
JjxxTag = true; // JjxxTag = true;
//
int count = countJjxx / oncesCounts; // int count = countJjxx / oncesCounts;
CountDownLatch latch = new CountDownLatch(count); // CountDownLatch latch = new CountDownLatch(count);
ExecutorService JjxxPool = Executors.newFixedThreadPool(50); // ExecutorService JjxxPool = Executors.newFixedThreadPool(50);
//
for (int i = 0; i <= count; i++) { // for (int i = 0; i <= count; i++) {
Map JjxxMap = new HashMap(); // Map JjxxMap = new HashMap();
JjxxMap.put("rowStart", i * oncesCounts); // JjxxMap.put("rowStart", i * oncesCounts);
JjxxMap.put("rowEnd", (i + 1) * oncesCounts); // JjxxMap.put("rowEnd", (i + 1) * oncesCounts);
JjxxPool.submit(() -> { // JjxxPool.submit(() -> {
try { // try {
List<JcjJjxxViewOracle> Jjxxs = jcjJjxxViewOracleService.getJjxxList(JjxxMap); // List<JcjJjxxViewOracle> Jjxxs = jcjJjxxViewOracleService.getJjxxList(JjxxMap);
for (JcjJjxxViewOracle Jjxx : Jjxxs) { // for (JcjJjxxViewOracle Jjxx : Jjxxs) {
JcjJjxxViewMysql sBean = new JcjJjxxViewMysql(); // JcjJjxxViewMysql sBean = new JcjJjxxViewMysql();
BeanUtils.copyProperties(Jjxx, sBean); // BeanUtils.copyProperties(Jjxx, sBean);
//确定一个数据是否唯一 // //确定一个数据是否唯一
JcjJjxxViewMysql checkJjxx = jcjJjxxViewMysqlService.selectJcjJxxByJJBH(Jjxx.getJJBH()); // JcjJjxxViewMysql checkJjxx = jcjJjxxViewMysqlService.selectJcjJxxByJJBH(Jjxx.getJJBH());
if (checkJjxx == null) { // if (checkJjxx == null) {
jcjJjxxViewMysqlService.insertJjxx(sBean); // jcjJjxxViewMysqlService.insertJjxx(sBean);
logger.info("Jjxx-" + Jjxx.getJJBH() + ":插入成功"); // logger.info("Jjxx-" + Jjxx.getJJBH() + ":插入成功");
} else { // } else {
jcjJjxxViewMysqlService.updateJjxxByJJBH(sBean); // jcjJjxxViewMysqlService.updateJjxxByJJBH(sBean);
logger.info("Jjxx-" + Jjxx.getJJBH() + ":更新成功"); // logger.info("Jjxx-" + Jjxx.getJJBH() + ":更新成功");
} // }
} // }
} catch (Exception e) { // } catch (Exception e) {
logger.info("Jjxxs:" + StringKit.getTrace(e)); // logger.info("Jjxxs:" + StringKit.getTrace(e));
} // }
latch.countDown(); // latch.countDown();
}); // });
logger.info("JjxxMap数据总量:" + countJjxx + "," + "当前处理下标:" + JjxxMap.get("rowStart") + "/" + JjxxMap.get("rowEnd")); // logger.info("JjxxMap数据总量:" + countJjxx + "," + "当前处理下标:" + JjxxMap.get("rowStart") + "/" + JjxxMap.get("rowEnd"));
} // }
//
try { // try {
// Wait for all threads to complete // // Wait for all threads to complete
latch.await(); // latch.await();
} catch (InterruptedException e) { // } catch (InterruptedException e) {
e.printStackTrace(); // e.printStackTrace();
} // }
// 关闭线程池 // // 关闭线程池
JjxxPool.shutdown(); // JjxxPool.shutdown();
} // }
//
} catch (Exception e) { // } catch (Exception e) {
logger.info(StringKit.getTrace(e)); // logger.info(StringKit.getTrace(e));
} // }
} // }
//
//
} //}

3
src/main/java/com/ssf/mysqloracletest/task/UnitInfoTask.java
Unescape View File

@ -1,6 +1,7 @@
package com.ssf.mysqloracletest.task; package com.ssf.mysqloracletest.task;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.MetaActualUnitInfo;
import com.ssf.mysqloracletest.domain.VSySydwmMysql; import com.ssf.mysqloracletest.domain.VSySydwmMysql;
import com.ssf.mysqloracletest.service.MetaActualUnitInfoService; import com.ssf.mysqloracletest.service.MetaActualUnitInfoService;
@ -119,7 +120,7 @@ public class UnitInfoTask {
metaActualUnitInfoService.save(unitInfo); metaActualUnitInfoService.save(unitInfo);
logger.info("Nsydw-" + Nsydw.getID() + ":插入成功"); logger.info("Nsydw-" + Nsydw.getID() + ":插入成功");
} else { } else {
metaActualUnitInfoService.update(new QueryWrapper<>(unitInfo)); metaActualUnitInfoService.update(unitInfo,new UpdateWrapper<>(unitInfo));
logger.info("Nsydw-" + Nsydw.getID() + ":更新成功"); logger.info("Nsydw-" + Nsydw.getID() + ":更新成功");
} }
} }

Write Preview
Loading…
Cancel
Save