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/QueryOwnersCmd.java | 134 ++++----------------------------------------
1 files changed, 13 insertions(+), 121 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java
index ac946e5..628a326 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java
@@ -2,6 +2,7 @@
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;
@@ -20,6 +21,7 @@
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;
@@ -114,50 +116,29 @@
Assert.jsonObjectHaveKey(reqJson, "page", "璇锋眰涓湭鍖呭惈page淇℃伅");
Assert.jsonObjectHaveKey(reqJson, "row", "璇锋眰涓湭鍖呭惈row淇℃伅");
Assert.jsonObjectHaveKey(reqJson, "communityId", "璇锋眰涓湭鍖呭惈communityId淇℃伅");
- //Assert.jsonObjectHaveKey(reqJson, "ownerTypeCd", "璇锋眰涓湭鍖呭惈ownerTypeCd淇℃伅");
Assert.isInteger(reqJson.getString("page"), "涓嶆槸鏈夋晥鏁板瓧");
Assert.isInteger(reqJson.getString("row"), "涓嶆槸鏈夋晥鏁板瓧");
}
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+ String userId = CmdContextUtils.getUserId(cmdDataFlowContext);
+
//todo 鏍规嵁鎴垮眿鏌ヨ鏃� 鍏堢敤 鎴垮眿淇℃伅鏌ヨ 涓氫富ID
freshRoomId(reqJson);
-
OwnerDto ownerDto = BeanConvertUtil.covertBean(reqJson, OwnerDto.class);
- //todo 鏍规嵁鎴愬憳鏌ヨ
- queryByOwnerMember(reqJson, ownerDto);
-
-
- if (reqJson.containsKey("name") && !StringUtil.isEmpty(reqJson.getString("name"))) {
- queryByCondition(reqJson, cmdDataFlowContext);
- return;
- }
int row = reqJson.getInteger("row");
- ApiOwnerVo apiOwnerVo = new ApiOwnerVo();
//鏌ヨ鎬昏褰曟暟
int total = ownerInnerServiceSMOImpl.queryOwnersCount(ownerDto);
- apiOwnerVo.setTotal(total);
- List<OwnerDto> ownerDtos = new ArrayList<>();
+ List<OwnerDto> ownerDtos = null;
if (total > 0) {
- List<OwnerDto> ownerDtoList = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
+ ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
// 鏌ヨ缁熻鏁版嵁
- ownerDtoList = queryOwnerStatisticsBMOImpl.query(ownerDtoList);
- List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", reqJson.getString("userId"));
- for (OwnerDto tmpOwnerDto : ownerDtoList) {
- //鏌ヨ鐓х墖
- FileRelDto fileRelDto = new FileRelDto();
- fileRelDto.setObjId(tmpOwnerDto.getMemberId());
- fileRelDto.setRelTypeCd("10000"); //涓氫富鐓х墖
- List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
- if (!ListUtil.isNull(fileRelDtos)) {
- List<String> urls = new ArrayList<>();
- for (FileRelDto fileRel : fileRelDtos) {
- urls.add(fileRel.getFileRealName());
- }
- tmpOwnerDto.setUrls(urls);
- }
+ ownerDtos = queryOwnerStatisticsBMOImpl.query(ownerDtos);
+ List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", userId);
+ for (OwnerDto tmpOwnerDto : ownerDtos) {
//瀵逛笟涓昏韩浠借瘉鍙烽殣钘忓鐞�
String idCard = tmpOwnerDto.getIdCard();
if (mark.size() == 0 && idCard != null && !idCard.equals("") && idCard.length() > 16) {
@@ -170,55 +151,12 @@
link = link.substring(0, 3) + "****" + link.substring(7);
tmpOwnerDto.setLink(link);
}
- ownerDtos.add(tmpOwnerDto);
}
- apiOwnerVo.setOwners(BeanConvertUtil.covertBeanList(ownerDtos, ApiOwnerDataVo.class));
+ }else{
+ ownerDtos = new ArrayList<>();
}
- apiOwnerVo.setRecords((int) Math.ceil((double) total / (double) row));
- 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);
cmdDataFlowContext.setResponseEntity(responseEntity);
- }
-
- /**
- * 鏍规嵁 鎴愬憳鏌ヨ
- *
- * @param reqJson
- * @param ownerDto
- */
- private void queryByOwnerMember(JSONObject reqJson, OwnerDto ownerDto) {
-
- if (!reqJson.containsKey("memberName") && !reqJson.containsKey("memberLink")) {
- return;
- }
-
- String memberName = reqJson.getString("memberName");
- String memberLink = reqJson.getString("memberLink");
-
- if (StringUtil.isEmpty(memberName) && StringUtil.isEmpty(memberLink)) {
- return;
- }
-
- OwnerDto tmpOwnerMemberDto = new OwnerDto();
- tmpOwnerMemberDto.setNameLike(memberName);
- tmpOwnerMemberDto.setLink(memberLink);
- tmpOwnerMemberDto.setOwnerTypeCds(new String[]{OwnerDto.OWNER_TYPE_CD_MEMBER,
- OwnerDto.OWNER_TYPE_CD_OTHER,
- OwnerDto.OWNER_TYPE_CD_TEMP,
- OwnerDto.OWNER_TYPE_CD_RENTING
- });
- List<OwnerDto> ownerMembers = ownerInnerServiceSMOImpl.queryOwnerMembers(tmpOwnerMemberDto);
-
- if (ListUtil.isNull(ownerMembers)) {
- ownerDto.setOwnerId("-1"); // 鍐欏叆-1 鏌ヨ涓嶅埌鏁版嵁
- return;
- }
-
- List<String> ownerIds = new ArrayList<>();
- for (OwnerDto tmpOwnerMember : ownerMembers) {
- ownerIds.add(tmpOwnerMember.getOwnerId());
- }
-
- ownerDto.setOwnerIds(ownerIds.toArray(new String[ownerIds.size()]));
}
private void freshRoomId(JSONObject reqJson) {
@@ -246,53 +184,7 @@
reqJson.put("roomId", roomDtos.get(0).getRoomId());
}
- /**
- * 鏍规嵁鏉′欢鏌ヨ
- *
- * @param reqJson 鏌ヨ淇℃伅
- * @param cmdDataFlowContext 涓婁笅鏂�
- */
- private void queryByCondition(JSONObject reqJson, ICmdDataFlowContext cmdDataFlowContext) {
- //鑾峰彇褰撳墠鐢ㄦ埛id
- String ownerTypeCd = reqJson.getString("ownerTypeCd");
- OwnerDto tmpOwnerDto = BeanConvertUtil.covertBean(reqJson, OwnerDto.class);
- if (!StringUtil.isEmpty(ownerTypeCd) && ownerTypeCd.contains(",")) {
- tmpOwnerDto.setOwnerTypeCd("");
- tmpOwnerDto.setOwnerTypeCds(ownerTypeCd.split(","));
- }
- String userId = reqJson.getString("userId");
- int row = reqJson.getInteger("row");
- ApiOwnerVo apiOwnerVo = new ApiOwnerVo();
- int total = ownerInnerServiceSMOImpl.queryOwnerCountByCondition(tmpOwnerDto);
- apiOwnerVo.setTotal(total);
- List<OwnerDto> ownerDtos = new ArrayList<>();
- if (total > 0) {
- List<OwnerDto> ownerDtoList = ownerInnerServiceSMOImpl.queryOwnersByCondition(tmpOwnerDto);
- // 鏌ヨ缁熻鏁版嵁
- ownerDtoList = queryOwnerStatisticsBMOImpl.query(ownerDtoList);
- List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", userId);
- for (OwnerDto ownerDto : ownerDtoList) {
- //瀵逛笟涓昏韩浠借瘉鍙烽殣钘忓鐞�
- String idCard = ownerDto.getIdCard();
- if (mark.size() == 0 && !StringUtil.isEmpty(idCard) && idCard.length() > 16) {
- idCard = idCard.substring(0, 6) + "**********" + idCard.substring(16);
- ownerDto.setIdCard(idCard);
- }
- //瀵逛笟涓绘墜鏈哄彿闅愯棌澶勭悊
- String link = ownerDto.getLink();
- if (mark.size() == 0 && !StringUtil.isEmpty(link) && link.length() == 11) {
- link = link.substring(0, 3) + "****" + link.substring(7);
- ownerDto.setLink(link);
- }
- ownerDtos.add(ownerDto);
- }
- apiOwnerVo.setOwners(BeanConvertUtil.covertBeanList(ownerDtos, ApiOwnerDataVo.class));
- }
- apiOwnerVo.setRecords((int) Math.ceil((double) total / (double) row));
- ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiOwnerVo), HttpStatus.OK);
- cmdDataFlowContext.setResponseEntity(responseEntity);
- }
/**
* 鑴辨晱澶勭悊
--
Gitblit v1.8.0