From 3d76bad0a7562441d75768f7e4e677f686037582 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 01 Dec 2020 13:16:09 +0800
Subject: [PATCH] 实施页面hour-aqi更新
---
src/main/java/com/moral/service/impl/AccountServiceImpl.java | 33 ++++++++++++++++-----------------
1 files changed, 16 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 39f4669..7bbcbe8 100644
--- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -14,6 +14,7 @@
import com.moral.entity.*;
import com.moral.mapper.DictionaryDataMapper;
+
import org.apache.commons.lang3.StringUtils;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
@@ -73,6 +74,9 @@
result.put("accountId", account.getId());
result.put("orgId", account.getOrganizationId());
result.put("data", menuList);
+ String regionCode = getRegionCodeByAccount(account);
+ if (!ObjectUtils.isEmpty(regionCode))
+ result.put("regionCode", regionCode);
setOrgIdsByAccount(result);
}
}
@@ -396,11 +400,6 @@
result.put("accountId", -1);
} else {
result = judgeAccountInfo(account);
- if (!result.get("accountId").equals(-1)){
- String regionCode = getRegionCodeByAccount(account);
- if(!ObjectUtils.isEmpty(regionCode))
- result.put("regionCode",regionCode);
- }
}
return result;
@@ -409,7 +408,7 @@
/**
* @Description: ������id������������������������������
* @Param: [params]
- * @return: java.util.Map<java.lang.String , java.lang.Object>
+ * @return: java.util.Map<java.lang.String , java.lang.Object>
* @Author: ������������
* @Date: 2020/11/25
*/
@@ -418,13 +417,13 @@
organization.setId(account.getOrganizationId());
organization = organizationMapper.selectOne(organization);
Map<String, Object> regionCodeAndType = getRegionCodeAndTypeByOrg(organization);
- if(ObjectUtils.isEmpty(regionCodeAndType))
+ if (ObjectUtils.isEmpty(regionCodeAndType))
return null;
return (String) regionCodeAndType.get("regionCode");
}
- public static Map<String,Object> getRegionCodeAndTypeByOrg(Organization organization){
- Map<String,Object> result = new HashMap<>();
+ public Map<String, Object> getRegionCodeAndTypeByOrg(Organization organization) {
+ Map<String, Object> result = new HashMap<>();
String regionCode = "";
String regionType = "";
Long villageCode = organization.getVillageCode();
@@ -433,26 +432,26 @@
Integer cityCode = organization.getCityCode();
Integer provinceCode = organization.getProvinceCode();
- if(!ObjectUtils.isEmpty(villageCode)){
+ if (!ObjectUtils.isEmpty(villageCode)) {
regionCode = String.valueOf(villageCode);
regionType = "village";
- }else if(!ObjectUtils.isEmpty(townCode)){
+ } else if (!ObjectUtils.isEmpty(townCode)) {
regionCode = String.valueOf(townCode);
regionType = "town";
- }else if(!ObjectUtils.isEmpty(areaCode)){
+ } else if (!ObjectUtils.isEmpty(areaCode)) {
regionCode = String.valueOf(areaCode);
regionType = "area";
- }else if(!ObjectUtils.isEmpty(cityCode)){
+ } else if (!ObjectUtils.isEmpty(cityCode)) {
regionCode = String.valueOf(cityCode);
regionType = "city";
- }else if(!ObjectUtils.isEmpty(provinceCode)){
+ } else if (!ObjectUtils.isEmpty(provinceCode)) {
regionCode = String.valueOf(provinceCode);
regionType = "province";
- }else{
+ } else {
return null;
}
- result.put("regionCode",regionCode);
- result.put("regionType",regionType);
+ result.put("regionCode", regionCode);
+ result.put("regionType", regionType);
return result;
}
}
--
Gitblit v1.8.0