From f29d9638c9a6b4e53927bdd24d92072b18541bfb Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 8 Jun 2020 19:51:54 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=89=BE=E5=9B=9E=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=A2=AB=E8=A6=86=E7=9B=96=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/annotation/DataFilter.java | 4 +- .../mybatis/aspect/DataFilterAspect.java | 26 ++++----- .../mybatis/dto/form/GetSQLFilterFormDTO.java | 5 +- .../feign/MybatisGovAccessFeignClient.java | 2 +- .../epmet/dto/form/GetSQLFilterFormDTO.java | 5 +- .../epmet/service/impl/AccessServiceImpl.java | 54 ++++++++++++------- .../main/java/com/epmet/dao/ArticleDao.java | 4 +- 7 files changed, 59 insertions(+), 41 deletions(-) diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/annotation/DataFilter.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/annotation/DataFilter.java index d85182f71e..574072a71a 100644 --- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/annotation/DataFilter.java +++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/annotation/DataFilter.java @@ -32,12 +32,12 @@ public @interface DataFilter { * public void test(String a, String b, String gridId) {...} * @return */ - String gridIdArgName() default ""; + String gridIdsArgName() default ""; /** * 部门ID参数名 * @return */ - String deptIdArgName() default ""; + String deptIdsArgName() default ""; } diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/aspect/DataFilterAspect.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/aspect/DataFilterAspect.java index 3250a4f25f..0772305976 100644 --- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/aspect/DataFilterAspect.java +++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/aspect/DataFilterAspect.java @@ -19,6 +19,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.Set; + /** * 数据过滤，切面处理类 * @@ -57,24 +59,24 @@ public class DataFilterAspect { MethodSignature methodSignature = (MethodSignature) point.getSignature(); DataFilter dataFilterAnno = methodSignature.getMethod().getAnnotation(DataFilter.class); String tableAlias = dataFilterAnno.tableAliases()[0]; - String gridIdArgName = dataFilterAnno.gridIdArgName(); - String deptIdArgName = dataFilterAnno.deptIdArgName(); + String gridIdsArgName = dataFilterAnno.gridIdsArgName(); + String deptIdsArgName = dataFilterAnno.deptIdsArgName(); String[] parameterNames = methodSignature.getParameterNames(); // 取出注解参数中指定的gridId和deptId的入参的值 - String gridId = null; - String deptId = null; - if (StringUtils.isNotBlank(gridIdArgName)) { - int gridIdArgIndex = ArrayUtils.indexOf(parameterNames, gridIdArgName); + Set gridIds = null; + Set deptIds = null; + if (StringUtils.isNotBlank(gridIdsArgName)) { + int gridIdArgIndex = ArrayUtils.indexOf(parameterNames, gridIdsArgName); if (gridIdArgIndex >-1){ - gridId = (String) point.getArgs()[gridIdArgIndex]; + gridIds = (Set) point.getArgs()[gridIdArgIndex]; } } - if (StringUtils.isNotBlank(deptIdArgName)) { - int deptArgIndex = ArrayUtils.indexOf(parameterNames, deptIdArgName); + if (StringUtils.isNotBlank(deptIdsArgName)) { + int deptArgIndex = ArrayUtils.indexOf(parameterNames, deptIdsArgName); if (deptArgIndex > -1) { - deptId = (String) point.getArgs()[deptArgIndex]; + deptIds = (Set) point.getArgs()[deptArgIndex]; } } @@ -84,8 +86,8 @@ public class DataFilterAspect { form.setApp(loginUserUtil.getLoginUserApp()); form.setClient(loginUserUtil.getLoginUserClient()); form.setUserId(loginUserUtil.getLoginUserId()); - form.setDepartmentId(deptId); - form.setGridId(gridId); + form.setDepartmentIds(deptIds); + form.setGridIds(gridIds); form.setOperationKey(requirePermission); form.setTableAlias(tableAlias); Result sqlFilterSegmentRst = mybatisGovAccessFeignClient.getSqlFilterSegment(form); diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/dto/form/GetSQLFilterFormDTO.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/dto/form/GetSQLFilterFormDTO.java index e0d6b266d6..25c92a11a8 100644 --- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/dto/form/GetSQLFilterFormDTO.java +++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/dto/form/GetSQLFilterFormDTO.java @@ -3,6 +3,7 @@ package com.epmet.commons.mybatis.dto.form; import lombok.Data; import javax.validation.constraints.NotBlank; +import java.util.Set; @Data public class GetSQLFilterFormDTO { @@ -21,8 +22,8 @@ public class GetSQLFilterFormDTO { private String tableAlias; - private String gridId; + private Set gridIds; - private String departmentId; + private Set departmentIds; } diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/MybatisGovAccessFeignClient.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/MybatisGovAccessFeignClient.java index 1dbe11149b..2b712ff301 100644 --- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/MybatisGovAccessFeignClient.java +++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/MybatisGovAccessFeignClient.java @@ -16,7 +16,7 @@ import java.util.Set; * @Description * @Author sun */ -//, url = "localhost:8099" +//@FeignClient(name = ServiceConstant.GOV_ACCESS_SERVER, fallback = MybatisGovAccessFeignClientFallback.class, url = "localhost:8099") @FeignClient(name = ServiceConstant.GOV_ACCESS_SERVER, fallback = MybatisGovAccessFeignClientFallback.class) public interface MybatisGovAccessFeignClient { diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/GetSQLFilterFormDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/GetSQLFilterFormDTO.java index 4a63754bd7..4901eca2bb 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/GetSQLFilterFormDTO.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/GetSQLFilterFormDTO.java @@ -3,6 +3,7 @@ package com.epmet.dto.form; import lombok.Data; import javax.validation.constraints.NotBlank; +import java.util.Set; @Data public class GetSQLFilterFormDTO { @@ -21,8 +22,8 @@ public class GetSQLFilterFormDTO { private String tableAlias; - private String gridId; + private Set gridIds; - private String departmentId; + private Set departmentIds; } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java index 6fa5770d0e..cc723cca1f 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java @@ -139,7 +139,7 @@ public class AccessServiceImpl implements AccessService { // 生成开关范围的sql过滤器 if (!CollectionUtil.isEmpty(switchScopes)) { - genSwitchScopeSqlFilter(switchScopes, sb, form.getTableAlias(), userDetails.getUserId(), form.getGridId(), form.getDepartmentId()); + genSwitchScopeSqlFilter(switchScopes, sb, form.getTableAlias(), userDetails.getUserId(), form.getGridIds(), form.getDepartmentIds()); } return sb.toString(); @@ -153,29 +153,29 @@ public class AccessServiceImpl implements AccessService { StringBuilder sb, String tableAlias, String userId, - String gridId, - String departmentId) { + Set gridIds, + Set departmentIds) { if (switchScopes.contains(OperationScopeConstant.SCOPE_I_CREATED)) { genICreatedSql(sb, userId, tableAlias); } if (switchScopes.contains(OperationScopeConstant.SCOPE_IN_GRID)) { - if (StringUtils.isBlank(gridId)) { - String error = String.format("DataFilter:拼接SQL语句出错:需要in grid权限，但是代码中没有获取到,GridId:%s", gridId); + if (CollectionUtils.isEmpty(gridIds)) { + String error = String.format("DataFilter:拼接SQL语句出错:需要in grid权限，但是代码中没有获取到gridIds"); logger.error(error); throw new RenException(error); } - genInGrid(sb, gridId, tableAlias); + genInGrid(sb, gridIds, tableAlias); } if (switchScopes.contains(OperationScopeConstant.SCOPE_IN_DEPARTMENT)) { - if (StringUtils.isBlank(departmentId)) { - String error = String.format("DataFilter:拼接SQL语句出错:需要in department权限，但是代码中没有获取到, departmentId:%s", departmentId); + if (CollectionUtils.isEmpty(departmentIds)) { + String error = String.format("DataFilter:拼接SQL语句出错:需要in department权限，但是代码中没有获取到, departmentIds"); logger.error(error); throw new RenException(error); } - genDepartmentFilterSql(sb, departmentId, tableAlias); + genDepartmentFilterSql(sb, departmentIds, tableAlias); } } @@ -199,18 +199,25 @@ public class AccessServiceImpl implements AccessService { * @param sb * @param tableAlias */ - private void genInGrid(StringBuilder sb, String gridId, String tableAlias) { + private void genInGrid(StringBuilder sb, Set gridIds, String tableAlias) { if (hasConditions.get()) { // 之前没有条件 sb.append(" OR "); } - // OR GRID_ID = 'XXX' OR GRID_ID = 'QQQ' - if (StringUtils.isBlank(tableAlias)) { - sb.append(" GRID_ID = '").append(gridId).append("' "); - } else { - sb.append(" ").append(tableAlias).append(".GRID_ID ='").append(gridId).append("' "); + // OR GRID_ID = 'XXX' OR GRID_ID = 'QQQ' OR + + for (String gridId : gridIds) { + if (StringUtils.isBlank(tableAlias)) { + sb.append(" GRID_ID = '").append(gridId).append("' OR "); + } else { + sb.append(" ").append(tableAlias).append(".GRID_ID ='").append(gridId).append("' OR "); + } } + + int lastOrIndex = sb.lastIndexOf("OR"); + sb.replace(lastOrIndex, lastOrIndex + "OR".length(), "" ); + hasConditions.set(true); } @@ -219,17 +226,24 @@ public class AccessServiceImpl implements AccessService { * * @param sb */ - private void genDepartmentFilterSql(StringBuilder sb, String deptId, String tableAlias) { + private void genDepartmentFilterSql(StringBuilder sb, Set deptIds, String tableAlias) { //Result> deptListResult = govOrgFeignClient.getDepartmentListByStaffId(staffId); if (hasConditions.get()) { // 之前没有条件 sb.append(" OR "); } - if (StringUtils.isBlank(tableAlias)) { - sb.append(" DEPARTMENT_ID = '").append(deptId).append("' "); - } else { - sb.append(" ").append(tableAlias).append(".DEPARTMENT_ID ='").append(deptId).append("' "); + + for (String deptId : deptIds) { + if (StringUtils.isBlank(tableAlias)) { + sb.append(" DEPARTMENT_ID = '").append(deptId).append("' OR "); + } else { + sb.append(" ").append(tableAlias).append(".DEPARTMENT_ID ='").append(deptId).append("' OR "); + } } + + int lastOrIndex = sb.lastIndexOf("OR"); + sb.replace(lastOrIndex, lastOrIndex + "OR".length(), "" ); + hasConditions.set(true); } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java index 041f642be9..048522a8bc 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java @@ -83,7 +83,7 @@ public interface ArticleDao extends BaseDao { * @param gridList * @return java.util.List */ - @DataFilter(tableAliases = {"a", "apr"}, gridIdArgName = "gridList") + @DataFilter(tableAliases = {"a", "apr"}, gridIdsArgName = "gridList") List selectArticleListForGrid(@Param("customerId") String customerId, @Param("tagIdList") List tagIdList, Set gridList); @@ -94,7 +94,7 @@ public interface ArticleDao extends BaseDao { * @param gridList * @return java.util.List */ - @DataFilter(tableAliases = "apr", gridIdArgName = "gridList") + @DataFilter(tableAliases = "apr", gridIdsArgName = "gridList") List selectOfflineList(Set gridList); From 961c73e358f3ef90c26ccb898051c0e06bec0884 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 8 Jun 2020 19:54:17 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-access/gov-access-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-access/gov-access-server/pom.xml | 2 +- .../gov-voice/gov-voice-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-voice/gov-voice-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml index 3420ba8696..9a9aa6ec3e 100644 --- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-access-server: container_name: gov-access-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.25 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.26 ports: - "8099:8099" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index fbb7348343..777ca5e39d 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.25 + 0.3.26 gov-access com.epmet diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml index 8f394be0f1..c51187335f 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.8 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.9 ports: - "8105:8105" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index 622e81266e..d79a0d5745 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-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"> 4.0.0 - 0.3.8 + 0.3.9 gov-voice com.epmet From 03c437ab5290eb8f0c20f40ed656b03080a8c5cc Mon Sep 17 00:00:00 2001 From: handaolin Date: Mon, 8 Jun 2020 20:52:54 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=85=A5=E7=BB=84?= =?UTF-8?q?=E3=80=81=E6=8B=92=E7=BB=9D=E5=85=A5=E7=BB=84=E3=80=81=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=BB=BA=E7=BB=84=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/form/ApplyCreateGroupFormDTO.java | 95 ++++++++++--------- .../member/form/ApplyJoinGroupFormDTO.java | 12 ++- .../dto/member/form/DisagreeApplyFormDTO.java | 12 ++- 3 files changed, 72 insertions(+), 47 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java index 85c76cc827..fd2b239ea8 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java @@ -1,5 +1,6 @@ package com.epmet.resi.group.dto.group.form; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -12,48 +13,56 @@ import java.io.Serializable; */ @Data public class ApplyCreateGroupFormDTO implements Serializable { - private static final long serialVersionUID = 1570620480398949075L; - - /** - * 当前登录用户id由TokenDto赋值 - */ - @NotBlank(message="当前用户id不能为空") - private String userId; - - /** - * 头像地址 - */ - @NotBlank(message = "头像地址不能为空") - private String groupHeadPhoto; - - /** - * 小组名称 - */ - @NotBlank(message = "小组名称不能为空") - private String groupName; - - /** - * 群介绍 - */ - @NotBlank(message = "群介绍不能为空") - private String groupIntroduction; - - /** - * 当前网格所属客户id - */ - @NotBlank(message = "当前网格所属客户id不能为空") - private String customerId; - - /** - * 当前网格id - */ - @NotBlank(message = "当前网格id不能为空") - private String gridId; - - /** - * 当前登录用户来源从token中获取 - */ - @NotBlank(message="app不能为空") - private String app; + private static final long serialVersionUID = 1570620480398949075L; + + /** + * 添加用户操作的用户可见异常分组 + * 该分组用于校验需要返回给前端错误信息提示的列，需要继承CustomerClientShowGroup + * 返回错误码为8999，提示信息为DTO中具体的列的校验注解message的内容 + */ + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + + /** + * 当前登录用户id由TokenDto赋值 + */ + @NotBlank(message = "当前用户id不能为空") + private String userId; + + /** + * 头像地址 + */ + @NotBlank(message = "头像地址不能为空", groups = {AddUserShowGroup.class}) + private String groupHeadPhoto; + + /** + * 小组名称 + */ + @NotBlank(message = "小组名称不能为空", groups = {AddUserShowGroup.class}) + private String groupName; + + /** + * 群介绍 + */ + @NotBlank(message = "群介绍不能为空", groups = {AddUserShowGroup.class}) + private String groupIntroduction; + + /** + * 当前网格所属客户id + */ + @NotBlank(message = "当前网格所属客户id不能为空") + private String customerId; + + /** + * 当前网格id + */ + @NotBlank(message = "当前网格id不能为空") + private String gridId; + + /** + * 当前登录用户来源从token中获取 + */ + @NotBlank(message = "app不能为空") + private String app; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ApplyJoinGroupFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ApplyJoinGroupFormDTO.java index 03860e1bf4..a5e795f26f 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ApplyJoinGroupFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ApplyJoinGroupFormDTO.java @@ -1,5 +1,7 @@ package com.epmet.resi.group.dto.member.form; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import com.epmet.resi.group.dto.group.form.ApplyCreateGroupFormDTO; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -13,7 +15,13 @@ import java.io.Serializable; @Data public class ApplyJoinGroupFormDTO implements Serializable { private static final long serialVersionUID = -1611110663584570521L; - + /** + * 添加用户操作的用户可见异常分组 + * 该分组用于校验需要返回给前端错误信息提示的列，需要继承CustomerClientShowGroup + * 返回错误码为8999，提示信息为DTO中具体的列的校验注解message的内容 + */ + public interface AddUserShowGroup extends CustomerClientShowGroup { + } /** * 当前登录用户id由TokenDto赋值 */ @@ -29,7 +37,7 @@ public class ApplyJoinGroupFormDTO implements Serializable { /** * 入群理由 */ - @NotBlank(message="入组理由不能为空") + @NotBlank(message="入组理由不能为空", groups = {ApplyJoinGroupFormDTO.AddUserShowGroup.class}) private String operateDes; private String app; diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/DisagreeApplyFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/DisagreeApplyFormDTO.java index 610397be20..4adcb3082d 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/DisagreeApplyFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/DisagreeApplyFormDTO.java @@ -1,5 +1,7 @@ package com.epmet.resi.group.dto.member.form; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import com.epmet.resi.group.dto.group.form.ApplyCreateGroupFormDTO; import lombok.Data; import javax.validation.constraints.NegativeOrZero; @@ -14,7 +16,13 @@ import java.io.Serializable; @Data public class DisagreeApplyFormDTO implements Serializable { private static final long serialVersionUID = 7490311907300741995L; - + /** + * 添加用户操作的用户可见异常分组 + * 该分组用于校验需要返回给前端错误信息提示的列，需要继承CustomerClientShowGroup + * 返回错误码为8999，提示信息为DTO中具体的列的校验注解message的内容 + */ + public interface AddUserShowGroup extends CustomerClientShowGroup { + } /** * 申请单id */ @@ -30,6 +38,6 @@ public class DisagreeApplyFormDTO implements Serializable { /** * 拒绝理由 */ - @NotBlank(message = "拒绝理由必填") + @NotBlank(message = "拒绝理由必填", groups = {DisagreeApplyFormDTO.AddUserShowGroup.class}) private String operateDesc; } From e5ab74f90a6451ea8e8fb1afc28ef3656207fe83 Mon Sep 17 00:00:00 2001 From: handaolin Date: Mon, 8 Jun 2020 20:54:48 +0800 Subject: [PATCH 4/5] resigroup0.3.52 --- .../resi-group/resi-group-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml index 490fb117e6..8531aa0c1b 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.51 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.52 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 1edfd9ade3..ab9612bda7 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.51 + 0.3.52 com.epmet resi-group From 944afa5cb99b7d0ea3d60a8953bf7224516a9b99 Mon Sep 17 00:00:00 2001 From: handaolin Date: Mon, 8 Jun 2020 22:23:41 +0800 Subject: [PATCH 5/5] auth0.3.19 --- epmet-auth/deploy/docker-compose-dev.yml | 2 +- epmet-auth/pom.xml | 2 +- .../java/com/epmet/controller/GovLoginController.java | 4 ++-- .../java/com/epmet/dto/form/SendSmsCodeFormDTO.java | 11 +++++++++-- .../java/com/epmet/dto/form/StaffOrgsFormDTO.java | 11 +++++++++-- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index 1d8897b203..b0ffb56cab 100644 --- a/epmet-auth/deploy/docker-compose-dev.yml +++ b/epmet-auth/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.18 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.19 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 30baa8434b..7624f2089f 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.18 + 0.3.19 com.epmet epmet-cloud diff --git a/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java index 477195041b..61386ac6c9 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java @@ -53,7 +53,7 @@ public class GovLoginController { **/ @PostMapping(value = "/loginwxmp/sendsmscode") public Result sendSmsCode(@RequestBody SendSmsCodeFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO); + ValidatorUtils.validateEntity(formDTO,SendSmsCodeFormDTO.AddUserShowGroup.class); govLoginService.sendSmsCode(formDTO); return new Result(); } @@ -67,7 +67,7 @@ public class GovLoginController { **/ @PostMapping(value = "/loginwxmp/getmyorg") public Result> getmyorg(@RequestBody StaffOrgsFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO); + ValidatorUtils.validateEntity(formDTO,StaffOrgsFormDTO.AddUserShowGroup.class); List staffOrgs=govLoginService.getMyOrg(formDTO); return new Result>().ok(staffOrgs); } diff --git a/epmet-auth/src/main/java/com/epmet/dto/form/SendSmsCodeFormDTO.java b/epmet-auth/src/main/java/com/epmet/dto/form/SendSmsCodeFormDTO.java index 8d82624aee..fe21b303d4 100644 --- a/epmet-auth/src/main/java/com/epmet/dto/form/SendSmsCodeFormDTO.java +++ b/epmet-auth/src/main/java/com/epmet/dto/form/SendSmsCodeFormDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.form; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -13,7 +14,13 @@ import java.io.Serializable; @Data public class SendSmsCodeFormDTO implements Serializable { private static final long serialVersionUID = -1852541457359282018L; - - @NotBlank(message = "手机号不能为空") + /** + * 添加用户操作的用户可见异常分组 + * 该分组用于校验需要返回给前端错误信息提示的列，需要继承CustomerClientShowGroup + * 返回错误码为8999，提示信息为DTO中具体的列的校验注解message的内容 + */ + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + @NotBlank(message = "手机号不能为空", groups = {AddUserShowGroup.class}) private String mobile; } diff --git a/epmet-auth/src/main/java/com/epmet/dto/form/StaffOrgsFormDTO.java b/epmet-auth/src/main/java/com/epmet/dto/form/StaffOrgsFormDTO.java index e36c100809..e2f32fd286 100644 --- a/epmet-auth/src/main/java/com/epmet/dto/form/StaffOrgsFormDTO.java +++ b/epmet-auth/src/main/java/com/epmet/dto/form/StaffOrgsFormDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.form; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -13,11 +14,17 @@ import java.io.Serializable; @Data public class StaffOrgsFormDTO implements Serializable { private static final long serialVersionUID = 4193133227120225342L; - + /** + * 添加用户操作的用户可见异常分组 + * 该分组用于校验需要返回给前端错误信息提示的列，需要继承CustomerClientShowGroup + * 返回错误码为8999，提示信息为DTO中具体的列的校验注解message的内容 + */ + public interface AddUserShowGroup extends CustomerClientShowGroup { + } /** * 手机号 */ - @NotBlank(message = "手机号不能为空") + @NotBlank(message = "手机号不能为空", groups = {AddUserShowGroup.class}) private String mobile; /**