优化代码

service-user/src/main/java/com/java110/user/cmd/owner/QueryAppOwnerMembersCmd.java

@@ -0,0 +1,139 @@
+package com.java110.user.cmd.owner;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.file.FileRelDto;
+import com.java110.dto.owner.OwnerAppUserDto;
+import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.privilege.BasePrivilegeDto;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
+import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
+import com.java110.intf.user.IOwnerAppUserV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerInnerServiceSMO;
+import com.java110.intf.user.IOwnerV1InnerServiceSMO;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
+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 com.java110.vo.api.ApiOwnerDataVo;
+import com.java110.vo.api.ApiOwnerVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 查询app 成员
+ */
+@Java110Cmd(serviceCode = "owner.queryAppOwnerMembers")
+public class QueryAppOwnerMembersCmd extends Cmd {
+
+    @Autowired
+    private IOwnerAppUserInnerServiceSMO ownerAppUserInnerServiceSMOImpl;
+
+    @Autowired
+    private IOwnerV1InnerServiceSMO ownerV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
+
+    @Autowired
+    private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        Assert.jsonObjectHaveKey(reqJson, "communityId", "请求中未包含communityId信息");
+        // Assert.jsonObjectHaveKey(reqJson, "ownerTypeCd", "请求中未包含ownerTypeCd信息");
+        if (!reqJson.containsKey("page")) {
+            reqJson.put("page", 1);
+        }
+        if (!reqJson.containsKey("row")) {
+            reqJson.put("row", 50);
+        }
+
+        String userId = context.getReqHeaders().get("user-id");
+
+        OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
+        ownerAppUserDto.setUserId(userId);
+        ownerAppUserDto.setCommunityId(reqJson.getString("communityId"));
+        List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
+
+        if (ListUtil.isNull(ownerAppUserDtos)) {
+            throw new CmdException("未绑定业主");
+        }
+
+        String memberId = "";
+        for (OwnerAppUserDto tmpOwnerAppUserDto : ownerAppUserDtos) {
+            if ("-1".equals(tmpOwnerAppUserDto.getMemberId())) {
+                continue;
+            }
+
+            memberId = tmpOwnerAppUserDto.getMemberId();
+        }
+
+        if (StringUtil.isEmpty(memberId)) {
+            throw new CmdException("未绑定业主");
+        }
+
+        OwnerDto ownerDto = new OwnerDto();
+        ownerDto.setCommunityId(reqJson.getString("communityId"));
+        ownerDto.setMemberId(memberId);
+        List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
+
+        Assert.listOnlyOne(ownerDtos, "业主不存在");
+
+        reqJson.put("ownerId", ownerDtos.get(0).getOwnerId());
+
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        OwnerDto ownerDto = BeanConvertUtil.covertBean(reqJson, OwnerDto.class);
+        ownerDto.setOwnerTypeCds(new String[]{"1002", "1003", "1004", "1005"});
+
+        int row = reqJson.getInteger("row");
+        //查询总记录数
+        int total = ownerInnerServiceSMOImpl.queryOwnersMemberCount(ownerDto);
+
+        List<OwnerDto> ownerDtoList = null;
+        if (total > 0) {
+            ownerDtoList = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
+        } else {
+            ownerDtoList = new ArrayList<>();
+        }
+
+        String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN, "IMG_PATH");
+
+        for (OwnerDto ownerdto : ownerDtoList) {
+            FileRelDto fileRelDto = new FileRelDto();
+            fileRelDto.setObjId(ownerdto.getMemberId());
+            List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+            if (ListUtil.isNull(fileRelDtos)) {
+                continue;
+            }
+            ownerdto.setUrl(fileRelDtos.get(0).getFileSaveName());
+            if (fileRelDtos.get(0).getFileSaveName().startsWith("http")) {
+                ownerdto.setUrl(fileRelDtos.get(0).getFileSaveName());
+            } else {
+                ownerdto.setUrl(imgUrl + fileRelDtos.get(0).getFileSaveName());
+            }
+        }
+        ApiOwnerVo apiOwnerVo = new ApiOwnerVo();
+        apiOwnerVo.setOwners(BeanConvertUtil.covertBeanList(ownerDtoList, ApiOwnerDataVo.class));
+        apiOwnerVo.setTotal(total);
+        apiOwnerVo.setRecords((int) Math.ceil((double) total / (double) row));
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiOwnerVo), HttpStatus.OK);
+        context.setResponseEntity(responseEntity);
+    }
+}

service-user/src/main/java/com/java110/user/cmd/owner/QueryCurrentOwnerCmd.java

@@ -74,7 +74,7 @@ public class QueryCurrentOwnerCmd extends Cmd {
         OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
         ownerAppUserDto.setUserId(userId);
         ownerAppUserDto.setCommunityId(reqJson.getString("communityId"));
-        ownerAppUserDto.setMemberId(reqJson.getString("memberId"));
+        //ownerAppUserDto.setMemberId(reqJson.getString("memberId"));
         List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
 
         if (ownerAppUserDtos == null || ownerAppUserDtos.size() < 1) {