From 4d5eff3b824dac8e50400b2ec1114cba4ed6a87c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 07 Apr 2021 17:05:43 +0800
Subject: [PATCH] screen-manage 完成sysarea模块查询 拦截器逻辑代码完成 修改organization和accountBug
---
screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java
index 16462d3..7df374e 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java
@@ -1,11 +1,17 @@
package com.moral.api.pojo.vo.account;
import com.fasterxml.jackson.annotation.JsonInclude;
+import com.moral.api.entity.ManageAccount;
+import com.moral.api.entity.ManageRole;
import com.moral.api.pojo.dto.account.AccountDTO;
import com.moral.api.pojo.dto.account.AccountQueryDTO;
+import com.moral.constant.ResponseCodeEnum;
import lombok.Data;
+import org.springframework.util.ObjectUtils;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -29,16 +35,21 @@
private List<AccountVO> accountVOs;
- public static AccountQueryVO convert(AccountQueryDTO dto){
+ public static AccountQueryVO convert(AccountQueryDTO dto) {
+ if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode())
+ return null;
+
long total = dto.getTotal();
long current = dto.getCurrent();
long pages = dto.getPages();
long size = dto.getSize();
List<AccountVO> accountVOs = new ArrayList<>();
List<AccountDTO> accountDTOs = dto.getAccountDTOS();
- for (AccountDTO accountDTO : accountDTOs) {
- AccountVO vo = AccountVO.convert(accountDTO);
- accountVOs.add(vo);
+ if (!ObjectUtils.isEmpty(accountDTOs)) {
+ for (AccountDTO accountDTO : accountDTOs) {
+ AccountVO vo = convertToQueryPage(accountDTO);
+ accountVOs.add(vo);
+ }
}
AccountQueryVO vo = new AccountQueryVO();
vo.setTotal(total);
@@ -48,4 +59,28 @@
vo.setSize(size);
return vo;
}
+
+ public static AccountVO convertToQueryPage(AccountDTO dto) {
+ if (dto.getAccount() == null)
+ return null;
+ AccountInsertVO vo = new AccountInsertVO();
+ ManageAccount account = dto.getAccount();
+ List<ManageRole> roles = dto.getRoles();
+ List<String> roleNames = new ArrayList<>();
+ if (!ObjectUtils.isEmpty(roles)) {
+ roles.forEach(role -> roleNames.add(role.getName()));
+ }
+ vo.setId(account.getId());
+ vo.setUserName(account.getUserName());
+ vo.setEmail(account.getEmail());
+ vo.setMobile(account.getMobile());
+ vo.setWechat(account.getWechat());
+ vo.setRoleNames(roleNames);
+ //Date������String
+ Date createTime = account.getCreateTime();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String createTimeStr = sdf.format(createTime);
+ vo.setCreateTime(createTimeStr);
+ return vo;
+ }
}
--
Gitblit v1.8.0