From 77c14562dd756c71231f6e1290c0506dd14d52bd Mon Sep 17 00:00:00 2001 From: liuchuang Date: Tue, 10 Sep 2019 09:33:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=8E=A5=E5=8F=A3BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/controller/ApiIssueController.java | 2 +- .../esua/epdc/feign/fallback/ItemFeignClientFallback.java | 2 ++ .../java/com/elink/esua/epdc/dto/issue/form/IssueFormDTO.java | 3 ++- .../esua/epdc/modules/events/entity/EpdcEventsEntity.java | 4 ++-- .../modules/events/service/impl/EpdcEventsServiceImpl.java | 2 +- .../com/elink/esua/epdc/modules/issue/entity/IssueEntity.java | 4 ++-- .../epdc/modules/issue/service/impl/IssueServiceImpl.java | 4 ++-- .../com/elink/esua/epdc/modules/item/entity/ItemEntity.java | 4 ++-- .../src/main/resources/mapper/events/EpdcEventsDao.xml | 1 + .../src/main/resources/mapper/issue/IssueDao.xml | 1 + .../src/main/resources/mapper/item/ItemDao.xml | 2 +- 11 files changed, 17 insertions(+), 12 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java index 77500c484..e8b6f8e4e 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java @@ -38,7 +38,7 @@ public class ApiIssueController { * @Date: 2019/9/8 15:36 */ @PostMapping("submit") - public Result submitEvent(@LoginUser TokenDto userDetail, EpdcEventSubmitFormDTO formDto) { + public Result submitEvent(@LoginUser TokenDto userDetail, @RequestBody EpdcEventSubmitFormDTO formDto) { return issueService.saveEvent(userDetail, formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java index 32ef420f7..45e1aad82 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java @@ -6,6 +6,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.item.form.ItemFormDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.feign.ItemFeignClient; +import org.springframework.stereotype.Component; import java.util.List; @@ -13,6 +14,7 @@ import java.util.List; * @Author LC * @Date 2019/9/9 16:39 */ +@Component public class ItemFeignClientFallback implements ItemFeignClient { @Override diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueFormDTO.java index 8bb9000a7..b748c9fc8 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueFormDTO.java @@ -4,6 +4,7 @@ import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Date; @@ -19,7 +20,7 @@ public class IssueFormDTO implements Serializable { /** * 用户所属网格ID */ - @NotBlank(message = "用户网格ID不能为空") + @NotNull(message = "用户网格ID不能为空") private Long deptId; /** * 0: 获取最新列表，1: 获取最热列表 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java index a6b1d554e..0f7f7de1f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java @@ -105,11 +105,11 @@ public class EpdcEventsEntity extends BaseEpdcEntity { /** * 议题位置纬度 */ - private BigDecimal issueLatitude; + private double issueLatitude; /** * 议题位置经度 */ - private BigDecimal issueLongitude; + private double issueLongitude; /** * 友邻社区ID */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index 984438a0f..9bfd7aaa1 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -228,7 +228,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl imp if (EventIssueItemState.ISSUE_CHANGE_TO_ITEM == dto.getState()) { updateById(issueEntity); // 插入项目表 - ItemEntity itemEntity = initItemEntity(issueEntity); + ItemEntity itemEntity = initItemEntity(this.selectById(issueEntity.getId())); itemService.insert(itemEntity); // 插入项目处理流程表 ItemHandleProcessEntity itemHandleProcessEntity = new ItemHandleProcessEntity(); @@ -269,7 +269,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp itemEntity.setIssueCategoryId(issueEntity.getIssueCategoryId()); itemEntity.setIssueAddress(issueEntity.getIssueAddress()); itemEntity.setIssueLongitude(issueEntity.getIssueLongitude()); - itemEntity.setIssusLatitude(issueEntity.getIssusLatitude()); + itemEntity.setIssueLatitude(issueEntity.getIssueLatitude()); itemEntity.setFriendlyCommunityId(issueEntity.getFriendlyCommunityId()); itemEntity.setItemState(EventIssueItemState.ITEM_WAITING_GRID_HANDLE); return itemEntity; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java index c2ee4fdc0..84f146392 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java @@ -132,12 +132,12 @@ public class ItemEntity extends BaseEpdcEntity { /** * 议题位置纬度 */ - private BigDecimal issusLatitude; + private double issueLatitude; /** * 议题位置经度 */ - private BigDecimal issueLongitude; + private double issueLongitude; /** * 友邻社区ID diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml index 41f621cde..d3928b624 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml @@ -48,6 +48,7 @@ AND temp.grid_id = #{gridId} AND temp.EVENT_STATE = 0 + ORDER BY temp.CREATED_TIME DESC +