applycreategroup

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java

@@ -15,7 +15,8 @@ import java.io.Serializable;
 @Data
 public class ApplyCreateGroupFormDTO implements Serializable {
     private static final long serialVersionUID = 1570620480398949075L;
-
+    public interface AddUserInternalGroup {
+    }
     /**
      * 添加用户操作的用户可见异常分组
      * 该分组用于校验需要返回给前端错误信息提示的列，需要继承CustomerClientShowGroup
@@ -27,7 +28,7 @@ public class ApplyCreateGroupFormDTO implements Serializable {
     /**
      * 当前登录用户id由TokenDto赋值
      */
-    @NotBlank(message = "当前用户id不能为空")
+    @NotBlank(message = "当前用户id不能为空",groups ={AddUserInternalGroup.class})
     private String userId;
 
     /**
@@ -53,19 +54,19 @@ public class ApplyCreateGroupFormDTO implements Serializable {
     /**
      * 当前网格所属客户id
      */
-    @NotBlank(message = "当前网格所属客户id不能为空")
+    @NotBlank(message = "当前网格所属客户id不能为空",groups ={AddUserInternalGroup.class})
     private String customerId;
 
     /**
      * 当前网格id
      */
-    @NotBlank(message = "当前网格id不能为空")
+    @NotBlank(message = "当前网格id不能为空",groups ={AddUserInternalGroup.class})
     private String gridId;
 
     /**
      * 当前登录用户来源从token中获取
      */
-    @NotBlank(message = "app不能为空")
+    @NotBlank(message = "app不能为空",groups ={AddUserInternalGroup.class})
     private String app;
 
     /**

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java

@@ -157,7 +157,7 @@ public class ResiGroupController {
                                    @RequestBody ApplyCreateGroupFormDTO applyCreateGroupFormDTO) {
         applyCreateGroupFormDTO.setUserId(tokenDto.getUserId());
         applyCreateGroupFormDTO.setApp(tokenDto.getApp());
-        ValidatorUtils.validateEntity(applyCreateGroupFormDTO);
+        ValidatorUtils.validateEntity(applyCreateGroupFormDTO,ApplyCreateGroupFormDTO.AddUserShowGroup.class,ApplyCreateGroupFormDTO.AddUserInternalGroup.class);
         resiGroupService.applyCreateGroup(applyCreateGroupFormDTO);
         return new Result();
     }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -1598,7 +1598,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		textScanParamDTO.getTasks().add(taskDTO);
 		Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
 		if (!textSyncScanResult.success()) {
-			logger.error("调用内容审核服务审核文本发生错误:{}", textSyncScanResult.getInternalMsg());
+			logger.warn("调用内容审核服务审核文本发生错误:{}", textSyncScanResult.getInternalMsg());
 			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
 		} else {
 			if (!textSyncScanResult.getData().isAllPass()) {
@@ -1607,19 +1607,21 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		}
 
 		// 图片内容审核
-		ImgScanParamDTO imgScanParamDTO = new ImgScanParamDTO();
+		if(StringUtils.isNotBlank(groupHeadPhoto)){
-		ImgTaskDTO task = new ImgTaskDTO();
+			ImgScanParamDTO imgScanParamDTO = new ImgScanParamDTO();
-		task.setDataId(UUID.randomUUID().toString().replace("-", ""));
+			ImgTaskDTO task = new ImgTaskDTO();
-		task.setUrl(groupHeadPhoto);
+			task.setDataId(UUID.randomUUID().toString().replace("-", ""));
-		imgScanParamDTO.getTasks().add(task);
+			task.setUrl(groupHeadPhoto);
-
+			imgScanParamDTO.getTasks().add(task);
-		Result<SyncScanResult> imgScanResult = ScanContentUtils.imgSyncScan(scanApiUrl.concat(imgSyncScanMethod), imgScanParamDTO);
+
-		if (!imgScanResult.success()){
+			Result<SyncScanResult> imgScanResult = ScanContentUtils.imgSyncScan(scanApiUrl.concat(imgSyncScanMethod), imgScanParamDTO);
-			logger.error("调用内容审核服务审核图片发生错误:{}", textSyncScanResult.getInternalMsg());
+			if (!imgScanResult.success()){
-			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+				logger.warn("调用内容审核服务审核图片发生错误:{}", textSyncScanResult.getInternalMsg());
-		} else {
+				throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
-			if (!textSyncScanResult.getData().isAllPass()) {
+			} else {
-				throw new RenException(EpmetErrorCode.IMG_SCAN_FAILED.getCode(), EpmetErrorCode.IMG_SCAN_FAILED.getMsg());
+				if (!imgScanResult.getData().isAllPass()) {
+					throw new RenException(EpmetErrorCode.IMG_SCAN_FAILED.getCode(), EpmetErrorCode.IMG_SCAN_FAILED.getMsg());
+				}
 			}
 		}
 	}