Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp

# Conflicts:
#	epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/ApplyingMemberResultDTO.java
#	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-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/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniInfoDao.java

@@ -64,4 +64,15 @@ public interface MiniInfoDao extends BaseDao<MiniInfoEntity> {
      */
     String getNickName(@Param("customerId") String customerId, @Param("clientType") String clientType);
 
+    /**
+     * 更新小程序名
+     * @author zhaoqifeng
+     * @date 2020/12/2 9:37
+     * @param customerId
+     * @param clientType
+     * @param nickName
+     * @return void
+     */
+    void updateNickName(@Param("customerId") String customerId, @Param("clientType") String clientType, @Param("nickName") String nickName);
+	
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java

@@ -142,10 +142,14 @@ public class CodeServiceImpl implements CodeService {
 			resiName = getNickName(authInfo.getAuthorizerAppid());
 			AuthorizationInfoDTO workAuthInfo = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), CodeConstant.WORK);
 			workName = getNickName(workAuthInfo.getAuthorizerAppid());
+			miniInfoDao.updateNickName(formDTO.getCustomerId(), formDTO.getClientType(), resiName);
+			miniInfoDao.updateNickName(formDTO.getCustomerId(), CodeConstant.WORK, workName);
 		} else {
 			workName = getNickName(authInfo.getAuthorizerAppid());
 			AuthorizationInfoDTO resiAuthInfo = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), CodeConstant.RESI);
 			resiName = getNickName(resiAuthInfo.getAuthorizerAppid());
+			miniInfoDao.updateNickName(formDTO.getCustomerId(), formDTO.getClientType(), workName);
+			miniInfoDao.updateNickName(formDTO.getCustomerId(), CodeConstant.RESI, resiName);
 		}
 		//获取小程序居民端与工作端名称
 
@@ -831,6 +835,7 @@ public class CodeServiceImpl implements CodeService {
 		String data = HttpClientManager.getInstance().sendPostByJSON(WxMaCodeConstant.API_GET_AUTHORIZER_INFO + componentAccessToken , JSON.toJSONString(jsonObject)).getData();
 		Map map = JSON.parseObject(data, Map.class);
 		Map authInfo = (Map) map.get(ModuleConstant.AUTHORIZER_INFO);
+		ConvertUtils.mapToEntity(authInfo, MiniInfoFormDTO.class).getNick_name();
 		return ConvertUtils.mapToEntity(authInfo, MiniInfoFormDTO.class).getNick_name();
 	}
 

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MiniInfoDao.xml

@@ -31,6 +31,13 @@
                 NOW()
             )
     </insert>
+    <update id="updateNickName">
+        update mini_info
+        set NICK_NAME = #{nickName}
+        where CUSTOMER_ID = #{customerId}
+          and CLIENT_TYPE = #{clientType}
+          and DEL_FLAG = '0'
+    </update>
 
     <!-- 删除小程序信息 -->
     <delete id="deleteMiniInfo">

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/ApplyingMemberResultDTO.java

@@ -47,14 +47,14 @@ public class ApplyingMemberResultDTO implements Serializable {
 	 */
 	private String status;
 
-	/**
-	 * 用户徽章Url列表
-	 */
-	private List<String> badgeList;
-
 	/**
 	 *  invited：通过链接加入 ； join：申请加入；scancode通过扫码加入
 	 */
 	private String enterGroupType;
 
+
+	/**
+	 * 用户徽章Url列表
+	 */
+	private List<String> badgeList;
 }

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

@@ -18,13 +18,18 @@ import com.epmet.resi.group.dto.topic.result.MyPartIssueResultDTO;
 import com.epmet.resi.group.dto.topic.result.ParticipatedTopicUnitResultDTO;
 import com.epmet.resi.group.feign.fallback.ResiGroupOpenFeignClientFallback;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.HashMap;
 import java.util.List;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
@@ -36,24 +41,6 @@ import java.util.List;
 //@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupOpenFeignClientFallback.class,url = "localhost:8095")
 public interface ResiGroupOpenFeignClient {
 
-    /**
-     * @Description 查询用户参与的且不是自己发表的话题对应的议题Id集合
-     * @author sun
-     */
-    @PostMapping(value = "/resi/group/comment/topictoissuelist")
-    Result<List<IssueGridResultDTO>> topicToIssueList(MyPartProjectsFormDTO formDTO);
-
-    /**
-     * @Description  查询话题所属小组名
-     * @Param groupInfoFormDTO
-     * @author zxc
-     * @date 2020/11/11 1:36 下午
-     */
-    @PostMapping("resi/group/group/groupinfo")
-    Result<List<GroupInfoResultDTO>> selectGroupInfo(@RequestBody GroupInfoFormDTO groupInfoFormDTO);
-
-
-
     @PostMapping("/resi/group/group/gov-edit-auditing-list")
     Result<List<ApplyingGroupResultDTO>> govEditAuditingList(@RequestBody CommonGridAndPageFormDTO param);
 
@@ -87,6 +74,23 @@ public interface ResiGroupOpenFeignClient {
      */
     @PostMapping(value = "/resi/group/resigroupcode/creategroupcode", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
     Result<String> createGroupCode(@RequestBody CreateGroupCodeFormDTO dto);
+
+    /**
+     * @Description 查询用户参与的且不是自己发表的话题对应的议题Id集合
+     * @author sun
+     */
+    @PostMapping(value = "/resi/group/comment/topictoissuelist")
+    Result<List<IssueGridResultDTO>> topicToIssueList(MyPartProjectsFormDTO formDTO);
+
+    /**
+     * @Description  查询话题所属小组名
+     * @Param groupInfoFormDTO
+     * @author zxc
+     * @date 2020/11/11 1:36 下午
+     */
+    @PostMapping("resi/group/group/groupinfo")
+    Result<List<GroupInfoResultDTO>> selectGroupInfo(@RequestBody GroupInfoFormDTO groupInfoFormDTO);
+
     /**
      * @Description 个人中心-我参与过的话题
      * @param param

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

@@ -6,19 +6,17 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.resi.group.dto.group.form.*;
 import com.epmet.resi.group.dto.group.result.ApplicationDetailCopyResultDTO;
 import com.epmet.resi.group.dto.group.ResiGroupDTO;
-import com.epmet.resi.group.dto.group.form.*;
-import com.epmet.resi.group.dto.group.result.ApplicationDetailCopyResultDTO;
 import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO;
 import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO;
 import com.epmet.resi.group.dto.group.form.GroupInfoFormDTO;
-import com.epmet.resi.group.dto.group.result.ApplicationDetailCopyResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO;
 import com.epmet.resi.group.dto.topic.MyCreateTopicsFormDTO;
 import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.result.IssueGridResultDTO;
 import com.epmet.resi.group.dto.topic.result.MyPartIssueResultDTO;
 import com.epmet.resi.group.dto.topic.result.ParticipatedTopicUnitResultDTO;
+import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 import org.springframework.stereotype.Component;
@@ -34,12 +32,6 @@ import java.util.List;
  */
 @Component
 public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClient {
-
-    @Override
-    public Result<List<IssueGridResultDTO>> topicToIssueList(MyPartProjectsFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "topicToIssueList", formDTO);
-    }
-
     @Override
     public Result<List<ApplyingGroupResultDTO>> govEditAuditingList(CommonGridAndPageFormDTO param) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "govEditAuditingList", param);
@@ -66,6 +58,11 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "createGroupCode", dto);
     }
 
+    @Override
+    public Result<List<IssueGridResultDTO>> topicToIssueList(MyPartProjectsFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "topicToIssueList", formDTO);
+    }
+
     @Override
     public Result<List<GroupInfoResultDTO>> selectGroupInfo(GroupInfoFormDTO groupInfoFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "selectGroupInfo", groupInfoFormDTO);

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

@@ -31,10 +31,6 @@ 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.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -433,17 +429,6 @@ public class ResiGroupController {
         return new Result();
     }
 
-    /**
-     * @Description  查询话题所属小组名
-     * @Param groupInfoFormDTO
-     * @author zxc
-     * @date 2020/11/11 1:36 下午
-     */
-    @PostMapping("groupinfo")
-    public Result<List<GroupInfoResultDTO>> selectGroupInfo(@RequestBody GroupInfoFormDTO groupInfoFormDTO){
-        return new Result<List<GroupInfoResultDTO>>().ok(resiGroupService.selectGroupInfo(groupInfoFormDTO));
-    }
-
     /**
      * @param formDTO
      * @author yinzuomei
@@ -457,6 +442,17 @@ public class ResiGroupController {
         return new Result();
     }
 
+    /**
+     * @Description  查询话题所属小组名
+     * @Param groupInfoFormDTO
+     * @author zxc
+     * @date 2020/11/11 1:36 下午
+     */
+    @PostMapping("groupinfo")
+    public Result<List<GroupInfoResultDTO>> selectGroupInfo(@RequestBody GroupInfoFormDTO groupInfoFormDTO){
+        return new Result<List<GroupInfoResultDTO>>().ok(resiGroupService.selectGroupInfo(groupInfoFormDTO));
+    }
+
     @PostMapping("getgroupinfo")
     public Result<HashMap<String, ResiGroupDTO>> getGroupInfo(@RequestBody List<String> groupIds) {
         if (CollectionUtils.isEmpty(groupIds)) {

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

@@ -328,14 +328,6 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	*/
 	void auditEdit(GroupEditionAuditFormDTO param);
 
-	/**
-	 * @Description  查询话题所属小组名
-	 * @Param groupInfoFormDTO
-	 * @author zxc
-	 * @date 2020/11/11 1:36 下午
-	 */
-	List<GroupInfoResultDTO> selectGroupInfo(GroupInfoFormDTO groupInfoFormDTO);
-
 	/**
 	 * @return void
 	 * @param formDTO
@@ -345,6 +337,14 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	 **/
     void editAuditSwitch(EditAuditSwitchFormDTO formDTO);
 
+	/**
+	 * @Description  查询话题所属小组名
+	 * @Param groupInfoFormDTO
+	 * @author zxc
+	 * @date 2020/11/11 1:36 下午
+	 */
+	List<GroupInfoResultDTO> selectGroupInfo(GroupInfoFormDTO groupInfoFormDTO);
+
 	/**
 	 * @param groupIds
 	 * @author yinzuomei

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

@@ -290,6 +290,7 @@ public class ResiGroupCodeServiceImpl extends BaseServiceImpl<ResiGroupCodeDao,
                 logger.error(String.format("生成小组二维码失败，小组Id：%s", formDTO.getGroupId()));
                 throw new RenException("获取小组码基本信息失败");
             }
+            resultDTO.setGroupCodeUrl(url);
         }
         headUrl = resultDTO.getGroupHeadPhoto();
         url = resultDTO.getGroupCodeUrl();

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java

@@ -50,4 +50,8 @@ public class UserInfoOnEnterGridResultDTO implements Serializable{
      * */
     private List<String> userRoleList;
 
+    /**
+     *
+     */
+    private String userStreetName;
 }

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

@@ -402,6 +402,23 @@ public interface EpmetUserOpenFeignClient {
     @PostMapping("/epmetuser/customerstaff/getstaffbasicinfo")
     Result<BasicInfoResultDTO> getStaffBasicInfo(@RequestBody StaffBasicInfoFromDTO fromDTO);
 
+    /**
+     * @Description 根据角色key查询具有该key的所有角色列表
+     * @return
+     * @author wxz
+     * @date 2020.11.17 16:20
+     */
+    @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);
+
+
     /**
      * @Description 个人中心-我的建议列表
      * @param dto
@@ -441,23 +458,6 @@ public interface EpmetUserOpenFeignClient {
     @PostMapping(value = "/epmetuser/badge/querygridauditingbadgecount", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<GridAuditingBadgeCountResultDTO>> queryGridAuditingBadgeCount(@RequestBody List<String> gridIdList);
 
-    /**
-     * @Description 根据角色key查询具有该key的所有角色列表
-     * @return
-     * @author wxz
-     * @date 2020.11.17 16:20
-     */
-    @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

@@ -278,6 +278,16 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffBasicInfo", fromDTO);
     }
 
+    @Override
+    public Result<List<GovStaffRoleResultDTO>> listRolesByRoleKey(String roleKey) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "listRolesByRoleKey", roleKey);
+    }
+
+    @Override
+    public Result<List<UserResiInfoResultDTO>> getUserResiInfoList(UserResiInfoListFormDTO fromDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoList", fromDTO);
+    }
+
     @Override
     public Result<List<MyAdviceListResultDTO>> myAdviceList(MyAdviceListFormDTO dto) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "myAdviceList", dto);
@@ -312,16 +322,6 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "queryGridAuditingBadgeCount", gridIdList);
     }
 
-    @Override
-    public Result<List<GovStaffRoleResultDTO>> listRolesByRoleKey(String roleKey) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "listRolesByRoleKey", roleKey);
-    }
-
-    @Override
-    public Result<List<UserResiInfoResultDTO>> getUserResiInfoList(UserResiInfoListFormDTO fromDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoList", fromDTO);
-    }
-
     @Override
     public Result<Boolean> initBadge(String partyUserId) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "initBadge", partyUserId);

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java

@@ -304,6 +304,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
         userResiInfoDao.selectUserResiInfoDTO(userResiParam);
         if(null == resiResult){
             visitedFormDTO.setIsReg(NumConstant.ZERO_STR);
+            resultObj.setUserStreetName(resiResult.getShowName());
         }else{
             visitedFormDTO.setIsReg(NumConstant.ONE_STR);
         }