From 7935724516cb699835da888d59cd5b7bec5c6049 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 12 九月 2024 12:07:29 +0800
Subject: [PATCH] 完成业主功能的优化
---
service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnerMembersCmd.java | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnerMembersCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnerMembersCmd.java
index 3d4c59c..3823659 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnerMembersCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnerMembersCmd.java
@@ -5,20 +5,27 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.dto.basePrivilege.BasePrivilegeDto;
+import com.java110.dto.privilege.BasePrivilegeDto;
+import com.java110.dto.file.FileRelDto;
import com.java110.dto.owner.OwnerDto;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.community.IMenuInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
+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.ResultVo;
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.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -31,19 +38,37 @@
@Autowired
private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
+ @Autowired
+ private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
Assert.jsonObjectHaveKey(reqJson, "communityId", "璇锋眰涓湭鍖呭惈communityId淇℃伅");
- Assert.jsonObjectHaveKey(reqJson, "ownerId", "璇锋眰涓湭鍖呭惈ownerId淇℃伅");
// Assert.jsonObjectHaveKey(reqJson, "ownerTypeCd", "璇锋眰涓湭鍖呭惈ownerTypeCd淇℃伅");
+ if (!reqJson.containsKey("page")) {
+ reqJson.put("page", 1);
+ }
+ if (!reqJson.containsKey("row")) {
+ reqJson.put("row", 10);
+ }
}
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
String userId = context.getReqHeaders().get("user-id");
OwnerDto ownerDto = BeanConvertUtil.covertBean(reqJson, OwnerDto.class);
- ownerDto.setOwnerTypeCds(new String[]{"1002", "1003", "1004", "1005"});
- List<OwnerDto> ownerDtoList = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
+ ownerDto.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_MEMBER);
+
+ int row = reqJson.getInteger("row");
+ //鏌ヨ鎬昏褰曟暟
+ int total = ownerInnerServiceSMOImpl.queryOwnersMemberCount(ownerDto);
+
+ List<OwnerDto> ownerDtos = null;
+ if (total > 0) {
+ ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
+ } else {
+ ownerDtos = new ArrayList<>();
+ }
//鏌ヨ鏄惁鏈夎劚鏁忔潈闄�
List<Map> privileges = null;
BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
@@ -51,7 +76,7 @@
basePrivilegeDto.setUserId(userId);
privileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto);
if (privileges == null || privileges.size() == 0) {
- for (OwnerDto owner : ownerDtoList) {
+ for (OwnerDto owner : ownerDtos) {
String idCard = owner.getIdCard();
if (!StringUtil.isEmpty(idCard)) {
idCard = idCard.substring(0, 6) + "**********" + idCard.substring(16);
@@ -64,12 +89,8 @@
}
}
}
- ApiOwnerVo apiOwnerVo = new ApiOwnerVo();
- apiOwnerVo.setOwners(BeanConvertUtil.covertBeanList(ownerDtoList, ApiOwnerDataVo.class));
- apiOwnerVo.setTotal(ownerDtoList.size());
- apiOwnerVo.setRecords(1);
- ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiOwnerVo), HttpStatus.OK);
+ ResponseEntity<String> responseEntity = ResultVo.createResponseEntity((int) Math.ceil((double) total / (double) row), total, ownerDtos);
context.setResponseEntity(responseEntity);
}
}
--
Gitblit v1.8.0