From 0f3260f602f8e6ad3e2ff0753c0d5ab77ef0b442 Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Mon, 28 Aug 2023 16:11:31 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B48=E6=9C=8828=E6=97=A5=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E7=9A=84=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9B=B4=E6=94=B9=E5=90=AC?= =?UTF-8?q?=E8=AF=BE=E8=BA=AB=E4=BB=BD=E6=97=B6=E4=B8=8D=E5=90=8C=E5=B9=B4?= =?UTF-8?q?=E4=BB=BD=E7=9A=84=E4=B8=80=E8=B5=B7=E8=A2=AB=E6=94=B9=E4=BA=86?= =?UTF-8?q?=EF=BC=88=E6=9A=82=E4=B8=8D=E6=9B=B4=E6=94=B9=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...KcExportConfigTpkwcqkjzglxServiceImpl.java | 23 +++++++++++++++++++ .../SynchronizationService/SyncTJwTkkcb.java | 2 +- .../SynchronizationService/SyncTJwTkxx.java | 8 ++++++- .../SynchronizationService/SyncTJzgXskc.java | 4 ++-- 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/impl/KcExportConfigTpkwcqkjzglxServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/impl/KcExportConfigTpkwcqkjzglxServiceImpl.java index 4b20b7bb..f9eb0d35 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/impl/KcExportConfigTpkwcqkjzglxServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/impl/KcExportConfigTpkwcqkjzglxServiceImpl.java @@ -7,12 +7,15 @@ import org.apache.commons.lang.StringUtils; import org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx; import org.jeecg.modules.kc.config.mapper.KcExportConfigTpkwcqkjzglxMapper; import org.jeecg.modules.kc.config.service.IKcExportConfigTpkwcqkjzglxService; +import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi; +import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory; import org.jeecg.modules.kc.tksf.kctksfyq.entity.KcTksfyq; import org.jeecg.modules.kc.tksf.kctksfyq.service.IKcTksfyqService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Arrays; +import java.util.Date; import java.util.List; /** @@ -27,8 +30,27 @@ public class KcExportConfigTpkwcqkjzglxServiceImpl extends ServiceImpl tongJiMap = Maps.newHashMap(); + //清洗数据核心 + Date startSjDate = common.getStartTime(); + Date endSjDate = common.getEndTime(); +// String startSj = DateUtil.format(startSjDate,DatePattern.NORM_DATETIME_FORMAT); +// String endSj = DateUtil.format(endSjDate,DatePattern.NORM_DATETIME_FORMAT); + xqxn = common.getTitle(); + } else { + xqxn = null; + } + + //结构名称 if(StringUtils.isNotBlank(kcExportConfigTpkwcqkjzglx.getTklx())){ List zwmcs = Arrays.asList(kcExportConfigTpkwcqkjzglx.getTklx().split(",")); @@ -41,6 +63,7 @@ public class KcExportConfigTpkwcqkjzglxServiceImpl extends ServiceImpl { Xxhbtkkcb outData = BeanUtil.toBean(x, Xxhbtkkcb.class); outData.setTimestamps(DateUtil.format(x.getTimestamps(), DatePattern.NORM_DATETIME_PATTERN)); - outDataList.add(BeanUtil.toBean(x, Xxhbtkkcb.class)); + outDataList.add(outData); }); //保存到胃 diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwTkxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwTkxx.java index a1aff8a1..a174abfb 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwTkxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwTkxx.java @@ -1,6 +1,8 @@ package org.jeecg.modules.kc.grab.SynchronizationService; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.compress.utils.Lists; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; @@ -46,7 +48,11 @@ public class SyncTJwTkxx extends BaseSync { List outDataList = Lists.newArrayList(); //清洗数据 - inDataList.forEach(x -> outDataList.add(BeanUtil.toBean(x, Xxhbtkxx.class))); + inDataList.forEach(x -> { + Xxhbtkxx outData = BeanUtil.toBean(x, Xxhbtkxx.class); + outData.setTimestamps(DateUtil.format(x.getTimestamps(), DatePattern.NORM_DATETIME_PATTERN)); + outDataList.add(outData); + }); //保存到胃 int syncnum=0; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJzgXskc.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJzgXskc.java index f281eb4c..6cb3521a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJzgXskc.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJzgXskc.java @@ -131,8 +131,8 @@ public class SyncTJzgXskc extends BaseSync { //清洗数据核心 Date startSjDate = common.getStartTime(); Date endSjDate = common.getEndTime(); - String startSj = DateUtil.format(startSjDate,DatePattern.NORM_DATETIME_FORMAT); - String endSj = DateUtil.format(endSjDate,DatePattern.NORM_DATETIME_FORMAT); +// String startSj = DateUtil.format(startSjDate,DatePattern.NORM_DATETIME_FORMAT); +// String endSj = DateUtil.format(endSjDate,DatePattern.NORM_DATETIME_FORMAT); xqxn = common.getTitle(); ectQw.eq("xqxn",xqxn); } else {