From 48b7ab9cf9f7635a981347fda44a8618674db5a8 Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Sun, 13 Aug 2023 01:18:17 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B48=E6=9C=8813=E6=97=A5=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=EF=BC=88=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E5=90=8C=E6=AD=A5=E7=94=A8=E6=88=B7=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SynchronizationService/SyncTJzgXskc.java | 73 ++++++++++++++++++- .../kc/grab/imports/entity/Xxhbuser.java | 6 +- 2 files changed, 74 insertions(+), 5 deletions(-) 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 dd8e5360..bfc7676c 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 @@ -1,13 +1,21 @@ 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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.apache.commons.compress.utils.Lists; +import org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx; +import org.jeecg.modules.kc.config.service.IKcExportConfigTpkwcqkjzglxService; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; import org.jeecg.modules.kc.grab.exports.entity.TJzgXskc; import org.jeecg.modules.kc.grab.exports.service.ITJzgXskcService; import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbuser; import org.jeecg.modules.kc.grab.imports.entity.Xxhbxskc; +import org.jeecg.modules.kc.grab.imports.service.IXxhbuserService; import org.jeecg.modules.kc.grab.imports.service.IXxhbxskcService; import org.quartz.JobExecutionContext; import org.springframework.beans.factory.annotation.Autowired; @@ -24,6 +32,12 @@ public class SyncTJzgXskc extends BaseSync { @Autowired private IXxhbxskcService impService; + @Autowired + private IXxhbuserService xxhbuserService; + + @Autowired + private IKcExportConfigTpkwcqkjzglxService exportConfigTpkwcqkjzglxService; + /** * 若参数变量名修改 QuartzJobController中也需对应修改 */ @@ -45,8 +59,25 @@ public class SyncTJzgXskc extends BaseSync { List inDataList = expService.list(); List outDataList = Lists.newArrayList(); + List outUserDataList = Lists.newArrayList(); + Map outUserDataMap = Maps.newHashMap(); + + //List outExportConfigTpkwcqkjzglxDataList = Lists.newArrayList(); +// Map outExportConfigTpkwcqkjzglxDataMap = Lists.newArrayList(); + //清洗数据 - inDataList.forEach(x -> outDataList.add(BeanUtil.toBean(x, Xxhbxskc.class))); + inDataList.forEach(x -> { + String timestamps = DateUtil.format(x.getTimestamps(), DatePattern.NORM_DATETIME_PATTERN); + outDataList.add(BeanUtil.toBean(x, Xxhbxskc.class)); + Xxhbuser outUserData = BeanUtil.toBean(x, Xxhbuser.class); + outUserData.setTimestamps(timestamps); + outUserDataList.add(outUserData); + Xxhbuser xxhbuser = BeanUtil.toBean(x, Xxhbuser.class); + xxhbuser.setTimestamps(timestamps); + outUserDataMap.put(xxhbuser.getGh(),xxhbuser); + //outExportConfigTpkwcqkjzglxDataList.add(BeanUtil.toBean(x, KcExportConfigTpkwcqkjzglx.class)); + + }); //保存到胃 int syncnum=0; @@ -70,9 +101,45 @@ public class SyncTJzgXskc extends BaseSync { xxhbsynclog.setErrormessage(errorMessage); saveLog(xxhbsynclog,Xxhbxskc.class); - //todo 同步清洗到xxhbUser表。 + //同步清洗到xxhbUser表。 + //删除原数据 + QueryWrapper xuQw = new QueryWrapper<>(); + xxhbuserService.remove(xuQw); + + //保存 + xxhbuserService.saveBatch(outUserDataList); + + //再同步清洗到kc_export_config_tpkwcqkjzglx表 + //筛选 + QueryWrapper ectQw = new QueryWrapper<>(); + List oldExportConfigTpkwcqkjzglxList = exportConfigTpkwcqkjzglxService.list(ectQw); + + List saveList = Lists.newArrayList(); + List updateList = Lists.newArrayList(); + + Map saveMap = Maps.newHashMap(); + + //outExportConfigTpkwcqkjzglxDataList + oldExportConfigTpkwcqkjzglxList.forEach(x -> { + if(outUserDataMap.containsKey(x.getGh())){ + Xxhbuser data = outUserDataMap.get(x.getGh()); + x.setXm(data.getXm()); + x.setDwmc(data.getDwmc()); + updateList.add(x); + saveMap.put(x.getGh(),x); + } + }); + + exportConfigTpkwcqkjzglxService.updateBatchById(updateList); + + outUserDataList.forEach(x -> { + if(!saveMap.containsKey(x.getGh())){ + saveList.add(BeanUtil.toBean(x, KcExportConfigTpkwcqkjzglx.class)); + } + }); + + exportConfigTpkwcqkjzglxService.saveBatch(saveList); - //todo 再同步清洗到kc_export_config_tpkwcqkjzglx表 } /** diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbuser.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbuser.java index de28ee17..42f2e5b6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbuser.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbuser.java @@ -35,7 +35,7 @@ public class Xxhbuser implements Serializable { /**id*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "id") - private java.lang.Integer id; + private java.lang.String id; /**工号*/ @Excel(name = "工号", width = 15) @ApiModelProperty(value = "工号") @@ -77,7 +77,9 @@ public class Xxhbuser implements Serializable { @ApiModelProperty(value = "zzzt") private java.lang.String zzzt; /**时间戳*/ - @Excel(name = "时间戳", width = 15) + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @Excel(name = "时间戳", width = 15, format = "yyyy-MM-dd") @ApiModelProperty(value = "时间戳") private java.lang.String timestamps; }