From ecf79535aea0de03cbb3472ba2260555abe2b88c Mon Sep 17 00:00:00 2001 From: zhulongchuan <1624729110@qq.com> Date: Tue, 16 Sep 2025 11:18:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=99=BB=E5=BD=95=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=B7=A5=E5=85=B7=E7=B1=BB=E6=9B=B4=E6=8D=A2=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equ/service/impl/EquInfoServiceImpl.java | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/djhk-system/src/main/java/com/djhk/uav/equ/service/impl/EquInfoServiceImpl.java b/djhk-system/src/main/java/com/djhk/uav/equ/service/impl/EquInfoServiceImpl.java index ae7dbeb..8e3a60b 100644 --- a/djhk-system/src/main/java/com/djhk/uav/equ/service/impl/EquInfoServiceImpl.java +++ b/djhk-system/src/main/java/com/djhk/uav/equ/service/impl/EquInfoServiceImpl.java @@ -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 sysDictDataList = sysDictDataService.getDictDataByType("equ_model_info").getData(); - List sysDictDataList = remoteDictDataService.getDictDataByType("equ_model_info", "inner").getData(); +// List sysDictDataList = remoteDictDataService.getDictDataByType("equ_model_info", "inner").getData(); + List 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 sysDictDataList = sysDictDataService.getDictDataByType("jhbh_code").getData(); - List sysDictDataList = remoteDictDataService.getDictDataByType("jhbh_code", "inner").getData(); +// List sysDictDataList = remoteDictDataService.getDictDataByType("jhbh_code", "inner").getData(); + List sysDictDataList = DictUtils.getDictDataByType("jhbh_code"); // log.info("查询字典信息：{}", sysDictDataList); List 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 sysDictDataList = sysDictDataService.getDictDataByType("equ_model_info").getData(); - List sysDictDataList = remoteDictDataService.getDictDataByType("equ_model_info", "inner").getData(); +// List sysDictDataList = remoteDictDataService.getDictDataByType("equ_model_info", "inner").getData(); + List sysDictDataList = DictUtils.getDictDataByType("equ_model_info"); if (sysDictDataList != null) { for (SysDictData sysDictData : sysDictDataList) { @@ -577,7 +585,8 @@ public class EquInfoServiceImpl implements EquInfoService { } // List sysDictDataList = sysDictDataService.getDictDataByType("equ_model_info").getData(); - List sysDictDataList = remoteDictDataService.getDictDataByType("equ_model_info", "inner").getData(); +// List sysDictDataList = remoteDictDataService.getDictDataByType("equ_model_info", "inner").getData(); + List sysDictDataList = DictUtils.getDictDataByType("equ_model_info"); if (null != sysDictDataList) { List 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 jhbhCodeList = sysDictDataService.getDictDataByType("jhbh_code").getData(); - List jhbhCodeList = remoteDictDataService.getDictDataByType("jhbh_code", "inner").getData(); +// List jhbhCodeList = remoteDictDataService.getDictDataByType("jhbh_code", "inner").getData(); + List jhbhCodeList = DictUtils.getDictDataByType("jhbh_code"); if (null != jhbhCodeList) { List collect = jhbhCodeList.stream().map(SysDictData::getDictLabel).collect(Collectors.toList());