From 3411706a47351ee9a678d988a75e5b40fc76e9ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Fri, 29 Nov 2019 19:55:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E7=BE=A4=E7=BB=84=E7=BB=87=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/group/GroupDTO.java | 58 +++++++++---------- .../dto/group/form/GroupCreateFormDTO.java | 18 +++--- .../dto/topic/TopicDTO.java | 58 +++++++++---------- .../dto/topic/form/TopicSubmitFormDTO.java | 58 +++++++++---------- .../group/controller/AppGroupController.java | 4 +- .../modules/group/entity/GroupEntity.java | 58 +++++++++---------- .../modules/topic/entity/TopicEntity.java | 58 +++++++++---------- 7 files changed, 156 insertions(+), 156 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupDTO.java index 3cd96de40..a383bd02e 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupDTO.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupDTO.java @@ -58,35 +58,35 @@ public class GroupDTO implements Serializable { */ private String groupCategory; - /** - * 区 - */ - private String area; - - /** - * 区ID - */ - private Long areaId; - - /** - * 街道 - */ - private String street; - - /** - * 街道ID - */ - private Long streetId; - - /** - * 社区 - */ - private String community; - - /** - * 社区ID - */ - private Long communityId; +// /** +// * 区 +// */ +// private String area; +// +// /** +// * 区ID +// */ +// private Long areaId; +// +// /** +// * 街道 +// */ +// private String street; +// +// /** +// * 街道ID +// */ +// private Long streetId; +// +// /** +// * 社区 +// */ +// private String community; +// +// /** +// * 社区ID +// */ +// private Long communityId; /** * 网格 diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupCreateFormDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupCreateFormDTO.java index e78620682..f206ccf68 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupCreateFormDTO.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupCreateFormDTO.java @@ -39,15 +39,15 @@ public class GroupCreateFormDTO implements Serializable { * 社群类别 0：党员群，1：自建群 */ private String groupCategory; - /** - * 区 - */ - private String area; - /** - * 区ID - */ - @NotNull(message = "用户区ID不能为空") - private Long areaId; +// /** +// * 区 +// */ +// private String area; +// /** +// * 区ID +// */ +// @NotNull(message = "用户区ID不能为空") +// private Long areaId; // /** // * 街道 // */ diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/TopicDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/TopicDTO.java index 865111522..7d8e4682f 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/TopicDTO.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/TopicDTO.java @@ -79,35 +79,35 @@ public class TopicDTO implements Serializable { */ private String itemId; - /** - * 区 - */ - private String area; - - /** - * 区ID - */ - private Long areaId; - - /** - * 街道 - */ - private String street; - - /** - * 街道ID - */ - private Long streetId; - - /** - * 社区 - */ - private String community; - - /** - * 社区ID - */ - private Long communityId; +// /** +// * 区 +// */ +// private String area; +// +// /** +// * 区ID +// */ +// private Long areaId; +// +// /** +// * 街道 +// */ +// private String street; +// +// /** +// * 街道ID +// */ +// private Long streetId; +// +// /** +// * 社区 +// */ +// private String community; +// +// /** +// * 社区ID +// */ +// private Long communityId; /** * 网格 diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicSubmitFormDTO.java index 42f16b080..2b5d87d04 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicSubmitFormDTO.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicSubmitFormDTO.java @@ -102,35 +102,35 @@ public class TopicSubmitFormDTO implements Serializable { */ private String mobile; - /** - * 区 - */ - private String area; - - /** - * 区ID - */ - private Long areaId; - - /** - * 街道 - */ - private String street; - - /** - * 街道ID - */ - private Long streetId; - - /** - * 社区 - */ - private String community; - - /** - * 社区ID - */ - private Long communityId; +// /** +// * 区 +// */ +// private String area; +// +// /** +// * 区ID +// */ +// private Long areaId; +// +// /** +// * 街道 +// */ +// private String street; +// +// /** +// * 街道ID +// */ +// private Long streetId; +// +// /** +// * 社区 +// */ +// private String community; +// +// /** +// * 社区ID +// */ +// private Long communityId; /** * 网格 diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppGroupController.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppGroupController.java index 2f346331f..920006848 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppGroupController.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppGroupController.java @@ -60,8 +60,8 @@ public class AppGroupController { @PostMapping("createParty") public Result createPartyGroup(@RequestBody CompleteDeptDTO formDto) { GroupCreateFormDTO groupCreateFormDto = ConvertUtils.sourceToTarget(formDto, GroupCreateFormDTO.class); - groupCreateFormDto.setArea(formDto.getDistrict()); - groupCreateFormDto.setAreaId(formDto.getDistrictId()); +// groupCreateFormDto.setArea(formDto.getDistrict()); +// groupCreateFormDto.setAreaId(formDto.getDistrictId()); groupCreateFormDto.setGroupName(formDto.getCommunity().concat(formDto.getGrid()).concat(GroupConstant.PARTY_GROUP_NAME_SUFFIX)); groupCreateFormDto.setGroupAvatar(GroupConstant.PARTY_GROUP_AVATAR); groupCreateFormDto.setGroupIntroduction(formDto.getStreet().concat(formDto.getCommunity()).concat(formDto.getGrid())); diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/entity/GroupEntity.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/entity/GroupEntity.java index ecd842435..df1af241e 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/entity/GroupEntity.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/entity/GroupEntity.java @@ -58,35 +58,35 @@ public class GroupEntity extends BaseEpdcEntity { */ private String groupCategory; - /** - * 区 - */ - private String area; - - /** - * 区ID - */ - private Long areaId; - - /** - * 街道 - */ - private String street; - - /** - * 街道ID - */ - private Long streetId; - - /** - * 社区 - */ - private String community; - - /** - * 社区ID - */ - private Long communityId; +// /** +// * 区 +// */ +// private String area; +// +// /** +// * 区ID +// */ +// private Long areaId; +// +// /** +// * 街道 +// */ +// private String street; +// +// /** +// * 街道ID +// */ +// private Long streetId; +// +// /** +// * 社区 +// */ +// private String community; +// +// /** +// * 社区ID +// */ +// private Long communityId; /** * 网格 diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/entity/TopicEntity.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/entity/TopicEntity.java index 960a55dd9..e3d2064bc 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/entity/TopicEntity.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/entity/TopicEntity.java @@ -79,35 +79,35 @@ public class TopicEntity extends BaseEpdcEntity { */ private String itemId; - /** - * 区 - */ - private String area; - - /** - * 区ID - */ - private Long areaId; - - /** - * 街道 - */ - private String street; - - /** - * 街道ID - */ - private Long streetId; - - /** - * 社区 - */ - private String community; - - /** - * 社区ID - */ - private Long communityId; +// /** +// * 区 +// */ +// private String area; +// +// /** +// * 区ID +// */ +// private Long areaId; +// +// /** +// * 街道 +// */ +// private String street; +// +// /** +// * 街道ID +// */ +// private Long streetId; +// +// /** +// * 社区 +// */ +// private String community; +// +// /** +// * 社区ID +// */ +// private Long communityId; /** * 网格