Browse Source

Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data

master
yinzuomei 5 years ago
parent
commit
e20e1d3672
  1. 2
      epmet-auth/deploy/docker-compose-prod.yml
  2. 2
      epmet-gateway/deploy/docker-compose-prod.yml
  3. 24
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchFormDTO.java
  4. 24
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ParymemberFormDTO.java
  5. 24
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/UserFormDTO.java
  6. 35
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchResultDTO.java
  7. 46
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberDistributionResultDTO.java
  8. 36
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberResultDTO.java
  9. 46
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserDistributionResultDTO.java
  10. 36
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserResultDTO.java
  11. 52
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/screen/DistributionController.java
  12. 32
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/DistributionService.java
  13. 39
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/screen/impl/DistributionServiceImpl.java
  14. 2
      epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml
  15. 2
      epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml
  16. 2
      epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml
  17. 2
      epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
  18. 2
      epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml
  19. 2
      epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
  20. 2
      epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml
  21. 2
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
  22. 2
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
  23. 2
      epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml
  24. 2
      epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
  25. 2
      epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml
  26. 2
      epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml
  27. 2
      epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
  28. 2
      epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml
  29. 2
      epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
  30. 2
      epmet-user/epmet-user-server/deploy/docker-compose-test.yml

2
epmet-auth/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-auth-server:
container_name: epmet-auth-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.66
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.68
ports:
- "8081:8081"
network_mode: host # 使用现有网络

2
epmet-gateway/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-gateway-server:
container_name: epmet-gateway-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.26
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.30
ports:
- "8080:8080"
network_mode: host # 使用现有网络

24
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;
}

24
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;
}

24
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;
}

35
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;
}

46
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;
}

36
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;
}

46
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;
}

36
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;
}

52
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));
}
}

32
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);
}

39
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;
}
}

2
epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
common-service-server:
container_name: common-service-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.5
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.9
ports:
- "8103:8103"
network_mode: host # 使用现有网络

2
epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-job-server:
container_name: epmet-job-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.22
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.25
ports:
- "8084:8084"
network_mode: host # 使用现有网络

2
epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-message-server:
container_name: epmet-message-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.25
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.28
ports:
- "8085:8085"
network_mode: host # 使用现有网络

2
epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml

@ -3,7 +3,7 @@ services:
epmet-oss-server:
container_name: epmet-oss-server-prod
# image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/epmet-oss-server:0.3.2
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.22
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.25
ports:
- "8083:8083"
network_mode: host # 使用现有网络

2
epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-point-server:
container_name: epmet-point-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:0.0.1
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:0.0.40
ports:
- "8112:8112"
network_mode: host # 使用现有网络

2
epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-third-server:
container_name: epmet-third-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.75
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.131
ports:
- "8110:8110"
network_mode: host # 使用现有网络

2
epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-access-server:
container_name: gov-access-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.37
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.38
ports:
- "8099:8099"
network_mode: host # 使用现有网络

2
epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-org-server:
container_name: gov-org-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.81
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.83
ports:
- "8092:8092"
network_mode: host # 使用现有网络

2
epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-project-server:
container_name: gov-project-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.39
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.40
ports:
- "8102:8102"
network_mode: host # 使用现有网络

2
epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-voice-server:
container_name: gov-voice-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:0.3.60
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:0.3.68
ports:
- "8105:8105"
network_mode: host # 使用现有网络

2
epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
oper-crm-server:
container_name: oper-crm-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.58
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.66
ports:
- "8090:8090"
network_mode: host # 使用现有网络

2
epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
oper-customize-server:
container_name: oper-customize-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.25
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.26
ports:
- "8089:8089"
network_mode: host # 使用现有网络

2
epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-group-server:
container_name: resi-group-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.62
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.66
ports:
- "8095:8095"
network_mode: host # 使用现有网络

2
epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-group-server:
container_name: resi-group-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.64
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.66
ports:
- "8095:8095"
network_mode: host # 使用现有网络

2
epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-guide-server:
container_name: resi-guide-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.17
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.20
ports:
- "8091:8091"
network_mode: host # 使用现有网络

2
epmet-user/epmet-user-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-user-server:
container_name: epmet-user-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.102
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.118
ports:
- "8087:8087"
network_mode: host # 不会创建新的网络

2
epmet-user/epmet-user-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-user-server:
container_name: epmet-user-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.116
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.118
ports:
- "8087:8087"
network_mode: host # 不会创建新的网络

Loading…
Cancel
Save