Commit 7b74fc33 authored by fangxinjiang's avatar fangxinjiang

权限配置页面

parent 29ff02f9
......@@ -142,13 +142,13 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
if (Common.isNotNull(list)) {
R<AreaVo> areaListR;
TSettleDomain tSettleDomainInfo;
AreaVo areaList;
areaListR = upmsDaprUtils.getAreaListR();
if (null == areaListR || areaListR.getCode() != CommonConstants.SUCCESS) {
return R.failed("获取区域数据失败!");
}
AreaVo areaList = areaListR.getData();
for (TSettleDomain tSettleDomain:list) {
areaListR = upmsDaprUtils.getAreaListR();
if (null == areaListR || areaListR.getCode() != CommonConstants.SUCCESS) {
return R.failed("获取区域数据失败!");
}
areaList = areaListR.getData();
if (null != areaList && !areaList.getSysAreaList().isEmpty()) {
for (SysArea area : areaList.getSysAreaList()) {
if (Common.isNotNull(tSettleDomain.getEProvince()) && area.getAreaName().equals(tSettleDomain.getEProvince())) {
......
......@@ -113,6 +113,16 @@ public interface CacheConstants {
* 区域数据--值
*/
String AREA_VALUE = "area_value:";
/**
* 区域数据--标签
*/
String AREA_LABEL_GROUP = "area_label";
/**
* 区域数据--值
*/
String AREA_VALUE_GROUP = "area_value";
/**
* 用户登录的项目vo缓存
*/
......
package com.yifu.cloud.plus.v1.yifu.admin.api.vo;
import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysArea;
import lombok.Data;
import java.util.HashMap;
import java.util.Map;
/**
* @Author fxj
* @Date 2022/11/22
* @Description
* @Version 1.0
*/
@Data
public class AreaMap {
private Map<String, SysArea> idLabelMap;
private Map<String, SysArea> labelIdMap;
}
......@@ -21,12 +21,15 @@ import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysArea;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaMap;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaVo;
import com.yifu.cloud.plus.v1.yifu.admin.service.SysAreaService;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.util.RedisUtil;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
......@@ -104,24 +107,53 @@ public class AreaController {
vo.setSysAreaList(aList);
return vo;
}
@Autowired
private RedisUtil redisUtil;
/**
* @param
* @Description: 获取所有区域list
* @Author: hyc
* @Date: 2022-7-21 19:45:24
**/
@Inner
@PostMapping("/inner/getAreaMap")
//@Inner
@PostMapping("/getAreaMap")
public AreaMap getAreaMap() {
List<SysArea> aList = sysAreaService.list(Wrappers.<SysArea>query().lambda()
.eq(SysArea::getStatus, CommonConstants.ZERO_INT).orderByAsc(SysArea::getParentId));
AreaMap map = new AreaMap();
Map<String,String> m = null;
if (Common.isNotNull(aList)){
aList.stream().collect(Collectors.toMap(SysArea::get));
Map<String, SysArea> idLabelMap = (Map<String, SysArea>) redisUtil.get(CacheConstants.AREA_LABEL_GROUP);
Map<String, SysArea> labelIdMap = (Map<String, SysArea>) redisUtil.get(CacheConstants.AREA_VALUE_GROUP);
if (Common.isEmpty(idLabelMap) || Common.isEmpty(labelIdMap)){
initAreaRedis();
}
map.setAreaMap(m);
AreaMap map = new AreaMap();
idLabelMap = (Map<String, SysArea>) redisUtil.get(CacheConstants.AREA_LABEL_GROUP);
labelIdMap = (Map<String, SysArea>) redisUtil.get(CacheConstants.AREA_VALUE_GROUP);
map.setIdLabelMap(idLabelMap);
map.setLabelIdMap(labelIdMap);
return map;
}
private void initAreaRedis() {
List<SysArea> allAreas = sysAreaService.getAllArea();
if (Common.isNotNull(allAreas)) {
Map<String, SysArea> areaMap = new HashMap<>();
for (SysArea area : allAreas) {
redisUtil.set(CacheConstants.AREA_LABEL
+ area.getId(), area.getAreaName());
areaMap.put(area.getId().toString(), area);
}
SysArea temp;
for (SysArea area : allAreas) {
if (Common.isNotNull(area.getParentId()) && area.getParentId().intValue() > 0) {
temp = areaMap.get(area.getParentId().toString());
redisUtil.set(CacheConstants.AREA_VALUE
+ area.getAreaName()
+ CommonConstants.DOWN_LINE_STRING
+ (Common.isNotNull(temp) ? temp.getAreaName() : ""), area.getId());
} else {
redisUtil.set(CacheConstants.AREA_VALUE
+ area.getAreaName(), area.getId());
}
}
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment