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/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..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 @@ -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,39 @@ 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()); + 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); + } + log.info("insertPrVistRecord end ========="); + }); + } + /** * @Description orgIds拼接 * @Param pids @@ -580,8 +613,8 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl ) - ORDER BY up.created_time DESC + ORDER BY up.updated_time DESC \ No newline at end of file