Browse Source

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

master
wangchao 5 years ago
parent
commit
9ee7003a28
  1. 2
      epmet-admin/epmet-admin-server/docker-compose.yml
  2. 2
      epmet-admin/epmet-admin-server/pom.xml
  3. 2
      epmet-auth/docker-compose.yml
  4. 2
      epmet-auth/pom.xml
  5. 27
      epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/aspect/DataFilterAspect.java
  6. 24
      epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/interceptor/DataFilterInterceptor.java
  7. 8
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/RequirePermission.java
  8. 5
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/AccessOpeAspect.java
  9. 30
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/PermissionInitializer.java
  10. 69
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
  11. 2
      epmet-gateway/docker-compose.yml
  12. 2
      epmet-gateway/pom.xml
  13. 2
      epmet-module/gov-access/gov-access-server/docker-compose.yml
  14. 2
      epmet-module/gov-access/gov-access-server/pom.xml
  15. 32
      epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/CertifiedFormDTO.java
  16. 15
      epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditedPartyMemberResultDTO.java
  17. 15
      epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditingPartyMemberResultDTO.java
  18. 42
      epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java
  19. 2
      epmet-module/gov-grid/gov-grid-server/docker-compose.yml
  20. 2
      epmet-module/gov-grid/gov-grid-server/pom.xml
  21. 17
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java
  22. 12
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java
  23. 7
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java
  24. 15
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java
  25. 18
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java
  26. 2
      epmet-module/gov-mine/gov-mine-server/docker-compose.yml
  27. 2
      epmet-module/gov-mine/gov-mine-server/pom.xml
  28. 22
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/SelectGridNameByGridIdFormDTO.java
  29. 27
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SelectGridNameByGridIdResultDTO.java
  30. 2
      epmet-module/gov-org/gov-org-server/docker-compose.yml
  31. 2
      epmet-module/gov-org/gov-org-server/pom.xml
  32. 13
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
  33. 12
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
  34. 11
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
  35. 13
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
  36. 12
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
  37. 2
      epmet-module/oper-access/oper-access-server/docker-compose.yml
  38. 2
      epmet-module/oper-access/oper-access-server/pom.xml
  39. 2
      epmet-module/oper-crm/oper-crm-server/docker-compose.yml
  40. 2
      epmet-module/oper-crm/oper-crm-server/pom.xml
  41. 2
      epmet-module/oper-customize/oper-customize-server/docker-compose.yml
  42. 2
      epmet-module/oper-customize/oper-customize-server/pom.xml
  43. 2
      epmet-module/resi-group/resi-group-server/docker-compose.yml
  44. 2
      epmet-module/resi-group/resi-group-server/pom.xml
  45. 2
      epmet-module/resi-guide/resi-guide-server/docker-compose.yml
  46. 2
      epmet-module/resi-guide/resi-guide-server/pom.xml
  47. 2
      epmet-module/resi-mine/resi-mine-server/docker-compose.yml
  48. 2
      epmet-module/resi-mine/resi-mine-server/pom.xml
  49. 21
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/UserHeadPhotoDTO.java
  50. 32
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/CertifiedFormDTO.java
  51. 42
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedResultDTO.java
  52. 15
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/ReviewedParyMemberResultDTO.java
  53. 15
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/UnderReviewParyMemberResultDTO.java
  54. 2
      epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml
  55. 2
      epmet-module/resi-partymember/resi-partymember-server/pom.xml
  56. 10
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java
  57. 17
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java
  58. 6
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java
  59. 7
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java
  60. 13
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java
  61. 13
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberInfoDao.java
  62. 11
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java
  63. 36
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java
  64. 27
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml
  65. 15
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml
  66. 26
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserHeadPhotoDTO.java
  67. 42
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java
  68. 2
      epmet-user/epmet-user-server/docker-compose.yml
  69. 2
      epmet-user/epmet-user-server/pom.xml
  70. 4
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java
  71. 48
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserWechatController.java
  72. 10
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java
  73. 6
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserWechatService.java
  74. 1
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
  75. 22
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserWechatServiceImpl.java
  76. 15
      epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml

2
epmet-admin/epmet-admin-server/docker-compose.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-admin-server:
container_name: epmet-admin-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-admin-server:0.3.1
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-admin-server:0.3.2
ports:
- "8082:8082"
network_mode: host # 使用现有网络

2
epmet-admin/epmet-admin-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.1</version>
<version>0.3.2</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-admin</artifactId>

2
epmet-auth/docker-compose.yml

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

2
epmet-auth/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.1</version>
<version>0.3.2</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-cloud</artifactId>

27
epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/aspect/DataFilterAspect.java

@ -50,6 +50,8 @@ public class DataFilterAspect {
*/
private static final ThreadLocal<Boolean> hasConditions = new ThreadLocal();
public static final ThreadLocal<String> sqlFilter = new ThreadLocal();
@Autowired
private LoginUserUtil loginUserUtil;
@ -63,6 +65,10 @@ public class DataFilterAspect {
@Before("@annotation(com.epmet.commons.mybatis.annotation.DataFilter)")
public void dataFilter(JoinPoint point) {
//清空
sqlFilter.set(null);
// 通过反射,取到注解属性
DataFilter dataFilterAnno = ((MethodSignature) point.getSignature()).getMethod().getAnnotation(DataFilter.class);
String tableAlias = dataFilterAnno.tableAlias();
@ -71,7 +77,7 @@ public class DataFilterAspect {
String requirePermission = AccessOpeAspect.requirePermissionTl.get();
// 没有配置所需权限,不做操作,打印提示日志
if (StringUtils.isBlank(requirePermission)) {
log.warn("Api编码需要指定所需权限,请在Api上使用@RequirePermission注解完成所需权限配置");
log.warn("接口缺少所需权限配置,请在Controller方法上使用@RequirePermission注解完成所需权限配置");
return;
}
@ -107,13 +113,18 @@ public class DataFilterAspect {
String sqlFilterSegment = getSqlFilterSegment(userId, permCacheResultDTO.getRoleIdList(), requirePermission,
permCacheResultDTO.getOrgIdPath(), permCacheResultDTO.getGridId(), tableAlias, permCacheResultDTO.getDeptIdList());
// 填充到Service方法列表中的DataScope对象中
Object[] methodArgs = point.getArgs();
for (Object methodArg : methodArgs) {
if (methodArg instanceof DataScope) {
((DataScope) methodArg).setSqlFilter(sqlFilterSegment);
return;
}
// 方式1.填充到Service方法列表中的DataScope对象中。如果dao入参是用DTO的话,那么再加一个DataScope入参,sql中会报错提示#{}参数找不到,因此改用方法2
//Object[] methodArgs = point.getArgs();
//for (Object methodArg : methodArgs) {
// if (methodArg instanceof DataScope) {
// ((DataScope) methodArg).setSqlFilter(sqlFilterSegment);
// return;
// }
//}
// 方式2,采用ThreadLocal传参到DataFilterInterceptor中
if (StringUtils.isNotBlank(sqlFilterSegment)) {
sqlFilter.set(sqlFilterSegment);
}
}

24
epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/interceptor/DataFilterInterceptor.java

@ -11,6 +11,7 @@ package com.epmet.commons.mybatis.interceptor;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
import com.baomidou.mybatisplus.extension.handlers.AbstractSqlParserHandler;
import com.epmet.commons.mybatis.aspect.DataFilterAspect;
import com.epmet.commons.mybatis.entity.DataScope;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.executor.statement.StatementHandler;
@ -53,8 +54,8 @@ public class DataFilterInterceptor extends AbstractSqlParserHandler implements I
String originalSql = boundSql.getSql();
Object paramObj = boundSql.getParameterObject();
// 判断参数里是否有DataScope对象
DataScope scope = null;
// 方式1.判断参数里是否有DataScope对象
/*DataScope scope = null;
if (paramObj instanceof DataScope) {
// 直接传入DataScope,不分页?
scope = (DataScope) paramObj;
@ -75,25 +76,34 @@ public class DataFilterInterceptor extends AbstractSqlParserHandler implements I
if (scope == null) {
return invocation.proceed();
}
// 拼接新SQL
String orderBy = "ORDER BY";
String groupBy = "GROUP BY";
String sqlFilter = scope.getSqlFilter();
*/
// 方式2.从ThreadLocal中取sqlFilter
String sqlFilter = DataFilterAspect.sqlFilter.get();
if (StringUtils.isBlank(sqlFilter)) {
return invocation.proceed();
}
// 没有where就拼接where,有了where就拼接AND
if (originalSql.indexOf("WHERE") == 0) {
// 不包含where,需要手动拼接上
sqlFilter = " WHERE ".concat(sqlFilter);
} else {
sqlFilter = " AND (".concat(sqlFilter).concat(")");
}
// 拼接新SQL
String orderBy = "ORDER BY";
String groupBy = "GROUP BY";
if (originalSql.indexOf(groupBy) > -1) {
originalSql = originalSql.replace(groupBy, sqlFilter + groupBy);
} else if (originalSql.indexOf(orderBy) > -1) {
originalSql = originalSql.replace(orderBy, sqlFilter + orderBy);
} else {
originalSql = originalSql.concat(" AND (").concat(scope.getSqlFilter()).concat(")");
originalSql = originalSql.concat(sqlFilter);
}
// 重写SQL

8
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/RequirePermission.java

@ -16,6 +16,8 @@
package com.epmet.commons.tools.annotation;
import com.epmet.commons.tools.enums.RequirePermissionEnum;
import java.lang.annotation.*;
/**
@ -28,9 +30,5 @@ import java.lang.annotation.*;
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface RequirePermission {
String key() default "";
String desc() default "";
RequirePermissionEnum requirePermission();
}

5
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/AccessOpeAspect.java

@ -9,6 +9,7 @@
package com.epmet.commons.tools.aspect;
import com.epmet.commons.tools.annotation.RequirePermission;
import com.epmet.commons.tools.enums.RequirePermissionEnum;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
@ -35,8 +36,8 @@ public class AccessOpeAspect {
// 取RequirePermission注解
MethodSignature methodSignature = (MethodSignature) point.getSignature();
RequirePermission requirePermissionAnno = methodSignature.getMethod().getAnnotation(RequirePermission.class);
String key = requirePermissionAnno.key();
String desc = requirePermissionAnno.desc();
RequirePermissionEnum requirePermissionEnum = requirePermissionAnno.requirePermission();
String key = requirePermissionEnum.getKey();
// 放入ThreadLocal,供DataFilterAspect中使用
requirePermissionTl.set(key);

30
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/PermissionInitializer.java

@ -0,0 +1,30 @@
//package com.epmet.commons.tools.config;
//
//import com.epmet.commons.tools.annotation.RequirePermission;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.context.ApplicationContext;
//import org.springframework.context.annotation.Configuration;
//
//import javax.annotation.PostConstruct;
//import java.util.Map;
//
//@Configuration
//public class PermissionInitializer {
//
// @Autowired
// private ApplicationContext applicationContext;
//
// /**
// * 初始化操作权限
// */
// @PostConstruct
// public void initOpePermissions() {
// Map<String, Object> beanMap = applicationContext.getBeansWithAnnotation(RequirePermission.class);
// for (Map.Entry<String, Object> entry : beanMap.entrySet()) {
// System.out.println(entry);
// }
//
// }
//
//
//}

69
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java

@ -0,0 +1,69 @@
package com.epmet.commons.tools.enums;
public enum RequirePermissionEnum {
WORK_GRASSROOTS_GROUP_AUDITINGLIST("work_grassroots_group_auditinglist", "基层治理-群组管理-待审核列表", "基层治理-群组管理-待审核列表"),
WORK_GRASSROOTS_GROUP_AUDIT("work_grassroots_group_audit", "基层治理-群组管理-审核建组", "基层治理-群组管理-审核建组"),
WORK_GRASSROOTS_GROUP_GROUPSINTHEGRID("work_grassroots_group_groupsinthegrid", "基层治理-群组管理-本网格小组列表", "基层治理-群组管理-本网格小组列表"),
WORK_GRASSROOTS_RESI_WARMHEARTED_AUDITINGLIST("work_grassroots_resi_warmhearted_auditinglist", "基层治理-居民管理-热心居民待审核列表", "基层治理-居民管理-热心居民待审核列表"),
WORK_GRASSROOTS_RESI_WARMHEARTED_AUDITHISTORYLIST("work_grassroots_resi_warmhearted_audithistorylist", "基层治理-居民管理-热心审核历史", "基层治理-居民管理-热心审核历史"),
WORK_GRASSROOTS_RESI_WARMHEARTED_AUDIT("work_grassroots_resi_warmhearted_audit", "基层治理-居民管理-热心居民审核", "基层治理-居民管理-热心居民审核"),
ORG_AGENCY_TRACE("org_agency_trace", "组织-查看上级机关", "组织-查看上级机关"),
ORG_AGENCY_UPDATE("org_agency_update", "组织-机关单位-编辑", "组织-机关单位-编辑"),
ORG_SUBAGENCY_LIST("org_subagency_list", "组织-下级机关-列表", "组织-下级机关-列表"),
ORG_SUBAGENCY_CREATE("org_subagency_create", "组织-下级机关-新增", "组织-下级机关-新增"),
ORG_SUBAGENCY_DELETE("org_subagency_delete", "组织-下级机关-删除", "组织-下级机关-删除"),
ORG_STAFF_DETAIL("org_staff_detail", "组织-工作人员-详情", "组织-工作人员-详情"),
ORG_STAFF_LIST("org_staff_list", "组织-工作人员-列表", "组织-工作人员-列表"),
ORG_STAFF_CREATE("org_staff_create", "组织-工作人员-新增", "组织-工作人员-新增"),
ORG_STAFF_UPDATE("org_staff_update", "组织-工作人员-编辑", "组织-工作人员-编辑"),
ORG_STAFF_FORBIDDEN("org_staff_forbidden", "组织-工作人员-禁用", "组织-工作人员-禁用"),
ORG_DEPARTMENT_LIST("org_department_list", "组织-直属部门-部门列表", "组织-直属部门-部门列表"),
ORG_DEPARTMENT_CREATE("org_department_create", "组织-直属部门-新增部门", "组织-直属部门-新增部门"),
ORG_DEPARTMENT_UPDATE("org_department_update", "组织-直属部门-编辑部门", "组织-直属部门-编辑部门"),
ORG_DEPARTMENT_DELETE("org_department_delete", "组织-直属部门-删除", "组织-直属部门-删除"),
ORG_DEPARTMENT_STAFF_ADD("org_department_staff_add", "组织-直属部门-添加人员", "组织-直属部门-添加人员"),
ORG_DEPARTMENT_STAFF_REMOVE("org_department_staff_remove", "组织-直属部门-移除人员", "组织-直属部门-移除人员"),
ORG_DEPARTMENT_STAFF_LIST("org_department_staff_list", "组织-直属部门-人员列表", "组织-直属部门-人员列表"),
ORG_GRID_LIST("org_grid_list", "组织-治理网格-网格列表", "组织-治理网格-网格列表"),
ORG_GRID_CREATE("org_grid_create", "组织-治理网格-新增网格", "组织-治理网格-新增网格"),
ORG_GRID_UPDATE("org_grid_update", "组织-治理网格-编辑网格", "组织-治理网格-编辑网格"),
ORG_GRID_DELETE("org_grid_delete", "组织-治理网格-删除", "组织-治理网格-删除"),
ORG_GRID_STAFF_ADD("org_grid_staff_add", "组织-治理网格-新增网格工作人员", "组织-治理网格-新增网格工作人员"),
ORG_GRID_STAFF_REMOVE("org_grid_staff_remove", "组织-治理网格-移除网格工作人员", "组织-治理网格-移除网格工作人员"),
ORG_PARTYMEMBER_SUMMARY("org_partymember_summary", "组织-党员-汇总信息", "组织-党员-汇总信息");
private String key;
private String name;
private String brief;
RequirePermissionEnum(String key, String name, String brief) {
this.key = key;
this.name = name;
this.brief = brief;
}
public String getKey() {
return key;
}
public void setKey(String key) {
this.key = key;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getBrief() {
return brief;
}
public void setBrief(String brief) {
this.brief = brief;
}
}

2
epmet-gateway/docker-compose.yml

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

2
epmet-gateway/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.2</version>
<version>0.3.3</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-cloud</artifactId>

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

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

2
epmet-module/gov-access/gov-access-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.1</version>
<version>0.3.2</version>
<parent>
<artifactId>gov-access</artifactId>
<groupId>com.epmet</groupId>

32
epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/CertifiedFormDTO.java

@ -0,0 +1,32 @@
package com.epmet.dto.form;
import lombok.Data;
import java.io.Serializable;
/**
* @Auther zxc
* @Create 2020-04-26 16:31
* 已认证党员列表
*/
@Data
public class CertifiedFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 页码
*/
private Integer pageNo;
/**
* 每页数量
*/
private Integer pageSize;
/**
* 网格id
*/
private String gridId;
}

15
epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditedPartyMemberResultDTO.java

@ -42,5 +42,20 @@ public class AuditedPartyMemberResultDTO implements Serializable {
* read已读unread未读
*/
private String gridFullPath;
/**
* 党员认证信息表ID
*/
private String partyMemberId;
/**
* 党员自动审核表ID
*/
private String autoId;
/**
* 党员人工审核表ID
*/
private String manualId;
}

15
epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditingPartyMemberResultDTO.java

@ -43,5 +43,20 @@ public class AuditingPartyMemberResultDTO implements Serializable {
* read已读unread未读
*/
private String gridFullPath;
/**
* 党员认证信息表ID
*/
private String partyMemberId;
/**
* 党员自动审核表ID
*/
private String autoId;
/**
* 党员人工审核表ID
*/
private String manualId;
}

42
epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java

@ -0,0 +1,42 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Auther zxc
* @Create 2020-04-26 15:45
* 已认证党员列表
*/
@Data
public class CertifiedResultDTO implements Serializable {
private static final long serialVersionUID = -1L;
/**
* 用户id
*/
private String userId;
/**
* 真实姓名
*/
private String realName;
/**
* 居民头像
*/
private String userHeadPhoto;
/**
* applyTime 申请时间
*/
private Integer applyTime;
/**
* 提交网格XXX街道-XXX社区-XXX网格
*/
private String gridFullPath;
}

2
epmet-module/gov-grid/gov-grid-server/docker-compose.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-grid-server:
container_name: gov-grid-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.1
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.3
ports:
- "8097:8097"
network_mode: host # 使用现有网络

2
epmet-module/gov-grid/gov-grid-server/pom.xml

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.1</version>
<version>0.3.3</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>gov-grid</artifactId>

17
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java

@ -1,8 +1,12 @@
package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.AuditedPartyMemberFormDTO;
import com.epmet.dto.form.AuditingPartyMemberFormDTO;
import com.epmet.dto.form.CertifiedFormDTO;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.dto.result.AuditedPartyMemberResultDTO;
import com.epmet.dto.result.AuditingPartyMemberResultDTO;
import com.epmet.service.ResiPartyMemberService;
@ -48,6 +52,19 @@ public class ResiPartyMemberController {
public Result<List<AuditedPartyMemberResultDTO>> audited(@RequestBody AuditedPartyMemberFormDTO formDTO) {
return resiPartyMemberService.audited(formDTO);
}
/**
*
* @Description 获取已认证党员
* @param: tokenDto
* @param: certifiedFormDTO
* @Author zxc
* @CreatedTime 2020/4/26 16:18
*/
@PostMapping(value = "/certified")
public Result<List<CertifiedResultDTO>> certifiedList(@LoginUser TokenDto tokenDto, @RequestBody CertifiedFormDTO certifiedFormDTO){
return resiPartyMemberService.certifiedList(certifiedFormDTO);
}
}

12
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java

@ -2,6 +2,8 @@ package com.epmet.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.CertifiedFormDTO;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.feign.fallback.ResiPartymemberFeignClientFallBack;
import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
@ -87,4 +89,14 @@ public interface ResiPartymemberFeignClient {
**/
@PostMapping(value = "resi/partymember/partymemberbaseinfo/audited", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
Result<List<ReviewedParyMemberResultDTO>> auditedPartyMember(@RequestBody ReviewedParyMemberFormDTO reviewedParyMemberFormDTO);
/**
* 查询已认证党员
* @Description
* @Author zxc
* @CreatedTime 2020/4/27 10:29
*/
@PostMapping(value = "/resi/partymember/partymemberinfo/certified")
Result<List<CertifiedResultDTO>> certified(@RequestBody CertifiedFormDTO certifiedFormDTO);
}

7
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java

@ -3,6 +3,8 @@ package com.epmet.feign.fallback;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.CertifiedFormDTO;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.feign.ResiPartymemberFeignClient;
import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
@ -57,4 +59,9 @@ public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignC
return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "audited", reviewedParyMemberFormDTO);
}
@Override
public Result<List<CertifiedResultDTO>> certified(CertifiedFormDTO certifiedFormDTO) {
return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "certified", certifiedFormDTO);
}
}

15
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java

@ -1,8 +1,14 @@
package com.epmet.service;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.AuditedPartyMemberFormDTO;
import com.epmet.dto.form.AuditingPartyMemberFormDTO;
import com.epmet.dto.form.CertifiedFormDTO;
import com.epmet.dto.result.CertifiedResultDTO;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
import com.epmet.dto.result.AuditedPartyMemberResultDTO;
import com.epmet.dto.result.AuditingPartyMemberResultDTO;
@ -30,4 +36,13 @@ public interface ResiPartyMemberService {
* @Date 2020/4/26 23:32
**/
Result<List<AuditedPartyMemberResultDTO>> audited(AuditedPartyMemberFormDTO formDTO);
/**
*
* @Description 获取已认证党员
* @param: tokenDto
* @param: certifiedFormDTO
* @Author zxc
* @CreatedTime 2020/4/26 16:18
*/
Result<List<CertifiedResultDTO>> certifiedList(CertifiedFormDTO certifiedFormDTO);
}

18
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java

@ -6,6 +6,9 @@ import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.AuditedPartyMemberFormDTO;
import com.epmet.dto.form.AuditingPartyMemberFormDTO;
import com.epmet.dto.form.CertifiedFormDTO;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.feign.ResiPartymemberFeignClient;
import com.epmet.dto.result.AuditedPartyMemberResultDTO;
import com.epmet.dto.result.AuditingPartyMemberResultDTO;
import com.epmet.feign.ResiPartymemberFeignClient;
@ -19,6 +22,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
@ -66,5 +71,18 @@ public class ResiPartyMemberServiceImpl implements ResiPartyMemberService {
list = ConvertUtils.sourceToTarget(result.getData(), AuditedPartyMemberResultDTO.class);
return new Result<List<AuditedPartyMemberResultDTO>>().ok(list);
}
/**
*
* @Description 获取已认证党员
* @param: tokenDto
* @param: certifiedFormDTO
* @Author zxc
* @CreatedTime 2020/4/26 16:18
*/
@Override
public Result<List<CertifiedResultDTO>> certifiedList(CertifiedFormDTO certifiedFormDTO) {
return resiPartymemberFeignClient.certified(certifiedFormDTO);
}
}

2
epmet-module/gov-mine/gov-mine-server/docker-compose.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-mine-server:
container_name: gov-mine-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-mine-server:0.3.2
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-mine-server:0.3.3
ports:
- "8098:8098"
network_mode: host # 使用现有网络

2
epmet-module/gov-mine/gov-mine-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.2</version>
<version>0.3.3</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>gov-mine</artifactId>

22
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/SelectGridNameByGridIdFormDTO.java

@ -0,0 +1,22 @@
package com.epmet.dto.form;
import lombok.Data;
import java.io.Serializable;
/**
* @Auther zxc
* @Create 2020-04-27 9:16
* 根据gridId查询GridNameDTO
*/
@Data
public class SelectGridNameByGridIdFormDTO implements Serializable {
private static final long serialVersionUID = -1L;
/**
* 网格id
*/
private String gridId;
}

27
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SelectGridNameByGridIdResultDTO.java

@ -0,0 +1,27 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Auther zxc
* @Create 2020-04-27 9:16
* 根据gridId查询GridNameDTO
*/
@Data
public class SelectGridNameByGridIdResultDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 网格id
*/
private String gridId;
/**
* 网格名称
*/
private String gridName;
}

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

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

2
epmet-module/gov-org/gov-org-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.6</version>
<version>0.3.7</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>gov-org</artifactId>

13
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java

@ -26,6 +26,8 @@ import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.form.SelectGridNameByGridIdFormDTO;
import com.epmet.dto.result.SelectGridNameByGridIdResultDTO;
import com.epmet.dto.form.CustomerGridFormDTO;
import com.epmet.dto.form.ListCustomerGridFormDTO;
import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
@ -127,6 +129,17 @@ public class CustomerGridController {
return new Result<CustomerGridDTO>().ok(data);
}
/**
*
* @Description 根据网格id查询网格名称
* @Author zxc
* @CreatedTime 2020/4/27 9:22
*/
@PostMapping("selectGridNameByGridId")
public Result<SelectGridNameByGridIdResultDTO> selectGridNameByGridId(@RequestBody SelectGridNameByGridIdFormDTO formDTO){
return customerGridService.selectGridNameByGridId(formDTO);
}
/**
* @param gridId
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.GridInfoResultDTO>

12
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java

@ -18,11 +18,15 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.form.ListCustomerGridFormDTO;
import com.epmet.dto.form.SelectGridNameByGridIdFormDTO;
import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.CustomerStaffGridDTO;
import com.epmet.dto.UserIdDTO;
import com.epmet.dto.form.CustomerGridFormDTO;
import com.epmet.dto.result.SelectGridNameByGridIdResultDTO;
import com.epmet.dto.form.DeleteGridFormDTO;
import com.epmet.dto.form.ListCustomerGridFormDTO;
import com.epmet.dto.result.AddGridResultDTO;
@ -70,6 +74,14 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
CustomerGridDTO getCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO);
/**
*
* @Description 根据网格id查询网格名称
* @Author zxc
* @CreatedTime 2020/4/27 9:22
*/
SelectGridNameByGridIdResultDTO selectGridNameByGridId(SelectGridNameByGridIdFormDTO formDTO);
/**
* @param userId
* @return

11
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java

@ -27,11 +27,14 @@ import com.epmet.dto.result.AddGridResultDTO;
import com.epmet.dto.form.CommonAgencyIdFormDTO;
import com.epmet.dto.form.CustomerGridFormDTO;
import com.epmet.dto.form.ListCustomerGridFormDTO;
import com.epmet.dto.form.SelectGridNameByGridIdFormDTO;
import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
import com.epmet.dto.result.SelectGridNameByGridIdResultDTO;
import com.epmet.dto.result.GridInfoResultDTO;
import com.epmet.dto.result.GridInfoResultDTO;
import com.epmet.dto.result.*;
import com.epmet.entity.CustomerGridEntity;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
import java.util.Map;
@ -121,6 +124,14 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
*/
Result<CustomerGridDTO> getCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO);
/**
*
* @Description 根据网格id查询网格名称
* @Author zxc
* @CreatedTime 2020/4/27 9:22
*/
Result<SelectGridNameByGridIdResultDTO> selectGridNameByGridId(SelectGridNameByGridIdFormDTO formDTO);
/**
* @param gridId
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.GridInfoResultDTO>

13
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@ -32,7 +32,9 @@ import com.epmet.dto.CustomerAgencyDTO;
import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.form.CustomerGridFormDTO;
import com.epmet.dto.form.ListCustomerGridFormDTO;
import com.epmet.dto.form.SelectGridNameByGridIdFormDTO;
import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
import com.epmet.dto.result.SelectGridNameByGridIdResultDTO;
import com.epmet.dto.result.GridInfoResultDTO;
import com.epmet.dao.CustomerStaffGridDao;
import com.epmet.dto.*;
@ -460,4 +462,15 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
return new Result<GridInfoResultDTO>().ok(gridInfoResultDTO);
}
/**
*
* @Description 根据网格id查询网格名称
* @Author zxc
* @CreatedTime 2020/4/27 9:22
*/
@Override
public Result<SelectGridNameByGridIdResultDTO> selectGridNameByGridId(SelectGridNameByGridIdFormDTO formDTO) {
return new Result<SelectGridNameByGridIdResultDTO>().ok(baseDao.selectGridNameByGridId(formDTO));
}
}

12
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@ -93,6 +93,18 @@
</select>
<!-- -->
<select id="selectGridNameByGridId" parameterType="com.epmet.dto.form.SelectGridNameByGridIdFormDTO" resultType="com.epmet.dto.result.SelectGridNameByGridIdResultDTO">
SELECT
id AS gridId,
grid_name AS gridName
FROM
customer_grid
WHERE
id = #{gridId}
AND del_flag = 0
</select>
<select id="getMyGrids" resultType="com.epmet.dto.result.CustomerGridByUserIdResultDTO">
SELECT
cg.id AS 'gridId',

2
epmet-module/oper-access/oper-access-server/docker-compose.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
oper-access-server:
container_name: oper-access-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-access-server:0.3.1
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-access-server:0.3.2
ports:
- "8093:8093"
network_mode: host # 使用现有网络

2
epmet-module/oper-access/oper-access-server/pom.xml

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.1</version>
<version>0.3.2</version>
<parent>
<artifactId>oper-access</artifactId>
<groupId>com.epmet</groupId>

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

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

2
epmet-module/oper-crm/oper-crm-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.2</version>
<version>0.3.3</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>oper-crm</artifactId>

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

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

2
epmet-module/oper-customize/oper-customize-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.1</version>
<version>0.3.2</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>oper-customize</artifactId>

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

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

2
epmet-module/resi-group/resi-group-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.1</version>
<version>0.3.2</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-group</artifactId>

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

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

2
epmet-module/resi-guide/resi-guide-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.1</version>
<version>0.3.2</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-guide</artifactId>

2
epmet-module/resi-mine/resi-mine-server/docker-compose.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-mine-server:
container_name: resi-mine-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-mine-server:0.3.1
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-mine-server:0.3.2
ports:
- "8094:8094"
network_mode: host # 使用现有网络

2
epmet-module/resi-mine/resi-mine-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.1</version>
<version>0.3.2</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-mine</artifactId>

21
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/UserHeadPhotoDTO.java

@ -0,0 +1,21 @@
package com.epmet.resi.partymember.dto.partymember;
import lombok.Data;
import java.io.Serializable;
/**
* @Auther zxc
* @Create 2020-04-26 17:52
*/
@Data
public class UserHeadPhotoDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 头像地址
*/
private String userHeadPhoto;
}

32
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/CertifiedFormDTO.java

@ -0,0 +1,32 @@
package com.epmet.resi.partymember.dto.partymember.form;
import lombok.Data;
import java.io.Serializable;
/**
* @Auther zxc
* @Create 2020-04-26 16:31
* 已认证党员列表
*/
@Data
public class CertifiedFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 页码
*/
private Integer pageNo;
/**
* 每页数量
*/
private Integer pageSize;
/**
* 网格id
*/
private String gridId;
}

42
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedResultDTO.java

@ -0,0 +1,42 @@
package com.epmet.resi.partymember.dto.partymember.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Auther zxc
* @Create 2020-04-26 15:45
* 已认证党员列表
*/
@Data
public class CertifiedResultDTO implements Serializable {
private static final long serialVersionUID = -1L;
/**
* 用户id
*/
private String userId;
/**
* 真实姓名
*/
private String realName;
/**
* 居民头像
*/
private String userHeadPhoto;
/**
* applyTime 申请时间
*/
private Long applyTime;
/**
* 提交网格XXX街道-XXX社区-XXX网格
*/
private String gridFullPath;
}

15
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/ReviewedParyMemberResultDTO.java

@ -40,5 +40,20 @@ public class ReviewedParyMemberResultDTO {
* 提交网格XXX街道-XXX社区-XXX网格
*/
private String gridFullPath;
/**
* 党员认证信息表ID
*/
private String partyMemberId;
/**
* 党员自动审核表ID
*/
private String autoId;
/**
* 党员人工审核表ID
*/
private String manualId;
}

15
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/UnderReviewParyMemberResultDTO.java

@ -43,5 +43,20 @@ public class UnderReviewParyMemberResultDTO implements Serializable {
* 提交网格XXX街道-XXX社区-XXX网格
*/
private String gridFullPath;
/**
* 党员认证信息表ID
*/
private String partyMemberId;
/**
* 党员自动审核表ID
*/
private String autoId;
/**
* 党员人工审核表ID
*/
private String manualId;
}

2
epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-partymember-server:
container_name: resi-partymember-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.1
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.2
ports:
- "8096:8096"
network_mode: host # 使用现有网络

2
epmet-module/resi-partymember/resi-partymember-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.1</version>
<version>0.3.2</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-partymember</artifactId>

10
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java

@ -6,8 +6,10 @@ import com.epmet.dto.UserResiInfoDTO;
import com.epmet.dto.UserRoleDTO;
import com.epmet.dto.form.UserResiInfoFormDTO;
import com.epmet.dto.form.UserResiInfoListFormDTO;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.dto.result.UserResiInfoResultDTO;
import com.epmet.modules.feign.fallback.EpmetUserFeignClientFallBack;
import com.epmet.resi.partymember.dto.partymember.UserHeadPhotoDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -59,4 +61,12 @@ public interface EpmetUserFeignClient {
@PostMapping("/epmetuser/userresiinfo/getuserresiinfolist")
Result<List<UserResiInfoResultDTO>> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO userResiInfoListFormDTO);
/**
* 根据userId查询头像
* @param certifiedResultDTOS
* @return
*/
@PostMapping("/epmetuser/userwechat/selectuserheadphotobyuserid")
Result<List<CertifiedResultDTO>> selectUserHeadPhotoByUserId(List<CertifiedResultDTO> certifiedResultDTOS);
}

17
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java

@ -1,12 +1,13 @@
package com.epmet.modules.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.form.CustomerGridFormDTO;
import com.epmet.dto.result.SelectGridNameByGridIdResultDTO;
import com.epmet.dto.result.GridInfoResultDTO;
import com.epmet.modules.feign.fallback.GovOrgFeignClientFallBack;
import com.epmet.resi.partymember.dto.partymember.form.CertifiedFormDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@ -39,4 +40,18 @@ public interface GovOrgFeignClient {
**/
@GetMapping("/gov/org/customergrid/getGridInfo/{gridId}")
Result<GridInfoResultDTO> queryGridInfo(@PathVariable("gridId") String gridId);
/**
*
* @Description 根据网格id查询网格名称
* @Author zxc
* @CreatedTime 2020/4/27 10:26
*/
@PostMapping("/gov/org/customergrid/selectGridNameByGridId")
Result<SelectGridNameByGridIdResultDTO> selectGridNameByGridId(@RequestBody CertifiedFormDTO formDTO);
}

6
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java

@ -7,6 +7,7 @@ import com.epmet.dto.UserResiInfoDTO;
import com.epmet.dto.UserRoleDTO;
import com.epmet.dto.form.UserResiInfoFormDTO;
import com.epmet.dto.form.UserResiInfoListFormDTO;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.dto.result.UserResiInfoResultDTO;
import com.epmet.modules.feign.EpmetUserFeignClient;
import org.springframework.stereotype.Component;
@ -39,4 +40,9 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
public Result<List<UserResiInfoResultDTO>> getUserResiInfoList(UserResiInfoListFormDTO userResiInfoListFormDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoList", userResiInfoListFormDTO);
}
@Override
public Result<List<CertifiedResultDTO>> selectUserHeadPhotoByUserId(List<CertifiedResultDTO> certifiedResultDTOS) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selectUserHeadPhotoByUserId", certifiedResultDTOS);
}
}

7
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java

@ -5,8 +5,10 @@ import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.form.CustomerGridFormDTO;
import com.epmet.dto.result.SelectGridNameByGridIdResultDTO;
import com.epmet.dto.result.GridInfoResultDTO;
import com.epmet.modules.feign.GovOrgFeignClient;
import com.epmet.resi.partymember.dto.partymember.form.CertifiedFormDTO;
import org.springframework.stereotype.Component;
/**
@ -31,4 +33,9 @@ public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
public Result<GridInfoResultDTO> queryGridInfo(String gridId) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridInfo",gridId);
}
@Override
public Result<SelectGridNameByGridIdResultDTO> selectGridNameByGridId(CertifiedFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectGridNameByGridId",formDTO);
}
}

13
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java

@ -25,9 +25,11 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.modules.partymember.excel.PartymemberInfoExcel;
import com.epmet.modules.partymember.service.PartymemberInfoService;
import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
import com.epmet.resi.partymember.dto.partymember.form.CertifiedFormDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -91,4 +93,15 @@ public class PartymemberInfoController {
ExcelUtils.exportExcelToTarget(response, null, list, PartymemberInfoExcel.class);
}
/**
*
* @Description 查询已认证党员
* @Author zxc
* @CreatedTime 2020/4/27 10:28
*/
@PostMapping(value = "certified")
public Result<List<CertifiedResultDTO>> certified(@RequestBody CertifiedFormDTO certifiedFormDTO){
return new Result<List<CertifiedResultDTO>>().ok(partymemberInfoService.certified(certifiedFormDTO));
}
}

13
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberInfoDao.java

@ -18,10 +18,14 @@
package com.epmet.modules.partymember.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.modules.partymember.entity.PartymemberInfoEntity;
import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
import com.epmet.resi.partymember.dto.partymember.form.CertifiedFormDTO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 党员认证信息表
*
@ -43,4 +47,13 @@ public interface PartymemberInfoDao extends BaseDao<PartymemberInfoEntity> {
* @return PartymemberInfoEntity
*/
PartymemberInfoEntity selectPartyMemberInfoByMobile(PartymemberInfoEntity param);
/**
*
* @Description 查询已认证党员
* @Author zxc
* @CreatedTime 2020/4/26 17:27
*/
List<CertifiedResultDTO> selectCertifiedList(CertifiedFormDTO certifiedFormDTO);
}

11
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java

@ -19,8 +19,10 @@ package com.epmet.modules.partymember.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.modules.partymember.entity.PartymemberInfoEntity;
import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
import com.epmet.resi.partymember.dto.partymember.form.CertifiedFormDTO;
import java.util.List;
import java.util.Map;
@ -113,4 +115,13 @@ public interface PartymemberInfoService extends BaseService<PartymemberInfoEntit
*/
PartymemberInfoDTO getPartyMemberInfoByMobile(PartymemberInfoEntity entity);
/**
*
* @Description 查询已认证党员列表
* @param: certifiedFormDTO
* @Author zxc
* @CreatedTime 2020/4/26 17:25
*/
List<CertifiedResultDTO> certified(CertifiedFormDTO certifiedFormDTO);
}

36
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java

@ -21,18 +21,26 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.dto.result.SelectGridNameByGridIdResultDTO;
import com.epmet.modules.feign.EpmetUserFeignClient;
import com.epmet.modules.feign.GovOrgFeignClient;
import com.epmet.modules.partymember.dao.PartymemberInfoDao;
import com.epmet.modules.partymember.entity.PartymemberInfoEntity;
import com.epmet.modules.partymember.redis.PartymemberInfoRedis;
import com.epmet.modules.partymember.service.PartymemberInfoService;
import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
import com.epmet.resi.partymember.dto.partymember.form.CertifiedFormDTO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@ -51,6 +59,12 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
@Autowired
private PartymemberInfoDao partyMemberInfoDao;
@Autowired
private EpmetUserFeignClient epmetUserFeignClient;
@Autowired
private GovOrgFeignClient govOrgFeignClient;
@Override
public PageData<PartymemberInfoDTO> page(Map<String, Object> params) {
IPage<PartymemberInfoEntity> page = baseDao.selectPage(
@ -115,5 +129,27 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
return ConvertUtils.sourceToTarget(result, PartymemberInfoDTO.class);
}
/**
*
* @Description 查询已认证党员列表
* @param: certifiedFormDTO
* @Author zxc
* @CreatedTime 2020/4/26 17:26
*/
@Override
public List<CertifiedResultDTO> certified(CertifiedFormDTO certifiedFormDTO) {
certifiedFormDTO.setPageNo(certifiedFormDTO.getPageNo() - NumConstant.ONE);
List<CertifiedResultDTO> certifiedResultDTOS = partyMemberInfoDao.selectCertifiedList(certifiedFormDTO);
if (certifiedResultDTOS.size()==0){
return new ArrayList<>();
}
Result<List<CertifiedResultDTO>> listResult = epmetUserFeignClient.selectUserHeadPhotoByUserId(certifiedResultDTOS);
Result<SelectGridNameByGridIdResultDTO> gridName = govOrgFeignClient.selectGridNameByGridId(certifiedFormDTO);
for (CertifiedResultDTO datum : listResult.getData()) {
datum.setGridFullPath(gridName.getData().getGridName());
}
return listResult.getData();
}
}

27
epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml

@ -54,21 +54,27 @@
AND DEL_FLAG = 0
</select>
<!-- 根据网格id分页查询待审核党员列表 -->
<!-- 根据网格id分页查询待审核党员列表自动审核失败且已经填写补充信息的 -->
<select id="selectListUnderReviewParyMember" parameterType="com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO"
resultType="com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO">
SELECT
pi.USER_ID AS userId,
concat( pi.SURNAME, pi.NAME ) AS realName,
pi.CREATED_TIME AS applyTime,
pcm.READ_FLAG AS readFlag
pcm.READ_FLAG AS readFlag,
pi.id as partyMemberId,
pca.id as autoId,
pcm.id as manualId
FROM
partymember_info pi
LEFT JOIN partymember_confirm_manual pcm ON ( pi.id = pcm.PARTYMEMBER_INFO_ID )
LEFT JOIN partymember_confirm_auto pca ON(pi.id=pca.PARTYMEMBER_INFO_ID)
WHERE
pi.DEL_FLAG = '0'
AND pcm.DEL_FLAG = '0'
AND pca.del_flag='0'
AND pi.CONFIRM_RESULT = 'auto_confirm_failed'
and pcm.AUDIT_STATUS='under_auditting'
AND pi.EXTRA_ORGANIZATION IS NOT NULL
AND pi.GRID_ID = #{gridId}
ORDER BY
@ -83,11 +89,16 @@
pi.USER_ID AS userId,
concat( pi.SURNAME, pi.NAME ) AS realName,
pi.CREATED_TIME AS applyTime,
pi.CONFIRM_RESULT AS status
pi.CONFIRM_RESULT AS status,
pi.id as partyMemberId,
pca.id as autoId,
'' as manualId
FROM
partymember_info pi
LEFT JOIN partymember_confirm_auto pca ON(pi.id=pca.PARTYMEMBER_INFO_ID)
WHERE
pi.DEL_FLAG = '0'
AND pca.del_flag='0'
AND pi.CONFIRM_RESULT ='auto_confirm_failed'
AND (pi.EXTRA_ORGANIZATION is null or trim(pi.EXTRA_ORGANIZATION)='')
AND pi.GRID_ID = #{gridId}
@ -96,12 +107,20 @@
pi.USER_ID AS userId,
concat( pi.SURNAME, pi.NAME ) AS realName,
pi.CREATED_TIME AS applyTime,
pi.CONFIRM_RESULT AS status
pi.CONFIRM_RESULT AS status,
pi.id as partyMemberId,
pca.id as autoId,
pcm.id as manualId
FROM
partymember_info pi
LEFT JOIN partymember_confirm_manual pcm ON ( pi.id = pcm.PARTYMEMBER_INFO_ID )
LEFT JOIN partymember_confirm_auto pca ON(pi.id=pca.PARTYMEMBER_INFO_ID)
WHERE
pi.DEL_FLAG = '0'
AND pcm.del_flag='0'
AND pca.del_flag='0'
AND pi.CONFIRM_RESULT ='rejected'
and pcm.AUDIT_STATUS='rejected'
AND pi.EXTRA_ORGANIZATION IS NOT NULL
AND pi.GRID_ID = #{gridId}
ORDER BY

15
epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml

@ -58,5 +58,20 @@
AND DEL_FLAG = 0
</select>
<!-- 查询已认证党员 -->
<select id="selectCertifiedList" resultType="com.epmet.dto.result.CertifiedResultDTO">
SELECT
user_id AS userId,
CONCAT(surname,name) AS realName,
UNIX_TIMESTAMP( created_time ) AS applyTime
FROM
partymember_info
WHERE
grid_id = #{gridId}
AND confirm_result IN ( 'auto_confirm_success', 'approved' )
AND del_flag = 0
LIMIT #{pageNo},#{pageSize}
</select>
</mapper>

26
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserHeadPhotoDTO.java

@ -0,0 +1,26 @@
package com.epmet.dto;
import lombok.Data;
import java.io.Serializable;
/**
* @Auther zxc
* @Create 2020-04-26 17:52
*/
@Data
public class UserHeadPhotoDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 用户id
*/
private String userId;
/**
* 头像地址
*/
private String userHeadPhoto;
}

42
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java

@ -0,0 +1,42 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Auther zxc
* @Create 2020-04-26 15:45
* 已认证党员列表
*/
@Data
public class CertifiedResultDTO implements Serializable {
private static final long serialVersionUID = -1L;
/**
* 用户id
*/
private String userId;
/**
* 真实姓名
*/
private String realName;
/**
* 居民头像
*/
private String userHeadPhoto;
/**
* applyTime 申请时间
*/
private Integer applyTime;
/**
* 提交网格XXX街道-XXX社区-XXX网格
*/
private String gridFullPath;
}

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

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

2
epmet-user/epmet-user-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.4</version>
<version>0.3.5</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-user</artifactId>

4
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java

@ -2,6 +2,7 @@ package com.epmet.controller;
import com.epmet.commons.mybatis.entity.DataScope;
import com.epmet.commons.tools.annotation.RequirePermission;
import com.epmet.commons.tools.enums.RequirePermissionEnum;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.GovStaffRoleDTO;
@ -65,7 +66,7 @@ public class StaffRoleController {
* @return
*/
@PostMapping("staffsinrole")
//@RequirePermission(key = "org_staff_list")
//@RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_LIST)
public Result<List<GovStaffRoleResultDTO>> getStaffsInRole(@RequestBody StaffRoleFormDTO staffRoleFormDTO) {
ValidatorUtils.validateEntity(staffRoleFormDTO, StaffRoleFormDTO.GetStaffsInRole.class);
String roleKey = staffRoleFormDTO.getRoleKey();
@ -82,6 +83,7 @@ public class StaffRoleController {
* @Date 2020.04.26 13:06
**/
@PostMapping("getcustomerstaffroles")
//@RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_LIST)
public Result<StaffRolesResultDTO> getCustomerStaffRoles(@RequestBody CommonUserFormDTO commonUserFormDTO){
ValidatorUtils.validateEntity(commonUserFormDTO);
return staffRoleService.getStaffRoles(commonUserFormDTO);

48
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserWechatController.java

@ -0,0 +1,48 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.controller;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.UserHeadPhotoDTO;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.service.UserWechatService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 用户微信端关系表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-04-26
*/
@RestController
@RequestMapping("userwechat")
public class UserWechatController {
@Autowired
private UserWechatService userWechatService;
@PostMapping(value = "/selectuserheadphotobyuserid")
public Result<List<CertifiedResultDTO>> selectUserHeadPhotoByUserId(@RequestBody List<CertifiedResultDTO> certifiedResultDTOS){
return new Result<List<CertifiedResultDTO>>().ok(userWechatService.selectUserHeadPhotoByUserId(certifiedResultDTOS));
}
}

10
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java

@ -2,8 +2,10 @@ package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.UserDTO;
import com.epmet.dto.UserHeadPhotoDTO;
import com.epmet.dto.UserWechatDTO;
import com.epmet.dto.form.WxLoginUserInfoFormDTO;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.entity.UserWechatEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -45,4 +47,12 @@ public interface UserWechatDao extends BaseDao<UserWechatEntity>{
* @Date 2020.03.30 17:25
**/
List<UserWechatEntity> selectByUserId(@Param("userId")String userId);
/**
*
* @Description 根据userId查询头像
* @Author zxc
* @CreatedTime 2020/4/26 18:53
*/
List<UserHeadPhotoDTO> selectUserHeadPhotoByUserId(List<CertifiedResultDTO> certifiedResultDTOS);
}

6
epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserWechatService.java

@ -1,8 +1,12 @@
package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.entity.UserWechatEntity;
import java.util.List;
/**
* @Description
* @IntefaceName UserWechatService
@ -11,4 +15,6 @@ import com.epmet.entity.UserWechatEntity;
*/
public interface UserWechatService extends BaseService<UserWechatEntity> {
List<CertifiedResultDTO> selectUserHeadPhotoByUserId(List<CertifiedResultDTO> certifiedResultDTOS);
}

1
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java

@ -133,6 +133,7 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
* @Date 2020.04.26 10:59
**/
@Override
//@DataFilter(tableAlias = "role")
public Result<StaffRolesResultDTO> getStaffRoles(CommonUserFormDTO userParam) {
return new Result<StaffRolesResultDTO>().ok(baseDao.getStaffRoles(userParam));
}

22
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserWechatServiceImpl.java

@ -3,11 +3,16 @@ package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.dao.UserWechatDao;
import com.epmet.dto.UserHeadPhotoDTO;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.entity.UserWechatEntity;
import com.epmet.service.UserWechatService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.io.Serializable;
import java.util.Collection;
import java.util.List;
/**
* @Description
@ -15,6 +20,23 @@ import java.util.Collection;
* @Author wangc
* @date 2020.03.28 14:42
*/
@Service
public class UserWechatServiceImpl extends BaseServiceImpl<UserWechatDao, UserWechatEntity> implements UserWechatService{
@Autowired
private UserWechatDao userWechatDao;
@Override
public List<CertifiedResultDTO> selectUserHeadPhotoByUserId(List<CertifiedResultDTO> certifiedResultDTOS) {
List<UserHeadPhotoDTO> userHeadPhotoDTOS = userWechatDao.selectUserHeadPhotoByUserId(certifiedResultDTOS);
for (CertifiedResultDTO certifiedResultDTO : certifiedResultDTOS) {
for (UserHeadPhotoDTO userHeadPhotoDTO : userHeadPhotoDTOS) {
if (userHeadPhotoDTO.getUserId().equals(certifiedResultDTO.getUserId())){
certifiedResultDTO.setUserHeadPhoto(userHeadPhotoDTO.getUserHeadPhoto());
break;
}
}
}
return certifiedResultDTOS;
}
}

15
epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml

@ -64,4 +64,19 @@
USER_ID = #{userId}
</select>
<!-- 根据userId查询头像 -->
<select id="selectUserHeadPhotoByUserId" resultType="com.epmet.dto.UserHeadPhotoDTO">
SELECT
user_id AS userId,
IFNULL(head_img_url,'') AS userHeadPhoto
FROM
user_wechat
WHERE
user_id in
<foreach collection="list" item="item" open="(" separator="," close=")">
#{item.userId}
</foreach>
AND del_flag = 0
</select>
</mapper>

Loading…
Cancel
Save