社群组织接口调整

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;
+//	private String area;
-
+//
-    /**
+//    /**
-     * 区ID
+//     * 区ID
-     */
+//     */
-	private Long areaId;
+//	private Long areaId;
-
+//
-    /**
+//    /**
-     * 街道
+//     * 街道
-     */
+//     */
-	private String street;
+//	private String street;
-
+//
-    /**
+//    /**
-     * 街道ID
+//     * 街道ID
-     */
+//     */
-	private Long streetId;
+//	private Long streetId;
-
+//
-    /**
+//    /**
-     * 社区
+//     * 社区
-     */
+//     */
-	private String community;
+//	private String community;
-
+//
-    /**
+//    /**
-     * 社区ID
+//     * 社区ID
-     */
+//     */
-	private Long communityId;
+//	private Long communityId;
 
     /**
      * 网格

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;
+//    private String area;
-    /**
+//    /**
-     * 区ID
+//     * 区ID
-     */
+//     */
-    @NotNull(message = "用户区ID不能为空")
+//    @NotNull(message = "用户区ID不能为空")
-    private Long areaId;
+//    private Long areaId;
 //    /**
 //     * 街道
 //     */

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;
+//	private String area;
-
+//
-    /**
+//    /**
-     * 区ID
+//     * 区ID
-     */
+//     */
-	private Long areaId;
+//	private Long areaId;
-
+//
-    /**
+//    /**
-     * 街道
+//     * 街道
-     */
+//     */
-	private String street;
+//	private String street;
-
+//
-    /**
+//    /**
-     * 街道ID
+//     * 街道ID
-     */
+//     */
-	private Long streetId;
+//	private Long streetId;
-
+//
-    /**
+//    /**
-     * 社区
+//     * 社区
-     */
+//     */
-	private String community;
+//	private String community;
-
+//
-    /**
+//    /**
-     * 社区ID
+//     * 社区ID
-     */
+//     */
-	private Long communityId;
+//	private Long communityId;
 
     /**
      * 网格

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;
+//    private String area;
-
+//
-    /**
+//    /**
-     * 区ID
+//     * 区ID
-     */
+//     */
-    private Long areaId;
+//    private Long areaId;
-
+//
-    /**
+//    /**
-     * 街道
+//     * 街道
-     */
+//     */
-    private String street;
+//    private String street;
-
+//
-    /**
+//    /**
-     * 街道ID
+//     * 街道ID
-     */
+//     */
-    private Long streetId;
+//    private Long streetId;
-
+//
-    /**
+//    /**
-     * 社区
+//     * 社区
-     */
+//     */
-    private String community;
+//    private String community;
-
+//
-    /**
+//    /**
-     * 社区ID
+//     * 社区ID
-     */
+//     */
-    private Long communityId;
+//    private Long communityId;
 
     /**
      * 网格

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.setArea(formDto.getDistrict());
-        groupCreateFormDto.setAreaId(formDto.getDistrictId());
+//        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()));

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;
+//	private String area;
-
+//
-    /**
+//    /**
-     * 区ID
+//     * 区ID
-     */
+//     */
-	private Long areaId;
+//	private Long areaId;
-
+//
-    /**
+//    /**
-     * 街道
+//     * 街道
-     */
+//     */
-	private String street;
+//	private String street;
-
+//
-    /**
+//    /**
-     * 街道ID
+//     * 街道ID
-     */
+//     */
-	private Long streetId;
+//	private Long streetId;
-
+//
-    /**
+//    /**
-     * 社区
+//     * 社区
-     */
+//     */
-	private String community;
+//	private String community;
-
+//
-    /**
+//    /**
-     * 社区ID
+//     * 社区ID
-     */
+//     */
-	private Long communityId;
+//	private Long communityId;
 
     /**
      * 网格

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;
+//	private String area;
-
+//
-    /**
+//    /**
-     * 区ID
+//     * 区ID
-     */
+//     */
-	private Long areaId;
+//	private Long areaId;
-
+//
-    /**
+//    /**
-     * 街道
+//     * 街道
-     */
+//     */
-	private String street;
+//	private String street;
-
+//
-    /**
+//    /**
-     * 街道ID
+//     * 街道ID
-     */
+//     */
-	private Long streetId;
+//	private Long streetId;
-
+//
-    /**
+//    /**
-     * 社区
+//     * 社区
-     */
+//     */
-	private String community;
+//	private String community;
-
+//
-    /**
+//    /**
-     * 社区ID
+//     * 社区ID
-     */
+//     */
-	private Long communityId;
+//	private Long communityId;
 
     /**
      * 网格