From 33f61efc7eab6c6d28a3eae15909c6860e8a3d40 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 22 三月 2024 12:00:10 +0800
Subject: [PATCH] 优化业主端逻辑
---
service-user/src/main/java/com/java110/user/cmd/owner/ListAuditAppUserBindingOwnersCmd.java | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/ListAuditAppUserBindingOwnersCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/ListAuditAppUserBindingOwnersCmd.java
index fd01ea6..60c1d3d 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/ListAuditAppUserBindingOwnersCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/ListAuditAppUserBindingOwnersCmd.java
@@ -12,6 +12,8 @@
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
import com.java110.vo.api.auditAppUserBindingOwner.ApiAuditAppUserBindingOwnerDataVo;
import com.java110.vo.api.auditAppUserBindingOwner.ApiAuditAppUserBindingOwnerVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -45,13 +47,13 @@
OwnerAppUserDto ownerAppUserDto = BeanConvertUtil.covertBean(reqJson, OwnerAppUserDto.class);
ownerAppUserDto.setUserId("");
int count = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsersCount(ownerAppUserDto);
+ int row = reqJson.getIntValue("row");
- List<ApiAuditAppUserBindingOwnerDataVo> auditAppUserBindingOwners = null;
- List<ApiAuditAppUserBindingOwnerDataVo> ownerDtos = new ArrayList<>();
+ List<OwnerAppUserDto> ownerAppUserDtos = null;
if (count > 0) {
- auditAppUserBindingOwners = BeanConvertUtil.covertBeanList(ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto), ApiAuditAppUserBindingOwnerDataVo.class);
+ ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", userId);
- for (ApiAuditAppUserBindingOwnerDataVo owner : auditAppUserBindingOwners) {
+ for (OwnerAppUserDto owner : ownerAppUserDtos) {
//鍖哄垎灏忕▼搴忓拰鍜屽叕浼楀彿
if (owner.getAppType().equals("WECHAT")) {
owner.setAppTypeName("鍏紬鍙�");
@@ -60,31 +62,22 @@
}
//瀵逛笟涓昏韩浠借瘉鍙烽殣钘忓鐞�
String idCard = owner.getIdCard();
- if (mark.size() == 0 && idCard != null && !idCard.equals("") && idCard.length() > 16) {
+ if (mark.size() == 0 && !StringUtil.isEmpty(idCard) && idCard.length() > 16) {
idCard = idCard.substring(0, 6) + "**********" + idCard.substring(16);
owner.setIdCard(idCard);
}
//瀵逛笟涓绘墜鏈哄彿闅愯棌澶勭悊
String link = owner.getLink();
- if (mark.size() == 0 && link != null && !link.equals("") && link.length() == 11) {
+ if (mark.size() == 0 &&!StringUtil.isEmpty(link) && link.length() == 11) {
link = link.substring(0, 3) + "****" + link.substring(7);
owner.setLink(link);
}
- ownerDtos.add(owner);
}
} else {
- auditAppUserBindingOwners = new ArrayList<>();
- ownerDtos.addAll(auditAppUserBindingOwners);
+ ownerAppUserDtos = new ArrayList<>();
}
- ApiAuditAppUserBindingOwnerVo apiAuditAppUserBindingOwnerVo = new ApiAuditAppUserBindingOwnerVo();
-
- apiAuditAppUserBindingOwnerVo.setTotal(count);
- apiAuditAppUserBindingOwnerVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("row")));
- apiAuditAppUserBindingOwnerVo.setAuditAppUserBindingOwners(ownerDtos);
-
- ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiAuditAppUserBindingOwnerVo), HttpStatus.OK);
-
+ ResponseEntity<String> responseEntity = ResultVo.createResponseEntity((int) Math.ceil((double) count / (double) row), count, ownerAppUserDtos);
cmdDataFlowContext.setResponseEntity(responseEntity);
}
--
Gitblit v1.8.0