Browse Source

fix:返回前端响应对象extras添加funcCode

zhongwei
haungxing 7 months ago
parent
commit
232cd3523a
  1. 2
      hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/InteractiveServiceImpl.java
  2. 1
      hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/JumpRouteJoinStrategy.java

2
hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/InteractiveServiceImpl.java

@ -209,11 +209,13 @@ public class InteractiveServiceImpl implements IInteractiveService {
Assert.isTrue(Func.isNotEmpty(function) && StringUtil.isNotBlank(function.getRoute()),() -> { Assert.isTrue(Func.isNotEmpty(function) && StringUtil.isNotBlank(function.getRoute()),() -> {
throw new ServiceException("传入函数未获取到菜单,鉴权失败!"); throw new ServiceException("传入函数未获取到菜单,鉴权失败!");
}); });
if(Func.isNotEmpty(function.getRoute()) && StringUtil.isNotBlank(function.getRoute())) {
R<Boolean> authenticationR = userClient.permissionMenuById(Long.valueOf(userId), function.getRoute()); R<Boolean> authenticationR = userClient.permissionMenuById(Long.valueOf(userId), function.getRoute());
Assert.isTrue(authenticationR.isSuccess() && authenticationR.getData(), () -> { Assert.isTrue(authenticationR.isSuccess() && authenticationR.getData(), () -> {
throw new ServiceException("人员菜单鉴权失败!"); throw new ServiceException("人员菜单鉴权失败!");
}); });
} }
}
return true; return true;
} }

1
hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/JumpRouteJoinStrategy.java

@ -52,6 +52,7 @@ public class JumpRouteJoinStrategy {
// 根据hz3000画面版本获取path // 根据hz3000画面版本获取path
Integer picResource = Integer.valueOf(params.get("picResource")); Integer picResource = Integer.valueOf(params.get("picResource"));
JSONObject pathObject = JSONObject.parseObject(function.getPath()); JSONObject pathObject = JSONObject.parseObject(function.getPath());
extraVO.setLabel(params.get("name"));
// 云组态 // 云组态
if(picResource == 0) { if(picResource == 0) {
String scada = pathObject.getString("scada"); String scada = pathObject.getString("scada");

Loading…
Cancel
Save