社区管理推送

3 years ago · dc12220ef0
14 changed files with 624 additions and 2 deletions
--- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/constant/ManagementUrlConstant.java
+++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/constant/ManagementUrlConstant.java
@ -15,9 +15,9 @@ public interface ManagementUrlConstant {
    String BASE_URL = "";

    /**
-     * 3.4 签名方式
+     * platformKey
     */
-    String SIGN = "/path/subpath";
+    String PLATFORM_KEY = "6ce2de4db43a11eaa577005056a8394c";

    /**
     * 4.1.1 导入社区
--- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/management/form/CommunityAddFormDTO.java
+++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/management/form/CommunityAddFormDTO.java
@ -0,0 +1,66 @@
+package com.elink.esua.epdc.dto.management.form;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 社区 2.0 接口
+ *
+ * @author zhy
+ * @date 2022/12/6 14:29
+ */
+@NoArgsConstructor
+@Data
+public class CommunityAddFormDTO {
+    /**
+     * 社区负责人
+     */
+    @JsonProperty("userMajorName")
+    private String userMajorName;
+    /**
+     * 社区负责人电话
+     */
+    @JsonProperty("userMajorPhone")
+    private String userMajorPhone;
+    /**
+     * 社区名称
+     */
+    @JsonProperty("circleName")
+    private String circleName;
+    /**
+     * 社区头像
+     */
+    @JsonProperty("circleHeadImage")
+    private String circleHeadImage;
+    /**
+     * 社区描述
+     */
+    @JsonProperty("circleDescribe")
+    private String circleDescribe;
+    /**
+     * 社区地址
+     */
+    @JsonProperty("circleAddress")
+    private String circleAddress;
+    /**
+     * 社区维度
+     */
+    @JsonProperty("mapX")
+    private String mapX;
+    /**
+     * 社区经度
+     */
+    @JsonProperty("mapY")
+    private String mapY;
+    /**
+     * 导入方该数据唯一标识
+     */
+    @JsonProperty("oldCircleId")
+    private String oldCircleId;
+    /**
+     * 创建时间
+     */
+    @JsonProperty("createTime")
+    private String createTime;
+}
--- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/management/form/CommunityUpdFormDTO.java
+++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/management/form/CommunityUpdFormDTO.java
@ -0,0 +1,56 @@
+package com.elink.esua.epdc.dto.management.form;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 社区 2.0 接口
+ *
+ * @author zhy
+ * @date 2022/12/6 14:29
+ */
+@NoArgsConstructor
+@Data
+public class CommunityUpdFormDTO {
+    /**
+     * 社区负责人
+     */
+    @JsonProperty("userMajorName")
+    private String userMajorName;
+    /**
+     * 社区负责人电话
+     */
+    @JsonProperty("userMajorPhone")
+    private String userMajorPhone;
+    /**
+     * 社区头像
+     */
+    @JsonProperty("circleHeadImage")
+    private String circleHeadImage;
+    /**
+     * 社区描述
+     */
+    @JsonProperty("circleDescribe")
+    private String circleDescribe;
+    /**
+     * 社区地址
+     */
+    @JsonProperty("circleAddress")
+    private String circleAddress;
+    /**
+     * 社区维度
+     */
+    @JsonProperty("mapX")
+    private String mapX;
+    /**
+     * 社区经度
+     */
+    @JsonProperty("mapY")
+    private String mapY;
+    /**
+     * 导入方该数据唯一标识
+     */
+    @JsonProperty("circleId")
+    private String circleId;
+}
--- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/management/form/GridAddFormDTO.java
+++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/management/form/GridAddFormDTO.java
@ -0,0 +1,48 @@
+package com.elink.esua.epdc.dto.management.form;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@Data
+public class GridAddFormDTO {
+    /**
+     * 网格编号(网格名称)
+     */
+    @JsonProperty("gridNum")
+    private String gridNum;
+//
+//    @JsonProperty("communityName")
+//    private String communityName;
+    /**
+     * 社区 id(导入社区获得)
+     */
+    @JsonProperty("circleId")
+    private Integer circleId;
+    /**
+     * 创建时间
+     */
+    @JsonProperty("createTime")
+    private String createTime;
+    /**
+     * 父网格 id(顶级网格为 0)
+     */
+    @JsonProperty("parentId")
+    private Integer parentId;
+    /**
+     * 层级(例:第二级网格为 2 以此类推)
+     */
+    @JsonProperty("level")
+    private Integer level;
+    /**
+     * 网格描述
+     */
+    @JsonProperty("gridDesc")
+    private String gridDesc;
+    /**
+     * 导入方该数据唯一标识
+     */
+    @JsonProperty("oldGridId")
+    private String oldGridId;
+}
--- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/management/form/GridDelFormDTO.java
+++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/management/form/GridDelFormDTO.java
@ -0,0 +1,15 @@
+package com.elink.esua.epdc.dto.management.form;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@Data
+public class GridDelFormDTO {
+    /**
+     * 导入方该数据唯一标识
+     */
+    @JsonProperty("gridId")
+    private String gridId;
+}
--- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/management/form/GridUpdFormDTO.java
+++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/management/form/GridUpdFormDTO.java
@ -0,0 +1,25 @@
+package com.elink.esua.epdc.dto.management.form;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@Data
+public class GridUpdFormDTO {
+    /**
+     * 网格编号(网格名称)
+     */
+    @JsonProperty("gridNum")
+    private String gridNum;
+    /**
+     * 网格描述
+     */
+    @JsonProperty("gridDesc")
+    private String gridDesc;
+    /**
+     * 导入方该数据唯一标识
+     */
+    @JsonProperty("gridId")
+    private String gridId;
+}
--- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/management/form/ManageUserAddFormDTO.java
+++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/management/form/ManageUserAddFormDTO.java
@ -0,0 +1,68 @@
+package com.elink.esua.epdc.dto.management.form;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@Data
+public class ManageUserAddFormDTO {
+    /**
+     * 社区 id(导入网格获
+     * 得)
+     */
+    @JsonProperty("gridId")
+    private Integer gridId;
+    /**
+     * 管理员名
+     */
+    @JsonProperty("userName")
+    private String userName;
+    /**
+     * 电话
+     */
+    @JsonProperty("phone")
+    private String phone;
+    /**
+     * 性别 男: MALE 女:
+     * FEMALE
+     */
+    @JsonProperty("gender")
+    private String gender;
+    /**
+     * 出生日期
+     */
+    @JsonProperty("bornTime")
+    private String bornTime;
+    /**
+     * 工作日期
+     */
+    @JsonProperty("workDate")
+    private String workDate;
+    /**
+     * 管理员头像
+     */
+    @JsonProperty("headImage")
+    private String headImage;
+    /**
+     * 备注
+     */
+    @JsonProperty("introduction")
+    private String introduction;
+    /**
+     * 描述
+     */
+    @JsonProperty("description")
+    private String description;
+    /**
+     * 创建时间
+     */
+    @JsonProperty("createTime")
+    private String createTime;
+    /**
+     * 导入方导入网格管理
+     * 员时, 数据唯一标识
+     */
+    @JsonProperty("oldManageId")
+    private String oldManageId;
+}
--- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/management/form/ManageUserDelFormDTO.java
+++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/management/form/ManageUserDelFormDTO.java
@ -0,0 +1,16 @@
+package com.elink.esua.epdc.dto.management.form;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@Data
+public class ManageUserDelFormDTO {
+    /**
+     * 导入方导入网格管理
+     * 员时, 数据唯一标识
+     */
+    @JsonProperty("id")
+    private Integer id;
+}
--- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/management/form/ManageUserUpdFormDTO.java
+++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/management/form/ManageUserUpdFormDTO.java
@ -0,0 +1,63 @@
+package com.elink.esua.epdc.dto.management.form;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@Data
+public class ManageUserUpdFormDTO {
+    /**
+     * 社区 id(导入网格获
+     * 得)
+     */
+    @JsonProperty("gridId")
+    private Integer gridId;
+    /**
+     * 管理员名
+     */
+    @JsonProperty("userName")
+    private String userName;
+    /**
+     * 性别 男: MALE 女:
+     * FEMALE
+     */
+    @JsonProperty("gender")
+    private String gender;
+    /**
+     * 出生日期
+     */
+    @JsonProperty("bornTime")
+    private String bornTime;
+    /**
+     * 工作日期
+     */
+    @JsonProperty("workDate")
+    private String workDate;
+    /**
+     * 管理员头像
+     */
+    @JsonProperty("headImage")
+    private String headImage;
+    /**
+     * 备注
+     */
+    @JsonProperty("introduction")
+    private String introduction;
+    /**
+     * 描述
+     */
+    @JsonProperty("description")
+    private String description;
+    /**
+     * 创建时间
+     */
+    @JsonProperty("createTime")
+    private String createTime;
+    /**
+     * 导入方导入网格管理
+     * 员时, 数据唯一标识
+     */
+    @JsonProperty("id")
+    private Integer id;
+}
--- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/management/form/UserAddFormDTO.java
+++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/management/form/UserAddFormDTO.java
@ -0,0 +1,71 @@
+package com.elink.esua.epdc.dto.management.form;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@Data
+public class UserAddFormDTO {
+    /**
+     * 网格 id
+     */
+    @JsonProperty("gridId")
+    private Integer gridId;
+    /**
+     * 社区 id
+     */
+    @JsonProperty("circleId")
+    private Integer circleId;
+    /**
+     * 网格编号(网格名称)
+     */
+    @JsonProperty("gridNum")
+    private String gridNum;
+    /**
+     * 真实姓名
+     */
+    @JsonProperty("userRealName")
+    private String userRealName;
+    /**
+     * 地址
+     */
+    @JsonProperty("userAddress")
+    private String userAddress;
+    /**
+     * 详细地址
+     */
+    @JsonProperty("userAddressDetails")
+    private String userAddressDetails;
+    /**
+     * 创建时间
+     */
+    @JsonProperty("createTime")
+    private String createTime;
+    /**
+     * 用户手机号
+     */
+    @JsonProperty("phone")
+    private String phone;
+    /**
+     * 导入方导入网格用户
+     * 时, 网格用户数据唯
+     * 一标识
+     */
+    @JsonProperty("oldGridUserId")
+    private String oldGridUserId;
+    /**
+     * 备注
+     */
+    @JsonProperty("remark")
+    private String remark;
+    /**
+     * 身份证号
+     */
+    @JsonProperty("identityCard")
+    private String identityCard;
+    @JsonProperty("birthday")
+    private String birthday;
+    @JsonProperty("gender")
+    private Integer gender;
+}
--- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/management/form/UserDelFormDTO.java
+++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/management/form/UserDelFormDTO.java
@ -0,0 +1,17 @@
+package com.elink.esua.epdc.dto.management.form;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@Data
+public class UserDelFormDTO {
+    /**
+     * 导入方导入网格用户
+     * 时, 网格用户数据唯
+     * 一标识
+     */
+    @JsonProperty("userGridId")
+    private Integer userGridId;
+}
--- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/management/form/UserUpdFormDTO.java
+++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/management/form/UserUpdFormDTO.java
@ -0,0 +1,51 @@
+package com.elink.esua.epdc.dto.management.form;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@Data
+public class UserUpdFormDTO {
+    /**
+     * 网格编号(网格名称)
+     */
+    @JsonProperty("gridNum")
+    private String gridNum;
+    /**
+     * 真实姓名
+     */
+    @JsonProperty("userRealName")
+    private String userRealName;
+    /**
+     * 地址
+     */
+    @JsonProperty("userAddress")
+    private String userAddress;
+    /**
+     * 详细地址
+     */
+    @JsonProperty("userAddressDetails")
+    private String userAddressDetails;
+    /**
+     * 导入方导入网格用户
+     * 时, 网格用户数据唯
+     * 一标识
+     */
+    @JsonProperty("userGridId")
+    private Integer userGridId;
+    /**
+     * 备注
+     */
+    @JsonProperty("remark")
+    private String remark;
+    /**
+     * 身份证号
+     */
+    @JsonProperty("identityCard")
+    private String identityCard;
+    @JsonProperty("birthday")
+    private String birthday;
+    @JsonProperty("gender")
+    private Integer gender;
+}
--- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/feign/CommunityManageFeignClient.java
+++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/feign/CommunityManageFeignClient.java
@ -0,0 +1,53 @@
+package com.elink.esua.epdc.feign;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.management.form.*;
+import com.elink.esua.epdc.dto.management.result.GlobalResultDTO;
+import com.elink.esua.epdc.feign.fallback.CommunityManageFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author zhy
+ * @date 2022/12/8 9:37
+ */
+@FeignClient(name = ServiceConstant.EPDC_CUSTOM_SERVER, fallback = CommunityManageFeignClientFallback.class)
+public interface CommunityManageFeignClient {
+
+    @PostMapping(value = "custom/manage/addCommunity", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<GlobalResultDTO> addCommunity(CommunityAddFormDTO dto);
+
+    @PostMapping(value = "custom/manage/updCommunity", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<GlobalResultDTO> updCommunity(CommunityUpdFormDTO dto);
+
+    @PostMapping(value = "custom/manage/addGrid", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<GlobalResultDTO> addGrid(GridAddFormDTO dto);
+
+    @PostMapping(value = "custom/manage/updGrid", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<GlobalResultDTO> updGrid(GridUpdFormDTO dto);
+
+    @PostMapping(value = "custom/manage/delGrid", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<GlobalResultDTO> delGrid(GridDelFormDTO dto);
+
+    @PostMapping(value = "custom/manage/addUser", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<GlobalResultDTO> addUser(UserAddFormDTO dto);
+
+    @PostMapping(value = "custom/manage/updUser", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<GlobalResultDTO> updUser(UserUpdFormDTO dto);
+
+    @PostMapping(value = "custom/manage/delUser", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<GlobalResultDTO> delUser(UserDelFormDTO dto);
+
+    @PostMapping(value = "custom/manage/addManageUser", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<GlobalResultDTO> addManageUser(ManageUserAddFormDTO dto);
+
+    @PostMapping(value = "custom/manage/updManageUser", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<GlobalResultDTO> updManageUser(ManageUserUpdFormDTO dto);
+
+    @PostMapping(value = "custom/manage/delManageUser", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<GlobalResultDTO> delManageUser(ManageUserDelFormDTO dto);
+
+}
--- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/feign/fallback/CommunityManageFeignClientFallback.java
+++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/feign/fallback/CommunityManageFeignClientFallback.java
@ -0,0 +1,73 @@
+package com.elink.esua.epdc.feign.fallback;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.management.form.*;
+import com.elink.esua.epdc.dto.management.result.GlobalResultDTO;
+import com.elink.esua.epdc.feign.CommunityManageFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author zhy
+ * @date 2022/12/8 9:38
+ */
+@Component
+public class CommunityManageFeignClientFallback implements CommunityManageFeignClient {
+
+    @Override
+    public Result<GlobalResultDTO> addCommunity(CommunityAddFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "addCommunity", dto);
+    }
+
+    @Override
+    public Result<GlobalResultDTO> updCommunity(CommunityUpdFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "updCommunity", dto);
+    }
+
+    @Override
+    public Result<GlobalResultDTO> addGrid(GridAddFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "addGrid", dto);
+    }
+
+    @Override
+    public Result<GlobalResultDTO> updGrid(GridUpdFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "updGrid", dto);
+    }
+
+    @Override
+    public Result<GlobalResultDTO> delGrid(GridDelFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "delGrid", dto);
+    }
+
+    @Override
+    public Result<GlobalResultDTO> addUser(UserAddFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "addUser", dto);
+    }
+
+    @Override
+    public Result<GlobalResultDTO> updUser(UserUpdFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "updUser", dto);
+    }
+
+    @Override
+    public Result<GlobalResultDTO> delUser(UserDelFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "delUser", dto);
+    }
+
+    @Override
+    public Result<GlobalResultDTO> addManageUser(ManageUserAddFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "addManageUser", dto);
+    }
+
+    @Override
+    public Result<GlobalResultDTO> updManageUser(ManageUserUpdFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "updManageUser", dto);
+    }
+
+    @Override
+    public Result<GlobalResultDTO> delManageUser(ManageUserDelFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "delManageUser", dto);
+    }
+
+}