From fdc3b40f19e487604341c661eec471bf9ac45279 Mon Sep 17 00:00:00 2001
From: ZhuDongming <zdm773644075@hotmail.com>
Date: Tue, 12 Nov 2019 20:37:36 +0800
Subject: [PATCH] 修复map-page地图不显示问题
---
src/main/java/com/moral/service/impl/AccountServiceImpl.java | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 152 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
index 08c3f0c..8a842b9 100644
--- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -1,33 +1,42 @@
package com.moral.service.impl;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
import static com.moral.common.bean.Constants.IS_DELETE_FALSE;
import static com.moral.common.bean.Constants.IS_DELETE_TRUE;
-import static com.moral.common.util.Crypto.md5;
import static com.moral.common.util.ResourceUtil.getValue;
import static org.apache.commons.lang3.StringUtils.isNumeric;
import static org.springframework.util.ObjectUtils.isEmpty;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
import javax.annotation.Resource;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import com.github.pagehelper.PageHelper;
import com.moral.common.bean.Constants;
import com.moral.common.bean.PageBean;
import com.moral.common.exception.BusinessException;
-import com.moral.common.util.Crypto;
import com.moral.common.util.ResourceUtil;
+import com.moral.common.util.ValidateUtil;
import com.moral.entity.Account;
+import com.moral.entity.Menu;
import com.moral.entity.Organization;
+import com.moral.entity.Role;
import com.moral.mapper.AccountMapper;
+import com.moral.mapper.MenuMapper;
import com.moral.mapper.OrganizationMapper;
import com.moral.service.AccountService;
import com.moral.service.OrganizationService;
@@ -37,6 +46,8 @@
@Service
public class AccountServiceImpl implements AccountService {
+ @Resource
+ private BCryptPasswordEncoder encoder;
@Resource
private AccountMapper accountMapper;
@@ -46,21 +57,24 @@
@Resource
private OrganizationMapper organizationMapper;
-
+
@Override
public Map<String, Object> screenLogin(Map<String, Object> parameters) {
Map<String, Object> result = new HashMap<String, Object>();
Account account = new Account();
account.setAccountName((String) parameters.get("account"));
- account.setPassword(md5((String) parameters.get("password")));
+ String rawPassword = (String) parameters.get("password");
+// account.setPassword(encoder.encode((String) parameters.get("password")));
account = accountMapper.selectOne(account);
- if (isEmpty(account)) {
+ boolean isValid = account == null ? false:encoder.matches(rawPassword,account.getPassword());
+ if (!isValid) {
result.put("msg", "���������������������������������");
} else {
if (IS_DELETE_FALSE.equals(account.getIsDelete())) {
result.put("msg", "���������������");
result.put("accountId", account.getId());
result.put("orgId", account.getOrganizationId());
+ setOrgIdsByAccount(result);
} else {
result.put("msg","���������������������������������������������");
}
@@ -74,12 +88,15 @@
account.setAccountName(accountName);
return accountMapper.selectOne(account);
}
-
+ @Override
+ public Account getAccountById(Integer id){
+ return accountMapper.selectByPrimaryKey(id);
+ }
@Override
public void setOrgIdsByAccount(Map<String, Object> parameters) {
- String accountId = (String) parameters.get("accountId");
+ String accountId = parameters.get("accountId").toString();
accountId = accountId.replaceFirst("-", "");
- if (!isNumeric((String) parameters.get("accountId"))) {
+ if (!isNumeric(accountId)) {
throw new BusinessException("accountId ������������������");
}
@@ -114,22 +131,40 @@
}
PageHelper.startPage(Integer.valueOf((String) parameters.get("pageIndex")), Integer.valueOf((String) parameters.get("pageSize")));
List<Account> accounts = accountMapper.selectByExample(example);
+ Set<Integer> organizationIds = new HashSet<Integer>();
for (Account account : accounts) {
if (!ObjectUtils.isEmpty(account.getOrganizationId())) {
- Organization organization = organizationMapper.selectByPrimaryKey(account.getOrganizationId());
- account.setOrganization(organization);
+ organizationIds.add(account.getOrganizationId());
}
}
+ if(!ObjectUtils.isEmpty(organizationIds)){
+ example = new Example(Organization.class);
+ example.or().andIn("id", organizationIds);
+ List<Organization> organizations = organizationMapper.selectByExample(example);
+ for (Account account : accounts) {
+ for (Organization organization : organizations) {
+ if (account.getOrganizationId() == organization.getId()) {
+ account.setOrganization(organization);
+ break;
+ }
+ }
+ }
+ }
+
return new PageBean<Account>(accounts);
}
@Override
@Transactional
public Integer saveOrUpdateAccount(Account account) {
+ // ������������
+ if(!StringUtils.isBlank(account.getPassword())){
+ account.setPassword(encoder.encode(account.getPassword()));
+ }
if (ObjectUtils.isEmpty(account.getId())) {
account.setIsDelete(Constants.IS_DELETE_FALSE);
account.setCreateTime(new Date());
- account.setPassword(Crypto.md5(ResourceUtil.getValue("password")));
+ account.setPassword(encoder.encode(ResourceUtil.getValue("password")));
return accountMapper.insertSelective(account);
} else {
return accountMapper.updateByPrimaryKeySelective(account);
@@ -153,4 +188,104 @@
return accountMapper.selectCount(account);
}
+ @Override
+ public Optional<Account> queryAccountByName(String accountName) {
+ Account account = accountMapper.getByAccountName(accountName);
+ return Optional.ofNullable(account);
+ }
+
+ @Override
+ public Account companyLogin(Map<String, Object> parameters) {
+ ValidateUtil.notNull(parameters.get("account"), "param.is.null");
+ ValidateUtil.notNull(parameters.get("password"), "param.is.null");
+ Account account = new Account();
+ account.setIsDelete(Constants.IS_DELETE_FALSE);
+ account.setAccountName(parameters.get("account").toString());
+ account = accountMapper.selectOne(account);
+ if (ObjectUtils.isEmpty(account)) {
+ throw new BusinessException("���������������������������������������");
+ }
+ if (!encoder.matches(parameters.get("password").toString(), account.getPassword())) {
+ throw new BusinessException("���������������������������������");
+ }
+ account.setPassword(parameters.get("password").toString());
+ return account;
+ }
+
+ @Override
+ public Map<String, Object> getOrganizationIdByAccountId(String id) {
+ Integer accountId = Integer.parseInt(id);
+ Map<String, Object> map = accountMapper.getOrganizationIdByAccountId(accountId);
+ return map;
+ }
+
+ @Override
+ public List<Account> getAccountList(String accountName) {
+ List<Account> accountList = accountMapper.getAccountList(accountName);
+ return accountList;
+ }
+
+ @Override
+ public List<Role> getRolesByAccountName(String accountName) {
+ List<Role> roleList = accountMapper.getRolesByAccountName(accountName);
+ return roleList;
+ }
+
+ @Override
+ public Map<String, Object> getMenuListsByAccountName(String accountName) {
+ List<Menu> menuList=accountMapper.getParentMenuListsByAccountName(accountName);
+ String email=accountMapper.getEmailByAccountName(accountName);
+ Map<String,Object> mapList=new LinkedHashMap<>();
+ Map<String,Object> appMap=new LinkedHashMap<>();
+ appMap.put("name","������������������������");
+ appMap.put("description","������������������������������������������");
+ mapList.put("app",appMap);
+ Map<String,Object> userMap=new LinkedHashMap<>();
+ userMap.put("name",accountName);
+ userMap.put("avatar","./assets/img/zorro.svg");
+ userMap.put("email",email);
+ mapList.put("user",userMap);
+ Map<String,Object> navigationMap=new LinkedHashMap<>();
+ Map<String,Object> navigationChildMap=new LinkedHashMap<>();
+ navigationChildMap.put("text","���������");
+ navigationChildMap.put("link", "/dashboard/workplace");
+ navigationChildMap.put("icon","icon-speedometer");
+ navigationChildMap.put("translate","dashboard_workplace");
+ List<Map> navigationChildList=new ArrayList<>();
+ navigationChildList.add(navigationChildMap);
+ navigationMap.put("text","���������");
+ navigationMap.put("translate","main_navigation");
+ navigationMap.put("group",true);
+ navigationMap.put("children",navigationChildList);
+ Map<String,Object> systemMap=new LinkedHashMap<>();
+ systemMap.put("text","������������");
+ systemMap.put("group",true);
+ List<Map> systemList=new ArrayList<>();
+ if(!CollectionUtils.isEmpty(menuList)){
+ for(Menu m:menuList){
+ Map<String,Object> systemChildMap=new LinkedHashMap<>();
+ systemChildMap.put("text",m.getMenuName());
+ systemChildMap.put("icon",m.getMenuIcon());
+ List<Menu> childMenuLists=accountMapper.getChildMenuIdsByAccountName(accountName,m.getId());
+ List<Map> systemSonList=new ArrayList<>();
+ if(!CollectionUtils.isEmpty(childMenuLists)){
+ for(Menu childMenu:childMenuLists){
+ Map<String,Object> systemSonMap=new LinkedHashMap<>();
+ systemSonMap.put("text",childMenu.getMenuName());
+ systemSonMap.put("link",childMenu.getMenuUrl());
+ systemSonList.add(systemSonMap);
+ }
+ }
+ systemChildMap.put("children",systemSonList);
+ systemList.add(systemChildMap);
+ }
+ }
+ systemMap.put("children",systemList);
+ List<Map> list=new ArrayList<>();
+ list.add(navigationMap);
+ list.add(systemMap);
+ mapList.put("menu",list);
+ return mapList;
+ }
+
}
--
Gitblit v1.8.0