From d88c2d2a36f3aa679a4e1eb61022c0fbdcf142f9 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 2 Dec 2020 09:49:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/MiniInfoDao.java | 11 +++++++++++ .../java/com/epmet/service/impl/CodeServiceImpl.java | 5 +++++ .../src/main/resources/mapper/MiniInfoDao.xml | 7 +++++++ 3 files changed, 23 insertions(+) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniInfoDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniInfoDao.java index 6add27be9a..42d942a6cb 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniInfoDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniInfoDao.java @@ -63,5 +63,16 @@ public interface MiniInfoDao extends BaseDao { * @return java.lang.String */ 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); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java index 7e1208dcc4..e230b87f3b 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java +++ b/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(); } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MiniInfoDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MiniInfoDao.xml index f70597f4d5..87708b05ce 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MiniInfoDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MiniInfoDao.xml @@ -31,6 +31,13 @@ NOW() ) + + update mini_info + set NICK_NAME = #{nickName} + where CUSTOMER_ID = #{customerId} + and CLIENT_TYPE = #{clientType} + and DEL_FLAG = '0' + From 9b92449d62814674a76560fd8aac38dd6f1ce7de Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 2 Dec 2020 14:08:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=85=B3?= =?UTF-8?q?=E4=BA=8E=E5=8E=86=E5=8F=B2=E5=B0=8F=E7=BB=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=A6=96=E6=AC=A1=E7=94=9F=E6=88=90=E5=B0=8F=E7=BB=84=E6=B5=B7?= =?UTF-8?q?=E6=8A=A5=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/group/service/impl/ResiGroupCodeServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java index b77e271163..6615ca4bb1 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java +++ b/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 Date: Wed, 2 Dec 2020 16:35:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E7=BD=91=E6=A0=BC(enterG?= =?UTF-8?q?rid)=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=8F=82userS?= =?UTF-8?q?treetName(=E6=A0=BC=E5=BC=8F:=20XX=E8=B7=AF-X=E5=85=88=E7=94=9F?= =?UTF-8?q?/=E5=A5=B3=E5=A3=AB)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java | 4 ++++ .../com/epmet/service/impl/RegisterRelationServiceImpl.java | 1 + 2 files changed, 5 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java index 3779e68a24..0e5cd22fef 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java +++ b/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 userRoleList; + /** + * + */ + private String userStreetName; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java index 06d33d7d93..7b9edb95a5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java @@ -304,6 +304,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl