zhulongchuan/cquav
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

获取登录信息工具类更换更新

Browse Source
This commit is contained in:
zhulongchuan 2025-09-16 11:18:52 +08:00
parent 596d1dd399
commit ecf79535ae
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
djhk-system/src/main/java/com/djhk/uav/equ/service/impl/EquInfoServiceImpl.java
View File

@ -13,6 +13,7 @@ import com.djhk.common.core.domain.entity.SysUser;
import com.djhk.common.core.domain.model.LoginUser;
import com.djhk.common.core.redis.RedisCache;
import com.djhk.common.exception.ServiceException;
import com.djhk.common.utils.DictUtils;
import com.djhk.common.utils.SecurityUtils;
import com.djhk.common.utils.StringUtils;
import com.djhk.common.utils.bean.BeanUtils;
@ -84,6 +85,9 @@ public class EquInfoServiceImpl implements EquInfoService {
@Autowired
private RemoteDeptService remoteDeptService;
@Autowired
private ISysDeptService deptService;
@Autowired
private RemoteDictDataService remoteDictDataService;
@ -94,7 +98,8 @@ public class EquInfoServiceImpl implements EquInfoService {
if (equInfoEntities != null) {
try {
// List<SysDictData> sysDictDataList = sysDictDataService.getDictDataByType("equ_model_info").getData();
List<SysDictData> sysDictDataList = remoteDictDataService.getDictDataByType("equ_model_info", "inner").getData();
// List<SysDictData> sysDictDataList = remoteDictDataService.getDictDataByType("equ_model_info", "inner").getData();
List<SysDictData> sysDictDataList = DictUtils.getDictDataByType("equ_model_info");
for (EquInfoEntity equInfoEntity : equInfoEntities) {
// modelId转
@ -188,9 +193,11 @@ public class EquInfoServiceImpl implements EquInfoService {
// Long deptId = loginUser.getSysUser().getDeptId();
Long deptId = SecurityUtils.getDeptId();
EquInfoEntity equInfoEntities = equInfoMapper.selectEquInfoByTypeId(vo.getTypeId(), String.valueOf(deptId));
SysDept dept = remoteDeptService.getDeptInfo(deptId, "inner").getData();
// SysDept dept = remoteDeptService.getDeptInfo(deptId, "inner").getData();
SysDept dept = deptService.selectDeptById(deptId);
// List<SysDictData> sysDictDataList = sysDictDataService.getDictDataByType("jhbh_code").getData();
List<SysDictData> sysDictDataList = remoteDictDataService.getDictDataByType("jhbh_code", "inner").getData();
// List<SysDictData> sysDictDataList = remoteDictDataService.getDictDataByType("jhbh_code", "inner").getData();
List<SysDictData> sysDictDataList = DictUtils.getDictDataByType("jhbh_code");
// log.info("查询字典信息：{}", sysDictDataList);
List<String> collect = sysDictDataList.stream().map(SysDictData::getDictLabel).collect(Collectors.toList());
boolean b = false;
@ -525,7 +532,8 @@ public class EquInfoServiceImpl implements EquInfoService {
equInfoExportDto.setTypeId(null);
}
// List<SysDictData> sysDictDataList = sysDictDataService.getDictDataByType("equ_model_info").getData();
List<SysDictData> sysDictDataList = remoteDictDataService.getDictDataByType("equ_model_info", "inner").getData();
// List<SysDictData> sysDictDataList = remoteDictDataService.getDictDataByType("equ_model_info", "inner").getData();
List<SysDictData> sysDictDataList = DictUtils.getDictDataByType("equ_model_info");
if (sysDictDataList != null) {
for (SysDictData sysDictData : sysDictDataList) {
@ -577,7 +585,8 @@ public class EquInfoServiceImpl implements EquInfoService {
}
// List<SysDictData> sysDictDataList = sysDictDataService.getDictDataByType("equ_model_info").getData();
List<SysDictData> sysDictDataList = remoteDictDataService.getDictDataByType("equ_model_info", "inner").getData();
// List<SysDictData> sysDictDataList = remoteDictDataService.getDictDataByType("equ_model_info", "inner").getData();
List<SysDictData> sysDictDataList = DictUtils.getDictDataByType("equ_model_info");
if (null != sysDictDataList) {
List<String> collect = sysDictDataList.stream().map(SysDictData::getDictLabel).map(String::trim).collect(Collectors.toList());
@ -591,9 +600,11 @@ public class EquInfoServiceImpl implements EquInfoService {
}
}
EquInfoEntity equInfoEntities = equInfoMapper.selectEquInfoByTypeId(equType.getTypeId(), String.valueOf(deptId));
SysDept dept = remoteDeptService.getDeptInfo(deptId, "inner").getData();
// SysDept dept = remoteDeptService.getDeptInfo(deptId, "inner").getData();
SysDept dept = deptService.selectDeptById(deptId);
// List<SysDictData> jhbhCodeList = sysDictDataService.getDictDataByType("jhbh_code").getData();
List<SysDictData> jhbhCodeList = remoteDictDataService.getDictDataByType("jhbh_code", "inner").getData();
// List<SysDictData> jhbhCodeList = remoteDictDataService.getDictDataByType("jhbh_code", "inner").getData();
List<SysDictData> jhbhCodeList = DictUtils.getDictDataByType("jhbh_code");
if (null != jhbhCodeList) {
List<String> collect = jhbhCodeList.stream().map(SysDictData::getDictLabel).collect(Collectors.toList());