luminghui
/
sdny-jxpt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ariesy 解决测试环境菜单加载慢的问题 v1

Browse Source
release
yefei 2 years ago
parent 64c474c993
commit 9c3e91da57
2 changed files with 46 additions and 13 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 57
      dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SsoLoginServiceImpl.java
  2. 2
      dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpbrzServiceImpl.java

57
dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SsoLoginServiceImpl.java
Unescape View File

@ -264,29 +264,60 @@ public class SsoLoginServiceImpl implements SsoLoginService {
return roleIds; return roleIds;
} }
// public List<SysUserOrgEntity> toUserOrg(SsoUser user) {
// SysUserOrgEntity userOrg;
// List<SysUserOrgEntity> listUserOrg = new ArrayList<>();
// List<Long> dataPerm = user.getDataPerm();
// List<com.xxl.sso.core.entity.SysDeptEntity> taxplayercodeDeptList = user.getTaxplayercodeDeptList();
// if (dataPerm != null && dataPerm.size() > 0) {
// for (Long deptId : dataPerm) {
// if (dataPerm.size() > 0) {
// for (com.xxl.sso.core.entity.SysDeptEntity sysDeptEntity : taxplayercodeDeptList) {
// log.debug("deptId : " + deptId + " sysDetp: " + sysDeptEntity.getDeptId());
// if (deptId.longValue() == sysDeptEntity.getDeptId().longValue()) {
// userOrg = new SysUserOrgEntity();
// userOrg.setCompany(AdminConfig.company);
// userOrg.setDeptId(sysDeptEntity.getDeptId());
// userOrg.setTaxname(sysDeptEntity.getName());
// userOrg.setTaxno(sysDeptEntity.getTaxpayerCode());
// listUserOrg.add(userOrg);
// }
// }
// }
// }
// }
// log.debug("listUserOrg : " + listUserOrg.size() + " listUserOrgJson: " + JSON.toJSONString(listUserOrg));
// return listUserOrg;
// }
public List<SysUserOrgEntity> toUserOrg(SsoUser user) { public List<SysUserOrgEntity> toUserOrg(SsoUser user) {
SysUserOrgEntity userOrg; SysUserOrgEntity userOrg;
Map<Long, com.xxl.sso.core.entity.SysDeptEntity> detpCollect = null;
List<SysUserOrgEntity> listUserOrg = new ArrayList<>(); List<SysUserOrgEntity> listUserOrg = new ArrayList<>();
List<Long> dataPerm = user.getDataPerm(); List<Long> dataPerm = user.getDataPerm();
List<com.xxl.sso.core.entity.SysDeptEntity> taxplayercodeDeptList = user.getTaxplayercodeDeptList(); List<com.xxl.sso.core.entity.SysDeptEntity> taxplayercodeDeptList = user.getTaxplayercodeDeptList();
if(taxplayercodeDeptList != null && taxplayercodeDeptList.size() > 0){
detpCollect = taxplayercodeDeptList.stream().collect(Collectors.toMap(com.xxl.sso.core.entity.SysDeptEntity::getDeptId, tri -> tri));
}
if(detpCollect == null){
return listUserOrg;
}
if (dataPerm != null && dataPerm.size() > 0) { if (dataPerm != null && dataPerm.size() > 0) {
for (Long deptId : dataPerm) { for (Long deptId : dataPerm) {
if (dataPerm.size() > 0) { com.xxl.sso.core.entity.SysDeptEntity deptEntity = detpCollect.get(deptId);
for (com.xxl.sso.core.entity.SysDeptEntity sysDeptEntity : taxplayercodeDeptList) { if(deptEntity != null){
log.debug("deptId : " + deptId + " sysDetp: " + sysDeptEntity.getDeptId()); userOrg = new SysUserOrgEntity();
if (deptId.longValue() == sysDeptEntity.getDeptId().longValue()) { userOrg.setCompany(AdminConfig.company);
userOrg = new SysUserOrgEntity(); userOrg.setDeptId(deptEntity.getDeptId());
userOrg.setCompany(AdminConfig.company); userOrg.setTaxname(deptEntity.getName());
userOrg.setDeptId(sysDeptEntity.getDeptId()); userOrg.setTaxno(deptEntity.getTaxpayerCode());
userOrg.setTaxname(sysDeptEntity.getName()); listUserOrg.add(userOrg);
userOrg.setTaxno(sysDeptEntity.getTaxpayerCode());
listUserOrg.add(userOrg);
}
}
} }
} }
} }
log.debug("listUserOrg : " + listUserOrg.size() + " listUserOrgJson: " + JSON.toJSONString(listUserOrg)); log.info("listUserOrg : " + listUserOrg.size() + " listUserOrgJson: " + JSON.toJSONString(listUserOrg));
return listUserOrg; return listUserOrg;
} }

2
dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpbrzServiceImpl.java
Unescape View File

@ -57,6 +57,7 @@ public class BaseFpbrzServiceImpl extends MpBaseServiceImpl<BaseFpbrzDao, BaseTD
private TabulateRedisService tabulateRedisService; private TabulateRedisService tabulateRedisService;
@Resource @Resource
private DictdetaServcice dictdetaServcice; private DictdetaServcice dictdetaServcice;
BaseFpbrzDao baseFpbrzDao;
@Override @Override
public String selectByFpbrz(Map<String, Object> pramsMap, int curr, int size) { public String selectByFpbrz(Map<String, Object> pramsMap, int curr, int size) {
@ -65,6 +66,7 @@ public class BaseFpbrzServiceImpl extends MpBaseServiceImpl<BaseFpbrzDao, BaseTD
String menuId = (String)pramsMap.get("menuId"); String menuId = (String)pramsMap.get("menuId");
JSONObject json = tabulateRedisService.getTabulateMenu(company, menuId); JSONObject json = tabulateRedisService.getTabulateMenu(company, menuId);
DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ);
List<String> taxnoList = (List<String>)pramsMap.get("gfsh"); List<String> taxnoList = (List<String>)pramsMap.get("gfsh");

Write Preview
Loading…
Cancel
Save