From 653bc3c6cef51d018de388d490e546e7c51dec3b Mon Sep 17 00:00:00 2001 From: fuqingji <51312040@qq.com> Date: Sat, 2 Apr 2022 17:16:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/FeignLocalDateTimeDecoder.java | 18 ------------------ .../ebtp/project/feign/EbtpMallOpenApi.java | 3 +-- .../fallback/EbtpMallOpenClientFallback.java | 3 +-- .../service/impl/ProjectRecordServiceImpl.java | 2 +- .../entity/ProjectSectionVO.java | 10 +--------- .../service/IProjectSectionService.java | 3 +-- .../impl/ProjectSectionServiceImpl.java | 12 ++++++------ 7 files changed, 11 insertions(+), 40 deletions(-) delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/config/FeignLocalDateTimeDecoder.java diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/config/FeignLocalDateTimeDecoder.java b/src/main/java/com/chinaunicom/mall/ebtp/project/config/FeignLocalDateTimeDecoder.java deleted file mode 100644 index 72a8f7b..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/config/FeignLocalDateTimeDecoder.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.chinaunicom.mall.ebtp.project.config; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.fasterxml.jackson.module.paramnames.ParameterNamesModule; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class FeignLocalDateTimeDecoder { - - @Bean(name = "mapperObject") - public ObjectMapper getObjectMapper() { - return new ObjectMapper().registerModule(new ParameterNamesModule()).registerModule(new Jdk8Module()) - .registerModule(new JavaTimeModule()); - } -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpMallOpenApi.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpMallOpenApi.java index 603ec4b..f7910a7 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpMallOpenApi.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpMallOpenApi.java @@ -9,7 +9,6 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import java.time.LocalDateTime; import java.util.Map; /** @@ -30,7 +29,7 @@ public interface EbtpMallOpenApi { */ @ApiOperation("根据标段ID查询开标时间") @PostMapping("/v1/bizbidopenroom/selectOpenTimeByBsIds") - public BaseResponse> updateOpenTime(@ApiParam(value = "开标室对象", required = false) + public BaseResponse> updateOpenTime(@ApiParam(value = "开标室对象", required = false) @RequestBody BizBidOroomInitVo invo); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpMallOpenClientFallback.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpMallOpenClientFallback.java index fa4c521..7f4aa03 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpMallOpenClientFallback.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpMallOpenClientFallback.java @@ -9,7 +9,6 @@ import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import java.time.LocalDateTime; import java.util.Map; @@ -35,7 +34,7 @@ public class EbtpMallOpenClientFallback implements FallbackFactory> updateOpenTime(BizBidOroomInitVo invo) { + public BaseResponse> updateOpenTime(BizBidOroomInitVo invo) { return null; } }; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index a908966..abecbe4 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -1066,7 +1066,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl sectionVOList = new ArrayList<>(); //20220402 新增：查询开标时间或者评审时间 - Map timeMap = projectSectionService.getOpenTime(sectionList.stream().map(ProjectSection::getId).collect(Collectors.toList())); + Map timeMap = projectSectionService.getOpenTime(sectionList.stream().map(ProjectSection::getId).collect(Collectors.toList())); //拼装标段总条数 for (String key: conversionMap.keySet()) { diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java index c55d701..7e16d5a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java @@ -1,21 +1,16 @@ package com.chinaunicom.mall.ebtp.project.projectsection.entity; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; -import com.chinaunicom.mall.ebtp.common.config.CustomLocalDateTimeTypeHandler; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.math.BigDecimal; -import java.time.LocalDateTime; import java.util.List; /** @@ -126,8 +121,5 @@ public class ProjectSectionVO extends ProjectSection implements Serializable { * 开标时间或者评审室开启时间，用于项目列表展示 */ @ApiModelProperty(value = "开标时间或者评审室开启时间，用于项目列表展示") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class) - private LocalDateTime sectionOpenTime; + private String sectionOpenTime; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/IProjectSectionService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/IProjectSectionService.java index f217461..26bfe7a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/IProjectSectionService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/IProjectSectionService.java @@ -7,7 +7,6 @@ import com.chinaunicom.mall.ebtp.project.feign.entity.SectionFlowVO; import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSection; import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSectionVO; -import java.time.LocalDateTime; import java.util.List; import java.util.Map; @@ -245,5 +244,5 @@ public interface IProjectSectionService extends IBaseService{ * @param sectionIds 项目标段ID,可以是不同项目的包 * @return 返回结果 */ - Map getOpenTime(List sectionIds); + Map getOpenTime(List sectionIds); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java index f166dfd..a1e5f3c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java @@ -2,6 +2,7 @@ package com.chinaunicom.mall.ebtp.project.projectsection.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.LocalDateTimeUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -38,7 +39,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; -import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -528,7 +528,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl timeMap = this.getOpenTime(sectionIds); + Map timeMap = this.getOpenTime(sectionIds); for (ProjectSection section:sectionList) { ProjectSectionVO vo = BeanUtil.toBean(section,ProjectSectionVO.class); @@ -666,13 +666,13 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl getOpenTime(List sectionIds) { + public Map getOpenTime(List sectionIds) { return Optional.ofNullable(sectionIds) .map(ids -> { //查询评标服务 - BaseResponse> opening = ebtpMallOpenApi.updateOpenTime(new BizBidOroomInitVo().setSectionIds(ids)); + BaseResponse> opening = ebtpMallOpenApi.updateOpenTime(new BizBidOroomInitVo().setSectionIds(ids)); ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName("评审时间查询失败", !opening.isSuccess()); - Map map = opening.getData(); + Map map = opening.getData(); if (ids.size() != map.size()) { //查询流程服务 BaseResponse> process = ebtpMallProcessApi.selectListByIds(ids); @@ -680,7 +680,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl { //如果无评标时间，记录评审时间 if (!map.containsKey(room.getSectionId())) { - map.put(room.getSectionId(), room.getOpenTime()); + map.put(room.getSectionId(), LocalDateTimeUtil.formatNormal(room.getOpenTime())); } }); }