From e40889177c25035496c526dbc12a9665d5b61ceb Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 20 三月 2025 12:00:53 +0800
Subject: [PATCH] 优化小区房屋和小区业主 支持按小区查询数据
---
service-user/src/main/java/com/java110/user/cmd/owner/RefreshAppUserBindingOwnerOpenIdCmd.java | 56 ++++++++++++++++++++------------------------------------
1 files changed, 20 insertions(+), 36 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/RefreshAppUserBindingOwnerOpenIdCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/RefreshAppUserBindingOwnerOpenIdCmd.java
index d0ca69f..aa219b5 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/RefreshAppUserBindingOwnerOpenIdCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/RefreshAppUserBindingOwnerOpenIdCmd.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
@@ -15,6 +16,8 @@
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
@@ -30,54 +33,37 @@
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "appUserId", "缁戝畾ID涓嶈兘涓虹┖");
Assert.hasKeyAndValue(reqJson, "openId", "蹇呭～锛岃濉啓鐘舵��");
Assert.hasKeyAndValue(reqJson, "communityId", "蹇呭～锛岃濉啓灏忓尯ID");
- if (reqJson.getString("appUserId").startsWith("-")) {
- Assert.hasKeyAndValue(reqJson, "oldAppUserId", "蹇呭～锛岃濉啓鑰佺粦瀹欼D");
- Assert.hasKeyAndValue(reqJson, "appType", "蹇呭～锛岃濉啓appType");
- }
}
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- String appUserId = reqJson.getString("appUserId");
- if (appUserId.startsWith("-")) {
- OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
- ownerAppUserDto.setAppUserId(reqJson.getString("oldAppUserId"));
- ownerAppUserDto.setCommunityId(reqJson.getString("communityId"));
- List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserV1InnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
+ String userId = CmdContextUtils.getUserId(cmdDataFlowContext);
- Assert.listOnlyOne(ownerAppUserDtos, "浼犲叆oldAppUserId閿欒");
- OwnerAppUserPo ownerAppUserPo = BeanConvertUtil.covertBean(ownerAppUserDtos.get(0), OwnerAppUserPo.class);
- ownerAppUserPo.setAppUserId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_userId));
- ownerAppUserPo.setAppType(reqJson.getString("appType"));
- ownerAppUserPo.setOpenId(reqJson.getString("openId"));
- ownerAppUserPo.setNickName(reqJson.getString("nickName"));
- ownerAppUserPo.setHeadImgUrl(reqJson.getString("headImgUrl"));
- ownerAppUserV1InnerServiceSMOImpl.saveOwnerAppUser(ownerAppUserPo);
- freshUserToken(reqJson, ownerAppUserDtos.get(0).getUserId());
- return;
+ if (StringUtil.isEmpty(userId)) {
+ throw new CmdException("鐢ㄦ埛鏈櫥褰�");
}
+ //todo 鍒穟ser_attr 涓殑openId
+ freshUserToken(reqJson, userId);
+
+ OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
+ ownerAppUserDto.setUserId(userId);
+ ownerAppUserDto.setCommunityId(reqJson.getString("communityId"));
+ List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserV1InnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
+
+ if (ListUtil.isNull(ownerAppUserDtos)) {
+ return;
+ }
OwnerAppUserPo ownerAppUserPo = new OwnerAppUserPo();
- ownerAppUserPo.setAppUserId(appUserId);
+ ownerAppUserPo.setAppUserId(ownerAppUserDtos.get(0).getAppUserId());
ownerAppUserPo.setCommunityId(reqJson.getString("communityId"));
ownerAppUserPo.setOpenId(reqJson.getString("openId"));
ownerAppUserPo.setNickName(reqJson.getString("nickName"));
ownerAppUserPo.setHeadImgUrl(reqJson.getString("headImgUrl"));
ownerAppUserV1InnerServiceSMOImpl.updateOwnerAppUser(ownerAppUserPo);
-
- OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
- ownerAppUserDto.setAppUserId(appUserId);
- ownerAppUserDto.setCommunityId(reqJson.getString("communityId"));
- List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserV1InnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
-
- Assert.listOnlyOne(ownerAppUserDtos, "浼犲叆appUserId閿欒");
-
-
- freshUserToken(reqJson, ownerAppUserDtos.get(0).getUserId());
}
private void freshUserToken(JSONObject reqJson, String userId) {
@@ -91,7 +77,7 @@
userAttrDto.setUserId(userId);
userAttrDto.setSpecCd(UserAttrDto.SPEC_OPEN_ID);
List<UserAttrDto> userAttrDtos = userAttrV1InnerServiceSMOImpl.queryUserAttrs(userAttrDto);
- if (userAttrDtos == null || userAttrDtos.size() < 1) {
+ if (ListUtil.isNull(userAttrDtos)) {
UserAttrPo userAttrPo = new UserAttrPo();
userAttrPo.setUserId(userId);
userAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
@@ -115,7 +101,7 @@
userAttrDto.setUserId(userId);
userAttrDto.setSpecCd(UserAttrDto.SPEC_UNION_ID);
userAttrDtos = userAttrV1InnerServiceSMOImpl.queryUserAttrs(userAttrDto);
- if (userAttrDtos == null || userAttrDtos.size() < 1) {
+ if (ListUtil.isNull(userAttrDtos)) {
userAttrPo = new UserAttrPo();
userAttrPo.setUserId(userId);
userAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
@@ -130,7 +116,5 @@
userAttrPo.setSpecCd(UserAttrDto.SPEC_UNION_ID);
userAttrPo.setValue(reqJson.getString("unionId"));
userAttrV1InnerServiceSMOImpl.updateUserAttr(userAttrPo);
-
-
}
}
--
Gitblit v1.8.0