From 818dcb3445420d7c9bf358cbadc64ec065947151 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 25 三月 2025 10:10:29 +0800
Subject: [PATCH] 优化微耕二维码开门配合改造

---
 service-job/src/main/java/com/java110/job/cmd/owner/ListOwnerMachinesCmd.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/service-job/src/main/java/com/java110/job/cmd/owner/ListOwnerMachinesCmd.java b/service-job/src/main/java/com/java110/job/cmd/owner/ListOwnerMachinesCmd.java
index db7ed13..6b17569 100644
--- a/service-job/src/main/java/com/java110/job/cmd/owner/ListOwnerMachinesCmd.java
+++ b/service-job/src/main/java/com/java110/job/cmd/owner/ListOwnerMachinesCmd.java
@@ -2,16 +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.owner.OwnerAppUserDto;
 import com.java110.dto.owner.OwnerDto;
 import com.java110.intf.common.IMachineInnerServiceSMO;
 import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.user.IOwnerAppUserV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerInnerServiceSMO;
 import com.java110.job.adapt.hcIot.http.ISendIot;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.ListUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -30,19 +34,35 @@
     private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
 
     @Autowired
+    private IOwnerAppUserV1InnerServiceSMO ownerAppUserV1InnerServiceSMOImpl;
+
+    @Autowired
     private ISendIot sendIotImpl;
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
-        Assert.hasKeyAndValue(reqJson, "memberId", "璇锋眰鎶ユ枃涓湭鍖呭惈涓氫富淇℃伅");
         Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯淇℃伅");
         super.validatePageInfo(reqJson);
     }
 
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+
+        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("鏈璇佷笟涓�");
+        }
+
         String communityId = reqJson.getString("communityId");
-        String memberId = reqJson.getString("memberId");
 
         OwnerDto ownerDto = new OwnerDto();
         ownerDto.setCommunityId(communityId);

--
Gitblit v1.8.0