From 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Dec 2020 14:08:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/AccountServiceImpl.java | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 102 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
index 69752c4..435d4eb 100644
--- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -11,7 +11,13 @@
import java.util.Set;
import javax.annotation.Resource;
+import javax.management.monitor.Monitor;
+import com.moral.entity.*;
+import com.moral.mapper.DictionaryDataMapper;
+
+import com.moral.mapper.MonitorPointMapper;
+import com.moral.service.MonitorPointService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
@@ -25,10 +31,6 @@
import com.moral.common.exception.BusinessException;
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.OrganizationMapper;
import com.moral.service.AccountService;
@@ -57,7 +59,11 @@
@Resource
private OrganizationMapper organizationMapper;
+ @Resource
+ private MonitorPointService monitorPointService;
+ @Resource
+ private MonitorPointMapper monitorPointMapper;
@Override
public Map<String, Object> getAccountInfoById(String accountId) {
@@ -70,17 +76,37 @@
result.put("accountId", -1);
} else {
result = judgeAccountInfo(account);
+ String regionCode = getRegionCodeByAccount(account);
if (!String.valueOf(result.get("accountId")).equals("-1")) {
+ List<MonitorPoint> monitorPoints = new ArrayList<>();
+ if (account.getOrganizationId().equals(dictionaryDataMapper.selectSupperOrgId())) {
+ Map<String, Object> paramMap = new HashMap<>();
+ paramMap.put("regionCode", regionCode);
+ paramMap.put("organizationId", account.getOrganizationId());
+ monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(paramMap);
+ } else {
+ Set<Integer> orgIds = organizationService.getChildOrganizationIds(account.getOrganizationId());
+ orgIds.add(account.getOrganizationId());
+ monitorPoints = monitorPointService.getMonitorPointsByOrganizationIds(orgIds);
+ }
+ List<Integer> monitorPointIds = new ArrayList<>();
+ monitorPoints.forEach(value -> {
+ monitorPointIds.add(value.getId());
+ });
+
List<Menu> menuList = accountMapper.getScreenMenuListsByAccountName(account.getAccountName());
result.put("msg", "���������������");
result.put("accountId", account.getId());
result.put("orgId", account.getOrganizationId());
result.put("data", menuList);
+ result.put("regionCode", regionCode);
+ result.put("monitorPointIds", monitorPointIds);
setOrgIdsByAccount(result);
}
}
return result;
}
+
@Override
public Map<String, Object> webLogin(Map<String, Object> parameters) {
@@ -382,5 +408,77 @@
return result;
}
+ @Resource
+ DictionaryDataMapper dictionaryDataMapper;
+ @Override
+ public Map<String, Object> bsWebLogin(Map<String, Object> parameters) {
+ Map<String, Object> result = new HashMap<String, Object>();
+ Account account = new Account();
+ account.setAccountName((String) parameters.get("account"));
+ String rawPassword = (String) parameters.get("password");
+ account = accountMapper.selectOne(account);
+ boolean isValid = account == null ? false : encoder.matches(rawPassword, account.getPassword());
+ if (!isValid) {
+ result.put("msg", "���������������������������������");
+ result.put("accountId", -1);
+ } else {
+ result = judgeAccountInfo(account);
+
+ }
+ return result;
+ }
+
+ /**
+ * @Description: ������id������������������������������
+ * @Param: [params]
+ * @return: java.util.Map<java.lang.String , java.lang.Object>
+ * @Author: ������������
+ * @Date: 2020/11/25
+ */
+ private String getRegionCodeByAccount(Account account) {
+ Organization organization = new Organization();
+ organization.setId(account.getOrganizationId());
+ organization = organizationMapper.selectOne(organization);
+ Map<String, Object> regionCodeAndType = getRegionCodeAndTypeByOrg(organization);
+ if (ObjectUtils.isEmpty(regionCodeAndType))
+ return null;
+ return (String) regionCodeAndType.get("regionCode");
+ }
+
+ public Map<String, Object> getRegionCodeAndTypeByOrg(Organization organization) {
+ Map<String, Object> result = new HashMap<>();
+ String regionCode = "";
+ String regionType = "";
+ Long villageCode = organization.getVillageCode();
+ Long townCode = organization.getTownCode();
+ Integer areaCode = organization.getAreaCode();
+ Integer cityCode = organization.getCityCode();
+ Integer provinceCode = organization.getProvinceCode();
+
+ if (!ObjectUtils.isEmpty(villageCode)) {
+ regionCode = String.valueOf(villageCode);
+ regionType = "village";
+ } else if (!ObjectUtils.isEmpty(townCode)) {
+ regionCode = String.valueOf(townCode);
+ regionType = "town";
+ } else if (!ObjectUtils.isEmpty(areaCode)) {
+ regionCode = String.valueOf(areaCode);
+ regionType = "area";
+ } else if (!ObjectUtils.isEmpty(cityCode)) {
+ regionCode = String.valueOf(cityCode);
+ regionType = "city";
+ } else if (!ObjectUtils.isEmpty(provinceCode)) {
+ regionCode = String.valueOf(provinceCode);
+ regionType = "province";
+ } else {
+ return null;
+ }
+ result.put("regionCode", regionCode);
+ result.put("regionType", regionType);
+ return result;
+ }
}
+
+
+
--
Gitblit v1.8.0