党支部、用户分布、党员分布

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchFormDTO.java

@@ -0,0 +1,24 @@
+package com.epmet.screen.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/18 10:49 上午
+ */
+@Data
+public class BranchFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -8256381995441422191L;
+
+    public interface Branch{}
+
+    /**
+     * 机关ID
+     */
+    @NotBlank(message = "机关ID不能为空",groups = {Branch.class})
+    private String agencyId;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ParymemberFormDTO.java

@@ -0,0 +1,24 @@
+package com.epmet.screen.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/18 10:49 上午
+ */
+@Data
+public class ParymemberFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -5589396567320406525L;
+
+    public interface Parymember{}
+
+    /**
+     * 机关ID
+     */
+    @NotBlank(message = "机关ID不能为空",groups = {Parymember.class})
+    private String agencyId;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/UserFormDTO.java

@@ -0,0 +1,24 @@
+package com.epmet.screen.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/18 10:49 上午
+ */
+@Data
+public class UserFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 4863908542899315106L;
+
+    public interface User{}
+
+    /**
+     * 机关ID
+     */
+    @NotBlank(message = "机关ID不能为空",groups = {User.class})
+    private String agencyId;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchResultDTO.java

@@ -0,0 +1,35 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/18 10:52 上午
+ */
+@Data
+public class BranchResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -8001714892170166320L;
+
+    /**
+     * 名称：根据当前所在组织，查询出的子级名称
+     */
+    private String name;
+
+    /**
+     * 可能是agencyId，也可以是gridId， 也可以是deptId
+     */
+    private String id;
+
+    /**
+     * 组织：agency  网格：grid  部门：dept
+     */
+    private String type;
+
+    /**
+     * 中心点位
+     */
+    private String centerMark;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberDistributionResultDTO.java

@@ -0,0 +1,46 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/18 11:06 上午
+ */
+@Data
+public class ParymemberDistributionResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 9180892033529262049L;
+
+    /**
+     * 可能是gridId,可能是agencyId
+     */
+    private String subId;
+
+    /**
+     * 中心点位
+     */
+    private String centerMark;
+
+    /**
+     * 党员总人数
+     */
+    private Integer totalNum;
+
+    /**
+     * 坐标区域
+     */
+    private String areaMarks;
+
+    /**
+     * 可以是网格的名称，可以是组织的名称
+     */
+    private String subName;
+
+    /**
+     * 组织：agency,  网格 ： grid；
+     */
+    private String type;
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberResultDTO.java

@@ -0,0 +1,36 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/18 11:03 上午
+ */
+@Data
+public class ParymemberResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -7230556020628357047L;
+
+    /**
+     * 当前所选组织
+     */
+    private String agencyId;
+
+    /**
+     * 当前所选组织名称
+     */
+    private String name;
+
+    /**
+     * 当前所选组织的坐标区域
+     */
+    private String areaMarks;
+
+    /**
+     * 子级用户分布
+     */
+    private List<ParymemberDistributionResultDTO> userDistribution;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserDistributionResultDTO.java

@@ -0,0 +1,46 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/18 11:06 上午
+ */
+@Data
+public class UserDistributionResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -7679590088019724244L;
+
+    /**
+     * 可能是gridId,可能是agencyId
+     */
+    private String subId;
+
+    /**
+     * 中心点位
+     */
+    private String centerMark;
+
+    /**
+     * 用户总人数
+     */
+    private Integer totalNum;
+
+    /**
+     * 坐标区域
+     */
+    private String areaMarks;
+
+    /**
+     * 可以是网格的名称，可以是组织的名称
+     */
+    private String subName;
+
+    /**
+     * 组织：agency,  网格 ： grid；
+     */
+    private String type;
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserResultDTO.java

@@ -0,0 +1,36 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/18 11:03 上午
+ */
+@Data
+public class UserResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -6633682494274511121L;
+
+    /**
+     * 当前所选组织
+     */
+    private String agencyId;
+
+    /**
+     * 当前所选组织名称
+     */
+    private String name;
+
+    /**
+     * 当前所选组织的坐标区域
+     */
+    private String areaMarks;
+
+    /**
+     * 子级用户分布
+     */
+    private List<UserDistributionResultDTO> userDistribution;
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/DistributionController.java

@@ -1,5 +1,17 @@
 package com.epmet.controller.screen;
 
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.screen.dto.form.BranchFormDTO;
+import com.epmet.screen.dto.form.ParymemberFormDTO;
+import com.epmet.screen.dto.form.UserFormDTO;
+import com.epmet.screen.dto.result.BranchResultDTO;
+import com.epmet.screen.dto.result.ParymemberResultDTO;
+import com.epmet.screen.dto.result.UserResultDTO;
+import com.epmet.service.screen.DistributionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,4 +24,44 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/screen/distribution")
 public class DistributionController {
+
+    @Autowired
+    private DistributionService distributionService;
+
+    /**
+     * @Description  1、党支部
+     * @param formDTO
+     * @author zxc
+     * @date 2020/8/18 10:59 上午
+     */
+    @PostMapping("branch")
+    public Result<BranchResultDTO> branch(@RequestBody BranchFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, BranchFormDTO.Branch.class);
+        return new Result<BranchResultDTO>().ok(distributionService.branch(formDTO));
+    }
+
+    /**
+     * @Description  2、用户分布
+     * @param userFormDTO
+     * @author zxc
+     * @date 2020/8/18 11:10 上午
+     */
+    @PostMapping("user")
+    public Result<UserResultDTO> user(@RequestBody UserFormDTO userFormDTO){
+        ValidatorUtils.validateEntity(userFormDTO, UserFormDTO.User.class);
+        return new Result<UserResultDTO>().ok(distributionService.user(userFormDTO));
+    }
+
+    /**
+     * @Description  3、党员分布
+     * @param parymemberFormDTO
+     * @author zxc
+     * @date 2020/8/18 11:20 上午
+     */
+    @PostMapping("parymember")
+    public Result<ParymemberResultDTO> parymember(@RequestBody ParymemberFormDTO parymemberFormDTO){
+        ValidatorUtils.validateEntity(parymemberFormDTO, ParymemberFormDTO.Parymember.class);
+        return new Result<ParymemberResultDTO>().ok(distributionService.parymember(parymemberFormDTO));
+    }
+
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/DistributionService.java

@@ -1,5 +1,12 @@
 package com.epmet.service.screen;
 
+import com.epmet.screen.dto.form.BranchFormDTO;
+import com.epmet.screen.dto.form.ParymemberFormDTO;
+import com.epmet.screen.dto.form.UserFormDTO;
+import com.epmet.screen.dto.result.BranchResultDTO;
+import com.epmet.screen.dto.result.ParymemberResultDTO;
+import com.epmet.screen.dto.result.UserResultDTO;
+
 /**
  * 中央区相关各指标查询
  *
@@ -7,4 +14,29 @@ package com.epmet.service.screen;
  * @date 2020/8/18 10:19
  */
 public interface DistributionService {
+
+    /**
+     * @Description  1、党支部
+     * @param formDTO
+     * @author zxc
+     * @date 2020/8/18 10:59 上午
+     */
+    BranchResultDTO branch(BranchFormDTO formDTO);
+
+    /**
+     * @Description  2、用户分布
+     * @param  userFormDTO
+     * @author zxc
+     * @date 2020/8/18 11:10 上午
+     */
+    UserResultDTO user(UserFormDTO userFormDTO);
+
+    /**
+     * @Description  3、党员分布
+     * @param parymemberFormDTO
+     * @author zxc
+     * @date 2020/8/18 11:20 上午
+     */
+    ParymemberResultDTO parymember(ParymemberFormDTO parymemberFormDTO);
+
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/DistributionServiceImpl.java

@@ -1,5 +1,11 @@
 package com.epmet.service.screen.impl;
 
+import com.epmet.screen.dto.form.BranchFormDTO;
+import com.epmet.screen.dto.form.ParymemberFormDTO;
+import com.epmet.screen.dto.form.UserFormDTO;
+import com.epmet.screen.dto.result.BranchResultDTO;
+import com.epmet.screen.dto.result.ParymemberResultDTO;
+import com.epmet.screen.dto.result.UserResultDTO;
 import com.epmet.service.screen.DistributionService;
 
 /**
@@ -9,4 +15,37 @@ import com.epmet.service.screen.DistributionService;
  * @date 2020/8/18 10:19
  */
 public class DistributionServiceImpl implements DistributionService {
+
+    /**
+     * @Description  1、党支部
+     * @param formDTO
+     * @author zxc
+     * @date 2020/8/18 10:59 上午
+     */
+    @Override
+    public BranchResultDTO branch(BranchFormDTO formDTO) {
+        return null;
+    }
+
+    /**
+     * @Description  2、用户分布
+     * @param userFormDTO
+     * @author zxc
+     * @date 2020/8/18 11:10 上午
+     */
+    @Override
+    public UserResultDTO user(UserFormDTO userFormDTO) {
+        return null;
+    }
+
+    /**
+     * @Description  3、党员分布
+     * @param parymemberFormDTO
+     * @author zxc
+     * @date 2020/8/18 11:20 上午
+     */
+    @Override
+    public ParymemberResultDTO parymember(ParymemberFormDTO parymemberFormDTO) {
+        return null;
+    }
 }