From 8dfbe0f5bf7f71a8d495a4cd052a1f4173b74072 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 30 Sep 2021 11:15:10 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=AF=84=E5=88=86=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/epmettduck/impl/PrUserProjectServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java index bc905870e8..f83db7979c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java @@ -580,8 +580,8 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl Date: Thu, 30 Sep 2021 12:03:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/dto/epmettduck/result/TDuckListResultDTO.java | 4 ++-- .../src/main/resources/mapper/epmettduck/PrUserProjectDao.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java index ee412e8ad3..5b2346cb97 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java @@ -4,8 +4,6 @@ import com.epmet.commons.tools.constant.NumConstant; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -69,6 +67,7 @@ public class TDuckListResultDTO implements Serializable { private String client; private String createdTime; + private String updatedTime; /** * 是否填写问卷，true：是，false：否 @@ -107,6 +106,7 @@ public class TDuckListResultDTO implements Serializable { this.status = NumConstant.ONE; this.client = ""; this.createdTime = ""; + this.updatedTime = ""; this.fillStatus = false; this.isFillQuestion = true; this.orgName = ""; diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml index a22d98b11d..48bd2f41bc 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml @@ -92,7 +92,7 @@ #{key} ) - ORDER BY up.created_time DESC + ORDER BY up.updated_time DESC \ No newline at end of file From ce433557a24f3195b27e900648bb29d97890beaf Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Sep 2021 15:11:33 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PrUserProjectServiceImpl.java | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java index f83db7979c..0c6894e9de 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java @@ -51,6 +51,7 @@ import com.epmet.dataaggre.dto.epmettduck.result.*; import com.epmet.dataaggre.dto.epmettduck.struct.*; import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity; import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity; +import com.epmet.dataaggre.entity.epmettduck.PrVistRecordEntity; import com.epmet.dataaggre.service.epmettduck.PrPublishRangeService; import com.epmet.dataaggre.service.epmettduck.PrUserProjectService; import com.epmet.dataaggre.service.epmettduck.PrVistRecordService; @@ -70,6 +71,8 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.*; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -251,9 +254,37 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl insertPrVistRecord(TDuckListFormDTO formDTO) { + return Executors.newCachedThreadPool().submit(()->{ + PrVistRecordDTO param = new PrVistRecordDTO(); + param.setCustomerId(formDTO.getCustomerId()); + param.setUserId(formDTO.getUserId()); + param.setUserType(formDTO.getOrgType()); + param.setProjectKey(formDTO.getClient()); + PrVistRecordDTO newestRecord = prVistRecordService.getNewestRecord(formDTO.getUserId()); + PrVistRecordEntity entity = ConvertUtils.sourceToTarget(PrVistRecordDTO.class, PrVistRecordEntity.class); + if (newestRecord == null) { + prVistRecordService.insert(entity); + } else { + entity = new PrVistRecordEntity(); + entity.setId(newestRecord.getId()); + prVistRecordService.updateById(entity); + } + }); + } + /** * @Description orgIds拼接 * @Param pids @@ -808,4 +839,4 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl Date: Thu, 30 Sep 2021 15:15:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/epmettduck/impl/PrUserProjectServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java index 0c6894e9de..063e326d45 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java @@ -256,7 +256,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl Date: Thu, 30 Sep 2021 15:23:47 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E7=9C=8B=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/epmettduck/impl/PrUserProjectServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java index 063e326d45..04d4c7425e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java @@ -268,6 +268,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl insertPrVistRecord(TDuckListFormDTO formDTO) { return Executors.newCachedThreadPool().submit(()->{ + log.info("insertPrVistRecord start ========="); PrVistRecordDTO param = new PrVistRecordDTO(); param.setCustomerId(formDTO.getCustomerId()); param.setUserId(formDTO.getUserId()); @@ -282,6 +283,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl