From ed7dd8ceb0df57462655f9ec68fcc4f5bd53fdf2 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 15 五月 2024 16:10:15 +0800
Subject: [PATCH] 优化代码
---
service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnerMembersCmd.java | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 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..851d313 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,13 +5,18 @@
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.api.ApiOwnerDataVo;
import com.java110.vo.api.ApiOwnerVo;
@@ -19,6 +24,7 @@
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -31,11 +37,19 @@
@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
@@ -43,7 +57,17 @@
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);
+
+ 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<>();
+ }
//鏌ヨ鏄惁鏈夎劚鏁忔潈闄�
List<Map> privileges = null;
BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
@@ -64,10 +88,26 @@
}
}
}
+ 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(ownerDtoList.size());
- apiOwnerVo.setRecords(1);
+ 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);
--
Gitblit v1.8.0