Merge branch 'dev_group_code' of http://121.42.41.42:7070/r/epmet-cloud into dev_group_code

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -47,7 +47,7 @@ public enum EpmetErrorCode {
 	IDCARDNO_ALREADY_EXITS(8109,"系统已存在相同身份证号码，请重新输入"),
 	IDCARDNO_ERROR(8110,"身份证号格式错误，请重新输入"),
 	CANNOT_DELETE_PARTY_MEMBER(8111,"该用户已注册党员，不允许删除"),
-	GROUP_LEADER_CAN_EDIT_GROUP_INFO(8112,"只有组长才可以修改小组信息"),
+	GROUP_LEADER_CAN_EDIT_GROUP_INFO(8112,"只有组长才可以操作"),
 	INVITE_NEW_MEMBER(8113,"只有讨论中的小组才可以邀请新成员"),
 	ACT_TITLE_SCAN_FAILED(8114,"活动标题审核失败，请重新编辑"),
 	ACT_REQ_SCAN_FAILED(8115,"活动报名条件审核失败，请重新编辑"),

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

@@ -0,0 +1,27 @@
+package com.epmet.resi.group.dto.member.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 组长开启/关闭入群审核
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/11/17 14:02
+ */
+@Data
+public class EditAuditSwitchFormDTO implements Serializable {
+    private static final long serialVersionUID = -8185514609968752625L;
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+    @NotBlank(message = "小组id不能为空")
+    private String groupId;
+    /**
+     * 进组审核open开启；close关闭
+     */
+    @NotBlank(message = "请选择是否开启", groups = {EditAuditSwitchFormDTO.AddUserShowGroup.class})
+    private String auditSwitch;
+}

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

@@ -27,9 +27,13 @@ import com.epmet.modules.group.service.ResiGroupStatisticalService;
 import com.epmet.resi.group.dto.group.GroupProcessingCountResultDTO;
 import com.epmet.resi.group.dto.group.form.*;
 import com.epmet.resi.group.dto.group.result.*;
+import com.epmet.resi.group.dto.member.form.EditAuditSwitchFormDTO;
 import com.epmet.resi.group.dto.member.form.ResiIdentityFormDTO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -103,7 +107,7 @@ public class ResiGroupController {
      * @param modifyGroupFormDTO
      * @return com.epmet.commons.tools.utils.Result
      * @Author yinzuomei
-     * @Description 修改组信息
+     * @Description 修改组信息   此接口废弃
      * @Date 2020/3/28 22:20
      **/
     @PostMapping("modifygroup")
@@ -359,4 +363,17 @@ public class ResiGroupController {
         resiGroupStatisticalService.updateWhenAuditedResiRole(resiIdentityFormDTO);
         return new Result();
     }
+
+    /**
+     * @param formDTO
+     * @author yinzuomei
+     * @description 组长开启/关闭入群审核
+     * @Date 2020/11/17 14:18
+     **/
+    @PostMapping("editauditswitch")
+    public Result editAuditSwitch(@RequestBody EditAuditSwitchFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,EditAuditSwitchFormDTO.AddUserShowGroup.class);
+        resiGroupService.editAuditSwitch(formDTO);
+        return new Result();
+    }
 }

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

@@ -27,6 +27,7 @@ import com.epmet.resi.group.dto.group.GroupProcessingCountResultDTO;
 import com.epmet.resi.group.dto.group.ResiGroupDTO;
 import com.epmet.resi.group.dto.group.form.*;
 import com.epmet.resi.group.dto.group.result.*;
+import com.epmet.resi.group.dto.member.form.EditAuditSwitchFormDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -134,6 +135,7 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	 * @Description 修改组信息
 	 * @Date 2020/3/28 22:27
 	 **/
+	@Deprecated
 	void modifyGroup(ModifyGroupFormDTO modifyGroupFormDTO);
 
 	/**
@@ -293,4 +295,13 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	 * @return java.util.List<com.epmet.resi.group.dto.group.result.RecommendedListResultDTO>
 	 */
 	List<RecommendedListResultDTO> recommendedList(RecommendedListFormDTO formDTO);
+	
+	/**
+	 * @return void
+	 * @param formDTO
+	 * @author yinzuomei
+	 * @description 组长开启/关闭入群审核
+	 * @Date 2020/11/17 14:18 
+	 **/
+    void editAuditSwitch(EditAuditSwitchFormDTO formDTO);
 }

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

@@ -28,6 +28,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -58,13 +59,14 @@ import com.epmet.modules.utils.ModuleConstant;
 import com.epmet.resi.group.constant.*;
 import com.epmet.resi.group.dto.UserRoleDTO;
 import com.epmet.resi.group.dto.group.*;
-import com.epmet.resi.group.dto.group.form.*;
 import com.epmet.resi.group.dto.group.form.GridIdFormDTO;
 import com.epmet.resi.group.dto.group.form.ShouldVoteCountFormDTO;
+import com.epmet.resi.group.dto.group.form.*;
 import com.epmet.resi.group.dto.group.result.*;
 import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO;
 import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
 import com.epmet.resi.group.dto.member.ResiGroupMemberInfoRedisDTO;
+import com.epmet.resi.group.dto.member.form.EditAuditSwitchFormDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -127,6 +129,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 
 	@Autowired
 	private ResiGroupCodeService resiGroupCodeService;
+	@Autowired
+	private LoginUserUtil loginUserUtil;
 
 	@Override
 	public PageData<ResiGroupDTO> page(Map<String, Object> params) {
@@ -966,6 +970,24 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		return recommendGroupList;
 	}
 
+	/**
+	 * @param formDTO
+	 * @return void
+	 * @author yinzuomei
+	 * @description 组长开启/关闭入群审核
+	 * @Date 2020/11/17 14:18
+	 **/
+	@Override
+	public void editAuditSwitch(EditAuditSwitchFormDTO formDTO) {
+		ResiGroupEntity resiGroupEntity=baseDao.selectById(formDTO.getGroupId());
+		String currentUserId=loginUserUtil.getLoginUserId();
+		if(!currentUserId.equals(resiGroupEntity.getCreatedBy())){
+			throw new RenException(EpmetErrorCode.GROUP_LEADER_CAN_EDIT_GROUP_INFO.getCode());
+		}
+		resiGroupEntity.setAuditSwitch(formDTO.getAuditSwitch());
+		baseDao.updateById(resiGroupEntity);
+	}
+
 	/**
 	 * @Description 给加入此网格的网格长发送消息
 	 * @param msg