From d0d838b7be830e616f35948a681948bd7c271898 Mon Sep 17 00:00:00 2001 From: Angel <1050374295@qq.com> Date: Sun, 28 Jan 2024 15:02:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=8B=E9=98=9F=E8=AE=A9=E5=90=8E=E5=8A=A0?= =?UTF-8?q?=E7=9A=84=E9=87=8D=E7=82=B9=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/MetaImpUserModelInfo.java | 4 +- .../mysqloracletest/domain/SwzdryView.java | 162 +++++++++++++++++- .../domain/vo/DevopsVideoInfoVo.java | 3 +- .../mapper/SwzdryViewMapper.java | 2 + .../impl/DevopsVideoInfoServiceImpl.java | 1 - .../service/impl/SwzdryViewServiceImpl.java | 2 +- .../task/MetaImpUserInfoTask.java | 1 - .../task/MetaImpUserModelInfoTask.java | 4 +- .../mysqloracletest/task/SlryOracleTask.java | 10 +- .../task/TMotorvehicleTask.java | 12 +- .../task/TStrhEntityInfoKsTask.java | 5 - .../ssf/mysqloracletest/task/TjksbglTask.java | 4 - .../mysqloracletest/task/VLgryGjxxTask.java | 1 - 13 files changed, 181 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/ssf/mysqloracletest/domain/MetaImpUserModelInfo.java b/src/main/java/com/ssf/mysqloracletest/domain/MetaImpUserModelInfo.java index 92ee8c8..164f01a 100644 --- a/src/main/java/com/ssf/mysqloracletest/domain/MetaImpUserModelInfo.java +++ b/src/main/java/com/ssf/mysqloracletest/domain/MetaImpUserModelInfo.java @@ -47,12 +47,12 @@ public class MetaImpUserModelInfo implements Serializable { /** * ???????????? */ - private BigDecimal longitude; + private String longitude; /** * ?????????γ? */ - private BigDecimal latitude; + private String latitude; /** * ?????ʱ? diff --git a/src/main/java/com/ssf/mysqloracletest/domain/SwzdryView.java b/src/main/java/com/ssf/mysqloracletest/domain/SwzdryView.java index d82e9ab..8694aca 100644 --- a/src/main/java/com/ssf/mysqloracletest/domain/SwzdryView.java +++ b/src/main/java/com/ssf/mysqloracletest/domain/SwzdryView.java @@ -1,89 +1,249 @@ package com.ssf.mysqloracletest.domain; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.io.Serializable; @Data -public class SwzdryView implements Serializable { +@TableName(value ="SYX_JWSZPT.ZHXF_ZDRYGK_SWZDRY_YJXX") +public class SwzdryView{ + @TableField(value = "ZDRYYJXXID") private String ZDRYYJXXID; + @TableField(value = "DTXXLB") private String DTXXLB; + + @TableField(value = "ZDRYXXID") private String ZDRYXXID; + + @TableField(value = "ZDRYLBBJ") private String ZDRYLBBJ; + + @TableField(value = "ZDRYXL") private String ZDRYXL; + + @TableField(value = "ZDRYXM") private String ZDRYXM; + + @TableField(value = "ZDRYSFZH") private String ZDRYSFZH; + + @TableField(value = "HDFSSJ") private String HDFSSJ; + + @TableField(value = "HDFSDQH") private String HDFSDQH; + + @TableField(value = "HDFSDXZ") private String HDFSDXZ; + + @TableField(value = "HDFSCSMC") private String HDFSCSMC; + + @TableField(value = "HDFSCSDM") private String HDFSCSDM; + + @TableField(value = "HDFSDSSGAJGDM") private String HDFSDSSGAJGDM; + + @TableField(value = "HDFSDSSGAJGMC") private String HDFSDSSGAJGMC; + + @TableField(value = "HDXGXX") private String HDXGXX; + + @TableField(value = "YJJSDWMC") private String YJJSDWMC; + + @TableField(value = "YJJSDW") private String YJJSDW; + + @TableField(value = "YJJSMJ") private String YJJSMJ; + + @TableField(value = "YJJSMJSFZH") private String YJJSMJSFZH; + + @TableField(value = "YJFBSJ") private String YJFBSJ; + + @TableField(value = "QSZT") private String QSZT; + + @TableField(value = "FKZT") private String FKZT; + + @TableField(value = "KEY1") private String KEY1; + + @TableField(value = "VALUE1") private String VALUE1; + + @TableField(value = "KEY2") private String KEY2; + + @TableField(value = "VALUE2") private String VALUE2; + + @TableField(value = "KEY3") private String KEY3; + + @TableField(value = "VALUE3") private String VALUE3; + + @TableField(value = "KEY4") private String KEY4; + + @TableField(value = "VALUE4") private String VALUE4; + + @TableField(value = "KEY5") private String KEY5; + + @TableField(value = "VALUE5") private String VALUE5; + + @TableField(value = "KEY6") private String KEY6; + + @TableField(value = "VALUE6") private String VALUE6; + + @TableField(value = "KEY7") private String KEY7; + + @TableField(value = "VALUE7") private String VALUE7; + + @TableField(value = "KEY8") private String KEY8; + + @TableField(value = "VALUE8") private String VALUE8; + + @TableField(value = "KEY9") private String KEY9; + + @TableField(value = "VALUE9") private String VALUE9; + + @TableField(value = "KEY10") private String KEY10; + + @TableField(value = "VALUE10") private String VALUE10; + + @TableField(value = "KEY11") private String KEY11; + + @TableField(value = "VALUE11") private String VALUE11; + + @TableField(value = "KEY12") private String KEY12; + + @TableField(value = "VALUE12") private String VALUE12; + + @TableField(value = "KEY13") private String KEY13; + + @TableField(value = "VALUE13") private String VALUE13; + + @TableField(value = "KEY14") private String KEY14; + + @TableField(value = "VALUE14") private String VALUE14; + + @TableField(value = "KEY15") private String KEY15; + + @TableField(value = "VALUE15") private String VALUE15; + + @TableField(value = "KEY16") private String KEY16; + + @TableField(value = "VALUE16") private String VALUE16; + + @TableField(value = "HDFSDJDZB") private String HDFSDJDZB; + + @TableField(value = "HDFSDWDZB") private String HDFSDWDZB; + + @TableField(value = "SFXF") private String SFXF; + + @TableField(value = "XFGZYQ") private String XFGZYQ; + + @TableField(value = "XFRXM") private String XFRXM; + + @TableField(value = "XFRSFZH") private String XFRSFZH; + + @TableField(value = "XFRDWDM") private String XFRDWDM; + + @TableField(value = "XFRDWMC") private String XFRDWMC; + + @TableField(value = "XFSJ") private String XFSJ; + + @TableField(value = "SFDW") private String SFDW; + + @TableField(value = "DXFS") private String DXFS; + + @TableField(value = "DXFSNR") private String DXFSNR; + + @TableField(value = "KS_HDFSDJDZB") private String KS_HDFSDJDZB; + + @TableField(value = "KS_HDFSDWDZB") private String KS_HDFSDWDZB; + + @TableField(value = "KS_HDFSDQH") private String KS_HDFSDQH; + @TableField(value = "DXFSZD") private String DXFSZD; + + @TableField(value = "CZJG") private String CZJG; + + @TableField(value = "VALUE19") private String VALUE19; + + @TableField(value = "SFFHBFRY") private String SFFHBFRY; + + @TableField(value = "VALUE20") private String VALUE20; + + @TableField(value = "DXFSZALD") private String DXFSZALD; + + @TableField(value = "DXFSXFLD") private String DXFSXFLD; + + @TableField(value = "DXFSZYLD") private String DXFSZYLD; + + @TableField(value = "DXFSPCSLD") private String DXFSPCSLD; + + @TableField(value = "DXFSZJLD") private String DXFSZJLD; + + @TableField(value = "SFZDDW") private String SFZDDW; } diff --git a/src/main/java/com/ssf/mysqloracletest/domain/vo/DevopsVideoInfoVo.java b/src/main/java/com/ssf/mysqloracletest/domain/vo/DevopsVideoInfoVo.java index e9decac..8686395 100644 --- a/src/main/java/com/ssf/mysqloracletest/domain/vo/DevopsVideoInfoVo.java +++ b/src/main/java/com/ssf/mysqloracletest/domain/vo/DevopsVideoInfoVo.java @@ -1,6 +1,7 @@ package com.ssf.mysqloracletest.domain.vo; -import com.ssf.mysqloracletest.domain.BaseEntity; + +import com.ssf.mysqloracletest.core.model.BaseEntity; import lombok.Data; /** diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/SwzdryViewMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/SwzdryViewMapper.java index ffa9fd6..920fe88 100644 --- a/src/main/java/com/ssf/mysqloracletest/mapper/SwzdryViewMapper.java +++ b/src/main/java/com/ssf/mysqloracletest/mapper/SwzdryViewMapper.java @@ -2,6 +2,8 @@ package com.ssf.mysqloracletest.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ssf.mysqloracletest.domain.SwzdryView; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface SwzdryViewMapper extends BaseMapper { } diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/DevopsVideoInfoServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/DevopsVideoInfoServiceImpl.java index a046c6c..aa86556 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/DevopsVideoInfoServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/DevopsVideoInfoServiceImpl.java @@ -21,7 +21,6 @@ import com.ssf.mysqloracletest.utils.JsoupUtils; import com.ssf.mysqloracletest.utils.NumKit; import com.ssf.mysqloracletest.utils.PropertiesUtil; import com.ssf.mysqloracletest.utils.StringKit; -import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/SwzdryViewServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/SwzdryViewServiceImpl.java index 934a0a6..7949c14 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/SwzdryViewServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/SwzdryViewServiceImpl.java @@ -8,6 +8,6 @@ import com.ssf.mysqloracletest.service.SwzdryViewService; import org.springframework.stereotype.Service; @Service -@DS("postgreUser") +@DS("oracleSydz") public class SwzdryViewServiceImpl extends ServiceImpl implements SwzdryViewService { } diff --git a/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserInfoTask.java index 322be0a..8d6f757 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserInfoTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserInfoTask.java @@ -62,7 +62,6 @@ public class MetaImpUserInfoTask { private void cleanImpUser(ZhxfZdrygkRyjbxxViewMysql bean) { ZhxfZdrygkRyjbxxViewMysql beanCp = new ZhxfZdrygkRyjbxxViewMysql(); try { - VillageActualUserInfo userInfoPara = new VillageActualUserInfo(); userInfoPara.setIdcard(StringKit.toString(beanCp.getZJHM())); List actualUserInfos = actualUserInfoService.selectVillageActualUserInfoListLimit1(userInfoPara); diff --git a/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserModelInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserModelInfoTask.java index e683cd6..0a79525 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserModelInfoTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserModelInfoTask.java @@ -60,8 +60,8 @@ public class MetaImpUserModelInfoTask { modelInfo.setImpUserSubType(Info.getZDRYXL()); modelInfo.setImpUserName(Info.getZDRYXM()); modelInfo.setImpUserIdCard(Info.getZDRYSFZH()); - modelInfo.setLongitude(new BigDecimal(Info.getHDFSDJDZB())); - modelInfo.setLatitude(new BigDecimal(Info.getHDFSDWDZB())); + modelInfo.setLongitude(Info.getHDFSDJDZB()); + modelInfo.setLatitude(Info.getHDFSDWDZB()); modelInfo.setActivityTime(Info.getHDFSSJ()); modelInfo.setActivityDeviceAddress(Info.getHDFSCSDM()); modelInfo.setActivityDeviceCode(Info.getHDFSCSDM()); diff --git a/src/main/java/com/ssf/mysqloracletest/task/SlryOracleTask.java b/src/main/java/com/ssf/mysqloracletest/task/SlryOracleTask.java index 8149d1e..d4ac777 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/SlryOracleTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/SlryOracleTask.java @@ -86,23 +86,23 @@ public class SlryOracleTask { if (one == null) { boolean save = huntersInfoService.save(metaHuntersInfo); if (save) { - logger.info("Swry-" + slry.getZJHM() + ":插入成功"); + logger.info("slry-" + slry.getZJHM() + ":插入成功"); } } else { UpdateWrapper wrapper = new UpdateWrapper<>(); wrapper.eq("id_card", slry.getZJHM()); boolean update = huntersInfoService.update(metaHuntersInfo, wrapper); if (update) { - logger.info("Swry-" + slry.getZJHM() + ":更新成功"); + logger.info("slry-" + slry.getZJHM() + ":更新成功"); } } } } catch (Exception e) { - logger.info("cjxxs:" + e.getMessage()); + logger.info("slry:" + e.getMessage()); } latch.countDown(); }); - logger.info("cjxxMap数据总量:" + countSlry + "," + "当前处理下标:" + slryMap.get("rowStart") + "/" + slryMap.get("rowEnd")); + logger.info("slryMap数据总量:" + countSlry + "," + "当前处理下标:" + slryMap.get("rowStart") + "/" + slryMap.get("rowEnd")); } try { @@ -118,6 +118,8 @@ public class SlryOracleTask { logger.info(StringKit.getTrace(e)); } } + + } diff --git a/src/main/java/com/ssf/mysqloracletest/task/TMotorvehicleTask.java b/src/main/java/com/ssf/mysqloracletest/task/TMotorvehicleTask.java index 266615b..4fba1be 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/TMotorvehicleTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/TMotorvehicleTask.java @@ -3,7 +3,6 @@ package com.ssf.mysqloracletest.task; 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.TransitVehicleRecord; @@ -67,10 +66,10 @@ public class TMotorvehicleTask { 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.setCurrent(i + 1); + //int count = countTM / 1000; + //Page page = new Page<>( 1, 1000); + //for (int i = 0; i <= count; i++) { + //page.setCurrent(i + 1); List resultList = tMotorvehicleService.list(Wrapper); for (TMotorvehicle Tmvehicle : resultList) { TransitVehicleRecord vehicleRecord = new TransitVehicleRecord(); @@ -107,7 +106,6 @@ public class TMotorvehicleTask { } } } -// } } } catch ( Exception e @@ -141,7 +139,7 @@ public class TMotorvehicleTask { //构造删除条件 LambdaQueryWrapper deleteWrapper = Wrappers.lambdaQuery(); deleteWrapper.le(TransitVehicleRecord::getPartitionField, twoDaysAgo); -// int countTM = vehicleRecordervice.count(deleteWrapper); + //int countTM = vehicleRecordervice.count(deleteWrapper); boolean result = vehicleRecordService.remove(deleteWrapper.last("LIMIT 10000")); if (result) { diff --git a/src/main/java/com/ssf/mysqloracletest/task/TStrhEntityInfoKsTask.java b/src/main/java/com/ssf/mysqloracletest/task/TStrhEntityInfoKsTask.java index ea24ee2..c0da937 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/TStrhEntityInfoKsTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/TStrhEntityInfoKsTask.java @@ -1,7 +1,6 @@ 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; @@ -10,7 +9,6 @@ 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; @@ -23,9 +21,6 @@ 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; /** diff --git a/src/main/java/com/ssf/mysqloracletest/task/TjksbglTask.java b/src/main/java/com/ssf/mysqloracletest/task/TjksbglTask.java index b722817..cb92dd0 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/TjksbglTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/TjksbglTask.java @@ -17,9 +17,6 @@ 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; /** * 用户数据接入 @@ -94,7 +91,6 @@ public class TjksbglTask { // }); logger.info("jksbMap数据总量:" + countjksb + "," + "当前处理下标:" + jksbMap.get("rowStart") + "/" + jksbMap.get("rowEnd")); } - // try { // // Wait for all threads to complete // latch.await(); diff --git a/src/main/java/com/ssf/mysqloracletest/task/VLgryGjxxTask.java b/src/main/java/com/ssf/mysqloracletest/task/VLgryGjxxTask.java index eaa0cb5..6d6eb3c 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/VLgryGjxxTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/VLgryGjxxTask.java @@ -155,7 +155,6 @@ public class VLgryGjxxTask { } } - } } catch (Exception e) { logger.info("Lgrys:" + StringKit.getTrace(e));