Commit 7789aafe by liuyang

2024-10-19 生产驾驶舱接口调整

parent faafef7e
...@@ -370,11 +370,6 @@ public class ServiceHGSC007 extends ServiceEPBase { ...@@ -370,11 +370,6 @@ public class ServiceHGSC007 extends ServiceEPBase {
Optional.ofNullable(roleCompanyCode).orElse(new ArrayList<>()).stream().forEach(code -> { Optional.ofNullable(roleCompanyCode).orElse(new ArrayList<>()).stream().forEach(code -> {
factoryCodes.addAll(HGXSTools.XsOrg.queryByParent(code, OrgTypeEnum.FACTORY.getCode())); factoryCodes.addAll(HGXSTools.XsOrg.queryByParent(code, OrgTypeEnum.FACTORY.getCode()));
}); });
//List<Map<String,Object>> mapList = getOrg();
//factoryCodes.addAll(mapList);
} catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "APP查询工厂失败");
}
List list = factoryCodes.stream() List list = factoryCodes.stream()
.filter(o -> com.baosight.hggp.util.StringUtils.equals(o.getOrgType(), OrgTypeEnum.FACTORY.getCode())) .filter(o -> com.baosight.hggp.util.StringUtils.equals(o.getOrgType(), OrgTypeEnum.FACTORY.getCode()))
.map(item -> new Factory(item.getCompanyCode(), item.getCompanyName(), item.getFactoryCode(), .map(item -> new Factory(item.getCompanyCode(), item.getCompanyName(), item.getFactoryCode(),
...@@ -385,6 +380,11 @@ public class ServiceHGSC007 extends ServiceEPBase { ...@@ -385,6 +380,11 @@ public class ServiceHGSC007 extends ServiceEPBase {
m -> new ArrayList<>(m.values()) m -> new ArrayList<>(m.values())
)); ));
inInfo.set(EiConstant.resultBlock, list); inInfo.set(EiConstant.resultBlock, list);
} catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "APP查询工厂失败");
}
return inInfo; return inInfo;
} }
} }
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