From 818dcb3445420d7c9bf358cbadc64ec065947151 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 25 三月 2025 10:10:29 +0800
Subject: [PATCH] 优化微耕二维码开门配合改造
---
service-common/src/main/java/com/java110/common/cmd/machine/GetQRcodeCmd.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/machine/GetQRcodeCmd.java b/service-common/src/main/java/com/java110/common/cmd/machine/GetQRcodeCmd.java
index 2933e86..4d19b39 100644
--- a/service-common/src/main/java/com/java110/common/cmd/machine/GetQRcodeCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/machine/GetQRcodeCmd.java
@@ -2,17 +2,20 @@
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;
import com.java110.dto.IotDataDto;
import com.java110.dto.machine.MachineDto;
+import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.user.UserDto;
import com.java110.intf.common.IMachineInnerServiceSMO;
import com.java110.intf.common.IMachineV1InnerServiceSMO;
import com.java110.intf.job.IDataBusInnerServiceSMO;
import com.java110.intf.job.IIotInnerServiceSMO;
+import com.java110.intf.user.IOwnerAppUserV1InnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.intf.user.IUserV1InnerServiceSMO;
@@ -46,10 +49,12 @@
@Autowired
private IIotInnerServiceSMO iotInnerServiceSMOImpl;
+ @Autowired
+ private IOwnerAppUserV1InnerServiceSMO ownerAppUserV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯淇℃伅");
- Assert.hasKeyAndValue(reqJson, "userId", "璇锋眰鎶ユ枃涓湭鍖呭惈鐢ㄦ埛淇℃伅");
Assert.hasKeyAndValue(reqJson, "machineCode", "璇锋眰鎶ユ枃涓湭鍖呭惈璁惧淇℃伅");
}
@@ -57,9 +62,23 @@
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
ResponseEntity<String> responseEntity = null;
+ String userId = CmdContextUtils.getUserId(context);
+ OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
+ ownerAppUserDto.setUserId(userId);
+ List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserV1InnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
+
+ if(ListUtil.isNull(ownerAppUserDtos)){
+ throw new CmdException("鏈璇佷笟涓�");
+ }
+
+ String memberId = ownerAppUserDtos.get(0).getMemberId();
+ if("-1".equals(memberId)){
+ throw new CmdException("鏈璇佷笟涓�");
+ }
+
//todo 濡傛灉鏄笟涓� 闄愬埗寮�闂ㄦ鏁�
OwnerDto ownerDto = new OwnerDto();
- ownerDto.setMemberId(reqJson.getString("userId"));
+ ownerDto.setMemberId(memberId);
ownerDto.setCommunityId(reqJson.getString("communityId"));
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
if (ListUtil.isNull(ownerDtos)) {
--
Gitblit v1.8.0