Merge remote-tracking branch 'remotes/origin/dev_group_code' into dev_temp

# Conflicts:
#	epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
#	epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
#	epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java

@@ -40,6 +40,10 @@ import org.springframework.cloud.openfeign.FeignClient;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.resi.group.feign.fallback.ResiGroupOpenFeignClientFallback;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -115,6 +119,16 @@ public interface ResiGroupOpenFeignClient {
     @PostMapping("/resi/group/group/gov-audit-edit")
     Result govAuditEdit(@RequestBody GroupEditionAuditFormDTO param);
 
+
+    /**
+     * @Description 创建群组二维码
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result<java.lang.String>
+     * @Author liushaowen
+     * @Date 2020/11/13 16:33
+     */
+    @PostMapping(value = "/resi/group/resigroupcode/creategroupcode", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result<String> createGroupCode(@RequestBody CreateGroupCodeFormDTO dto);
     /**
      * @Description 个人中心-我参与过的话题
      * @param param

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java

@@ -11,6 +11,10 @@ import com.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO;
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
@@ -74,6 +78,17 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
     public Result govAuditEdit(GroupEditionAuditFormDTO param) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "govAuditEdit", param);
     }
+    /**
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result<java.lang.String>
+     * @Description 创建群组二维码
+     * @Author liushaowen
+     * @Date 2020/11/13 16:33
+     */
+    @Override
+    public Result<String> createGroupCode(CreateGroupCodeFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "createGroupCode", dto);
+    }
 
     @Override
     public Result<List<GroupInfoResultDTO>> selectGroupInfo(GroupInfoFormDTO groupInfoFormDTO) {

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

@@ -427,6 +427,19 @@ public class ResiGroupController {
     }
 
 
+    /**
+     * @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();
+    }
+
     /**
      * @Description  查询话题所属小组名
      * @Param groupInfoFormDTO

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

@@ -135,6 +135,7 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	 * @Description 修改组信息
 	 * @Date 2020/3/28 22:27
 	 **/
+	@Deprecated
 	void modifyGroup(ModifyGroupFormDTO modifyGroupFormDTO);
 
 	/**
@@ -326,6 +327,15 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	*/
 	void auditEdit(GroupEditionAuditFormDTO param);
 
+	/**
+	 * @return void
+	 * @param formDTO
+	 * @author yinzuomei
+	 * @description 组长开启/关闭入群审核
+	 * @Date 2020/11/17 14:18
+	 **/
+    void editAuditSwitch(EditAuditSwitchFormDTO formDTO);
+
 	/**
 	 * @Description  查询话题所属小组名
 	 * @Param groupInfoFormDTO

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

@@ -28,6 +28,10 @@ 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;
 import com.epmet.commons.tools.scan.param.ImgScanParamDTO;
 import com.epmet.commons.tools.scan.param.ImgTaskDTO;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
@@ -160,6 +164,11 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	@Value("${openapi.scan.method.imgSyncScan}")
 	private String imgSyncScanMethod;
 
+	@Autowired
+	private ResiGroupCodeService resiGroupCodeService;
+	@Autowired
+	private LoginUserUtil loginUserUtil;
+
 	@Autowired
 	private ResiGroupCodeService resiGroupCodeService;
 
@@ -326,7 +335,6 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		}
 		//获取组长信息
 		Result<UserResiInfoResultDTO> groupLeaderUserInfo = this.getGroupLeaderUserInfo(groupSummarizeFormDTO.getGroupId());
-
 		if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
 			groupSummarizeResultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName());
 		} else {

epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml

@@ -127,11 +127,6 @@ openapi:
       imgSyncScan: /imgSyncScan
       textSyncScan: /textSyncScan
 
-dingTalk:
-  robot:
-    webHook: @dingTalk.robot.webHook@
-    secret: @dingTalk.robot.secret@
-
 thread:
   # 线程池配置
   threadPool:
@@ -139,3 +134,9 @@ thread:
     maxPoolSize: @thread.pool.max-pool-size@
     queueCapacity: @thread.pool.queue-capacity@
     keepAlive: @thread.pool.keep-alive@
+
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -441,14 +441,6 @@ public interface EpmetUserOpenFeignClient {
     @PostMapping(value = "/epmetuser/badge/querygridauditingbadgecount", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<GridAuditingBadgeCountResultDTO>> queryGridAuditingBadgeCount(@RequestBody List<String> gridIdList);
 
-    /**
-     * 根据userId集合查询用户注册信息
-     * @author sun
-     */
-    @PostMapping("/epmetuser/userresiinfo/getuserresiinfolist")
-    Result<List<UserResiInfoResultDTO>> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO userResiInfoListFormDTO);
-
-
     /**
      * @Description 根据角色key查询具有该key的所有角色列表
      * @return
@@ -458,6 +450,14 @@ public interface EpmetUserOpenFeignClient {
     @PostMapping("/epmetuser/govstaffrole/list-roles-by-rolekey/{role-key}")
     Result<List<GovStaffRoleResultDTO>> listRolesByRoleKey(@PathVariable("role-key") String roleKey);
 
+    /**
+     * 根据userId集合查询用户注册信息
+     * @author sun
+     */
+    @PostMapping("/epmetuser/userresiinfo/getuserresiinfolist")
+    Result<List<UserResiInfoResultDTO>> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO userResiInfoListFormDTO);
+
+
     /**
      * @param userId
      * @author yinzuomei

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -313,13 +313,13 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     }
 
     @Override
-    public Result<List<UserResiInfoResultDTO>> getUserResiInfoList(UserResiInfoListFormDTO fromDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoList", fromDTO);
+    public Result<List<GovStaffRoleResultDTO>> listRolesByRoleKey(String roleKey) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "listRolesByRoleKey", roleKey);
     }
 
     @Override
-    public Result<List<GovStaffRoleResultDTO>> listRolesByRoleKey(String roleKey) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "listRolesByRoleKey", roleKey);
+    public Result<List<UserResiInfoResultDTO>> getUserResiInfoList(UserResiInfoListFormDTO fromDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoList", fromDTO);
     }
 
     @Override