From 3e906d01235d4491286c11339307cfd5e3a5cff6 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 1 Feb 2024 15:23:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=2080576=20=E4=BC=81=E6=A0=87=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=8F=98=E6=9B=B4--=E8=B4=A3=E4=BB=BB=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E5=8F=98=E6=9B=B4--=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=B8=89=E4=B8=AA=E8=8A=82=E7=82=B9=E6=98=AF=E9=80=90?= =?UTF-8?q?=E4=B8=80=E5=B1=95=E7=A4=BA=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/activiti/service/ProcessNodeService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java index 4854ab8e..ef92e633 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java @@ -192,7 +192,7 @@ public class ProcessNodeService extends ServiceImpl Objects.equals(processNode.getNodeName(), EsInitChangeConstant.NEW_MAIN_DRAFT_LEADER_LEADER)); // 删除新起草部门主管级领导确认节点 From 6064b6ba012d4fd09f505786e0d392cb9f043998 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 1 Feb 2024 16:05:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=2081309=20=E6=B3=95=E8=A7=84=E5=90=88?= =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B-=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=A0=87=E5=87=86=EF=BC=8C=E6=96=B0=E8=BD=A6=E5=9E=8B?= =?UTF-8?q?=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E5=92=8C=E5=9C=A8=E4=BA=A7?= =?UTF-8?q?=E8=BD=A6=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsAsmsDomesticController.java | 12 +++ .../service/ILawsAsmsDomesticService.java | 5 ++ .../impl/LawsAsmsDomesticServiceImpl.java | 88 +++++++++++++++++++ 3 files changed, 105 insertions(+) diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/controller/LawsAsmsDomesticController.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/controller/LawsAsmsDomesticController.java index c44234d9..e8f2c796 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/controller/LawsAsmsDomesticController.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/controller/LawsAsmsDomesticController.java @@ -150,4 +150,16 @@ public class LawsAsmsDomesticController extends JeroController cleanData() { + lawsAsmsDomesticService.cleanData(); + return Result.OK("清理成功!"); + } } diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/ILawsAsmsDomesticService.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/ILawsAsmsDomesticService.java index a39c5442..fb11ce1f 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/ILawsAsmsDomesticService.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/ILawsAsmsDomesticService.java @@ -73,4 +73,9 @@ public interface ILawsAsmsDomesticService extends IService { * @return */ LawsAsmsDomestic queryById(String id); + + /** + * 清理同步进来的脏数据 + */ + void cleanData(); } diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsDomesticServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsDomesticServiceImpl.java index 50e57a1b..ef5b6812 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsDomesticServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsDomesticServiceImpl.java @@ -1,16 +1,28 @@ package com.jero.modules.docking.asms.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.modules.docking.asms.entity.LawsAsmsDomestic; import com.jero.modules.docking.asms.mapper.LawsAsmsDomesticMapper; import com.jero.modules.docking.asms.service.ILawsAsmsDomesticService; +import com.jero.modules.laws.standard.entity.LawsDomesticStandard; +import com.jero.modules.laws.standard.entity.LawsOverseasStandard; +import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; +import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; +import org.hibernate.validator.constraints.pl.REGON; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.jero.common.exception.JeroBootException; + +import java.util.Arrays; import java.util.List; import java.util.Date; +import java.util.stream.Collectors; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.system.query.QueryGenerator; + +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -26,6 +38,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @Transactional(rollbackFor = JeroBootException.class) public class LawsAsmsDomesticServiceImpl extends ServiceImpl implements ILawsAsmsDomesticService { + @Resource + private ILawsDomesticStandardService lawsDomesticStandardService; + + @Resource + private ILawsOverseasStandardService lawsOverseasStandardService; /** * 分页查询 @@ -110,4 +127,75 @@ public class LawsAsmsDomesticServiceImpl extends ServiceImpl gblist = lawsDomesticStandardService.list(); + List fblist = lawsOverseasStandardService.list(); + // 遍历所有国标数据，清理新车型实施日期 在产车实施日期两个字段中的脏数据 + for (LawsDomesticStandard standard : gblist) { + String newModelImplementationDate = standard.getNewModelImplementationDate(); + String onTheProductionDate = standard.getOnTheProductionDate(); + if (StrUtil.isBlank(newModelImplementationDate) && StrUtil.isBlank(onTheProductionDate)) { + continue; + } + + if (StrUtil.isNotBlank(newModelImplementationDate)) { + if (newModelImplementationDate.equals(",")) { + standard.setNewModelImplementationDate(""); + } else { + List dateList = Arrays.asList(newModelImplementationDate.split(",")); + // 去重 + standard.setNewModelImplementationDate(dateList.stream() + .distinct().collect(Collectors.joining(","))); + } + } + + if (StrUtil.isNotBlank(onTheProductionDate)) { + if (onTheProductionDate.equals(",")) { + standard.setOnTheProductionDate(""); + } else { + List dateList = Arrays.asList(onTheProductionDate.split(",")); + // 去重 + standard.setOnTheProductionDate(dateList.stream() + .distinct().collect(Collectors.joining(","))); + } + } + lawsDomesticStandardService.updateById(standard); + } + + for (LawsOverseasStandard standard : fblist) { + String newModelImplementationDate = standard.getNewModelImplementationDate(); + String onTheProductionDate = standard.getOnTheProductionDate(); + if (StrUtil.isBlank(newModelImplementationDate) && StrUtil.isBlank(onTheProductionDate)) { + continue; + } + + if (StrUtil.isNotBlank(newModelImplementationDate)) { + if (newModelImplementationDate.equals(",")) { + standard.setNewModelImplementationDate(""); + } else { + List dateList = Arrays.asList(newModelImplementationDate.split(",")); + // 去重 + standard.setNewModelImplementationDate(dateList.stream() + .distinct().collect(Collectors.joining(","))); + } + } + + if (StrUtil.isNotBlank(onTheProductionDate)) { + if (onTheProductionDate.equals(",")) { + standard.setOnTheProductionDate(""); + } else { + List dateList = Arrays.asList(onTheProductionDate.split(",")); + // 去重 + standard.setOnTheProductionDate(dateList.stream() + .distinct().collect(Collectors.joining(","))); + } + } + lawsOverseasStandardService.updateById(standard); + } + } }