From cd014fc47ef9b68aa1a08c82ec0b554b65319e51 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 23 Nov 2020 13:35:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=87=E6=A1=88=E5=86=99=E9=94=99(?= =?UTF-8?q?=E5=B7=B2=E8=BD=AC=E9=A1=B9=E7=9B=AE=E5=86=99=E6=88=90=E5=B7=B2?= =?UTF-8?q?=E8=BD=AC=E8=AE=AE=E9=A2=98)=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/modules/person/service/impl/TopicServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/TopicServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/TopicServiceImpl.java index fe816108c1..a978c0563d 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/TopicServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/TopicServiceImpl.java @@ -64,7 +64,7 @@ public class TopicServiceImpl implements TopicService { Result> rst = govOrgOpenFeignClient.getGridListByGridIds(gridIds); if (!rst.success()) { - logger.error("查询我创建的话题列表(已转议题),根据网格id查询网格名称失败, InternalMsg:{},Msg:{}", rst.getInternalMsg(), rst.getMsg()); + logger.error("查询我创建的话题列表(已转项目),根据网格id查询网格名称失败, InternalMsg:{},Msg:{}", rst.getInternalMsg(), rst.getMsg()); } else { List gridInfos = rst.getData(); HashMap gridIdAndNames = new HashMap<>(); From 1058ce65e54ff6166b1938b98b8289f0a5d79942 Mon Sep 17 00:00:00 2001 From: liushaowen <565850092@qq.com> Date: Mon, 23 Nov 2020 15:18:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=BB=BA=E8=AE=AE=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/AdviceListFormDTO.java | 5 +++-- .../epmet/controller/UserAdviceController.java | 18 +++++++++++++++--- .../service/impl/UserAdviceServiceImpl.java | 3 +++ 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AdviceListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AdviceListFormDTO.java index 1e001b988a..9e0fd23933 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AdviceListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AdviceListFormDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.form; +import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; import javax.validation.constraints.Min; @@ -35,12 +36,12 @@ public class AdviceListFormDTO { /** * 开始时间 可不填 */ - private Date startTime; + private String startTime; /** * 结束时间 可不填 */ - private Date endTime; + private String endTime; /** * 页码 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java index ed52f4da9d..e33e672739 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java @@ -42,6 +42,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.regex.Pattern; @@ -145,9 +148,18 @@ public class UserAdviceController { @PostMapping("advicelist") public Result> adviceList(@RequestBody AdviceListFormDTO dto) { ValidatorUtils.validateEntity(dto); - if (dto.getStartTime() != null && dto.getEndTime() != null) { - if (dto.getStartTime().after(dto.getEndTime())) { - throw new RenException("开始时间不能大于结束时间"); + //校验时间 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + if (StringUtils.isNotBlank(dto.getStartTime()) && StringUtils.isNotBlank(dto.getEndTime())){ + try { + Date start = sdf.parse(dto.getStartTime()); + Date end = sdf.parse(dto.getEndTime()); + if (start.after(end)){ + throw new RenException("开始时间不能大于结束时间"); + } + }catch (ParseException e){ + throw new RenException("日期转换失败"); } } PageData page = userAdviceService.adviceList(dto); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java index 46a5e96c95..2d741ae1bc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java @@ -61,6 +61,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -264,6 +266,7 @@ public class UserAdviceServiceImpl extends BaseServiceImpl