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

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

@@ -3,6 +3,7 @@ package com.epmet.resi.group.dto.group.form;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
 
@@ -28,9 +29,11 @@ public class EditGroupFormDTO {
     private String groupHeadPhoto;
 
     @NotBlank(message = "组名称不能为空", groups = { SubmitGroupEditVG.class })
+    @Length(max = 10, message = "组名称长度不能超过10个字", groups = { SubmitGroupEditVG.class })
     private String groupName;
 
     @NotBlank(message = "组介绍不能为空", groups = { SubmitGroupEditVG.class })
+    @Length(max = 500, message = "组介绍长度不能超过500个字", groups = { SubmitGroupEditVG.class })
     private String groupIntroduction;
 
 }

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

@@ -1065,6 +1065,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 			throw new RenException(EpmetErrorCode.GROUP_EDIT_ERROR.getCode(), "组信息不存在");
 		}
 
+		// 2.判断是否可以提交编辑
 		GroupEditSubmitRecordEntity lre = groupEditSubmitRecordDao.getLatestEditSubmitRecord(groupId);
 		if (lre != null && GroupAuditStatusConstant.UNDER_AUDITING.equals(lre.getAuditStatus())) {
 			// 在待审核状态，不允许再次提交编辑
@@ -1076,14 +1077,22 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 			throw new RenException(EpmetErrorCode.GROUP_EDIT_ERROR.getCode(), "组名已存在");
 		}
 
-		// 2.内容检查
+		Date now = new Date();
+		int usedEditNum = groupEditSubmitRecordDao.countEditNum(groupId, DateUtils.getMonthStart(now), DateUtils.getMonthEnd(now));
+		if (GroupLimitConstant.EDIT_NUM_LIMIT_MONTH <= usedEditNum) {
+			// 达到最大编辑次数了
+			throw new RenException(EpmetErrorCode.GROUP_EDIT_ERROR.getCode(),
+					String.format("本月可用修改次数为%s次，您已使用%s次", GroupLimitConstant.EDIT_NUM_LIMIT_MONTH, usedEditNum));
+		}
+
+		// 3.内容检查
 		//scanGroupEditContent(groupName, groupIntroduction, groupHeadPhoto);
 
 		String app = loginUserUtil.getLoginUserApp();
 		String userId = loginUserUtil.getLoginUserId();
 		String messageText = generateGroupEditMessageText(app, userId, group.getCustomerId(), group.getGridId(), groupName);
 
-		// 3.创建编辑提交记录
+		// 4.创建编辑提交记录
 		GroupEditSubmitRecordEntity editRecord = new GroupEditSubmitRecordEntity();
 		editRecord.setAuditStatus(GroupAuditStatusConstant.UNDER_AUDITING);
 		editRecord.setCustomerId(group.getCustomerId());

epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml

@@ -134,7 +134,7 @@
     </appender>
 
     <!-- 开发、测试环境 -->
-    <springProfile name="dev,test">
+    <springProfile name="dev,test,local">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.epmet.modules.comment.dao" level="DEBUG"/>