From 31e3fe68c339b32b2d2b3300af856508175f8583 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 19 八月 2023 15:57:10 +0800
Subject: [PATCH] 优化代码
---
service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java | 99 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 74 insertions(+), 25 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 43fec57..accc67b 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
@@ -40,8 +40,8 @@
)
@Java110ParamsDoc(params = {
- @Java110ParamDoc(name = "page", type = "int",length = 11, remark = "椤垫暟"),
- @Java110ParamDoc(name = "row", type = "int",length = 11, remark = "琛屾暟"),
+ @Java110ParamDoc(name = "page", type = "int", length = 11, remark = "椤垫暟"),
+ @Java110ParamDoc(name = "row", type = "int", length = 11, remark = "琛屾暟"),
@Java110ParamDoc(name = "communityId", length = 30, remark = "灏忓尯ID"),
@Java110ParamDoc(name = "name", length = 64, remark = "涓氫富鍚嶇О"),
@Java110ParamDoc(name = "link", length = 11, remark = "涓氫富鎵嬫満鍙�"),
@@ -56,22 +56,22 @@
@Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "杩斿洖缂栧彿锛�0 鎴愬姛 鍏朵粬澶辫触"),
@Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "鎴愬姛", remark = "鎻忚堪"),
@Java110ParamDoc(name = "owners", type = "Array", length = -1, defaultValue = "鎴愬姛", remark = "鏁版嵁"),
- @Java110ParamDoc(parentNodeName = "owners",name = "communityId", length = 30, remark = "灏忓尯ID"),
- @Java110ParamDoc(parentNodeName = "owners",name = "name", length = 64, remark = "涓氫富鍚嶇О"),
- @Java110ParamDoc(parentNodeName = "owners",name = "link", length = 11, remark = "涓氫富鎵嬫満鍙�"),
- @Java110ParamDoc(parentNodeName = "owners",name = "idCard", length = 30, remark = "涓氫富韬唤璇佸彿"),
- @Java110ParamDoc(parentNodeName = "owners",name = "address", length = 512, remark = "鍦板潃"),
- @Java110ParamDoc(parentNodeName = "owners",name = "sex", length = 12, remark = "鎬у埆 鐢� 1 濂� 0"),
- @Java110ParamDoc(parentNodeName = "owners",name = "ownerTypeCd", length = 12, remark = "涓氫富绫诲瀷 1001 涓氫富 2002 瀹跺涵鎴愬憳 瀹跺涵鎴愬憳 闇�瑕佷紶涓氫富鐨刼wnerId"),
- @Java110ParamDoc(parentNodeName = "owners",name = "remark", length = 512, remark = "澶囨敞"),
- @Java110ParamDoc(parentNodeName = "owners",name = "memberId", length = 30, remark = "涓氫富ID"),
- @Java110ParamDoc(parentNodeName = "owners",name = "ownerPhoto", length = -1, remark = "涓氫富浜鸿劯 鐢ㄤ簬鍚屾闂ㄧ 浜鸿劯寮�闂�"),
+ @Java110ParamDoc(parentNodeName = "owners", name = "communityId", length = 30, remark = "灏忓尯ID"),
+ @Java110ParamDoc(parentNodeName = "owners", name = "name", length = 64, remark = "涓氫富鍚嶇О"),
+ @Java110ParamDoc(parentNodeName = "owners", name = "link", length = 11, remark = "涓氫富鎵嬫満鍙�"),
+ @Java110ParamDoc(parentNodeName = "owners", name = "idCard", length = 30, remark = "涓氫富韬唤璇佸彿"),
+ @Java110ParamDoc(parentNodeName = "owners", name = "address", length = 512, remark = "鍦板潃"),
+ @Java110ParamDoc(parentNodeName = "owners", name = "sex", length = 12, remark = "鎬у埆 鐢� 1 濂� 0"),
+ @Java110ParamDoc(parentNodeName = "owners", name = "ownerTypeCd", length = 12, remark = "涓氫富绫诲瀷 1001 涓氫富 2002 瀹跺涵鎴愬憳 瀹跺涵鎴愬憳 闇�瑕佷紶涓氫富鐨刼wnerId"),
+ @Java110ParamDoc(parentNodeName = "owners", name = "remark", length = 512, remark = "澶囨敞"),
+ @Java110ParamDoc(parentNodeName = "owners", name = "memberId", length = 30, remark = "涓氫富ID"),
+ @Java110ParamDoc(parentNodeName = "owners", name = "ownerPhoto", length = -1, remark = "涓氫富浜鸿劯 鐢ㄤ簬鍚屾闂ㄧ 浜鸿劯寮�闂�"),
}
)
@Java110ExampleDoc(
- reqBody="http://ip:port/app/owner.queryOwners?ownerTypeCd=1001&page=1&row=10&communityId=2022121921870161",
- resBody="{\n" +
+ reqBody = "http://ip:port/app/owner.queryOwners?ownerTypeCd=1001&page=1&row=10&communityId=2022121921870161",
+ resBody = "{\n" +
"\t\"owners\": [{\n" +
"\t\t\"address\": \"寮犱笁\",\n" +
"\t\t\"idCard\": \"\",\n" +
@@ -120,8 +120,15 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- //鏍规嵁鎴垮眿鏌ヨ鏃� 鍏堢敤 鎴垮眿淇℃伅鏌ヨ 涓氫富ID
+ //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;
@@ -129,18 +136,18 @@
int row = reqJson.getInteger("row");
ApiOwnerVo apiOwnerVo = new ApiOwnerVo();
//鏌ヨ鎬昏褰曟暟
- int total = ownerInnerServiceSMOImpl.queryOwnersCount(BeanConvertUtil.covertBean(reqJson, OwnerDto.class));
+ int total = ownerInnerServiceSMOImpl.queryOwnersCount(ownerDto);
apiOwnerVo.setTotal(total);
List<OwnerDto> ownerDtos = new ArrayList<>();
if (total > 0) {
- List<OwnerDto> ownerDtoList = ownerInnerServiceSMOImpl.queryOwners(BeanConvertUtil.covertBean(reqJson, OwnerDto.class));
+ List<OwnerDto> ownerDtoList = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
// 鏌ヨ缁熻鏁版嵁
ownerDtoList = queryOwnerStatisticsBMOImpl.query(ownerDtoList);
List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", reqJson.getString("userId"));
- for (OwnerDto ownerDto : ownerDtoList) {
+ for (OwnerDto tmpOwnerDto : ownerDtoList) {
//鏌ヨ鐓х墖
FileRelDto fileRelDto = new FileRelDto();
- fileRelDto.setObjId(ownerDto.getMemberId());
+ fileRelDto.setObjId(tmpOwnerDto.getMemberId());
fileRelDto.setRelTypeCd("10000"); //涓氫富鐓х墖
List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
if (fileRelDtos != null && fileRelDtos.size() > 0) {
@@ -148,21 +155,21 @@
for (FileRelDto fileRel : fileRelDtos) {
urls.add(fileRel.getFileRealName());
}
- ownerDto.setUrls(urls);
+ tmpOwnerDto.setUrls(urls);
}
//瀵逛笟涓昏韩浠借瘉鍙烽殣钘忓鐞�
- String idCard = ownerDto.getIdCard();
+ String idCard = tmpOwnerDto.getIdCard();
if (mark.size() == 0 && idCard != null && !idCard.equals("") && idCard.length() > 16) {
idCard = idCard.substring(0, 6) + "**********" + idCard.substring(16);
- ownerDto.setIdCard(idCard);
+ tmpOwnerDto.setIdCard(idCard);
}
//瀵逛笟涓绘墜鏈哄彿闅愯棌澶勭悊
- String link = ownerDto.getLink();
+ String link = tmpOwnerDto.getLink();
if (mark.size() == 0 && link != null && !link.equals("") && link.length() == 11) {
link = link.substring(0, 3) + "****" + link.substring(7);
- ownerDto.setLink(link);
+ tmpOwnerDto.setLink(link);
}
- ownerDtos.add(ownerDto);
+ ownerDtos.add(tmpOwnerDto);
}
apiOwnerVo.setOwners(BeanConvertUtil.covertBeanList(ownerDtos, ApiOwnerDataVo.class));
}
@@ -171,6 +178,48 @@
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(reqJson.getString("memberName"));
+ tmpOwnerMemberDto.setLink(reqJson.getString("link"));
+ 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 (ownerMembers == null || ownerMembers.size() < 1) {
+ 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) {
if (!reqJson.containsKey("roomName")) {
return;
--
Gitblit v1.8.0