Browse Source

fix: bug修复

zhongwei
haungxing 2 months ago
parent
commit
c471eb8b62
  1. 2
      hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/business/service/DataSourceService.java
  2. 4
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/PlanController.java

2
hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/business/service/DataSourceService.java

@ -53,7 +53,7 @@ public class DataSourceService {
for (TableAuthVO tableAuthVO : sqlVO.getTableAuthVOList()) { for (TableAuthVO tableAuthVO : sqlVO.getTableAuthVOList()) {
// 查询改数据源下的表格是否存在鉴权 // 查询改数据源下的表格是否存在鉴权
LambdaQueryWrapper<TablePropertyEntity> wrapper = Wrappers.<TablePropertyEntity>lambdaQuery() LambdaQueryWrapper<TablePropertyEntity> wrapper = Wrappers.<TablePropertyEntity>lambdaQuery()
.eq(TablePropertyEntity::getDatasourceId, tableAuthVO.getDatasourceName()) //.eq(TablePropertyEntity::getDatasourceId, tableAuthVO.getDatasourceName())
.eq(TablePropertyEntity::getTableName, tableAuthVO.getTableName()); .eq(TablePropertyEntity::getTableName, tableAuthVO.getTableName());
List<TablePropertyEntity> propertise = tablePropertyService.list(wrapper); List<TablePropertyEntity> propertise = tablePropertyService.list(wrapper);
Assert.isTrue(Func.isNotEmpty(propertise), () -> { Assert.isTrue(Func.isNotEmpty(propertise), () -> {

4
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/PlanController.java

@ -218,7 +218,9 @@ public class PlanController extends BladeController {
throw new HzServiceException("未获取到机器人配置!"); throw new HzServiceException("未获取到机器人配置!");
} }
// 获取机器人巡检路线 // 获取机器人巡检路线
List<RouteEntity> routeEntityList = routeService.list(Wrappers.<RouteEntity>lambdaQuery().eq(RouteEntity::getCreateDept, UserCache.getUser(robotEntity.getUserId()).getDeptId())); List<RouteEntity> routeEntityList = routeService.list(Wrappers.<RouteEntity>lambdaQuery()
.eq(RouteEntity::getCreateDept, UserCache.getUser(robotEntity.getUserId()).getDeptId())
.eq(RouteEntity::getSupportAutoVideo, Constants.InspectTypeEnum.ROBOT.getVal()));
if(CollectionUtil.isEmpty(routeEntityList)) { if(CollectionUtil.isEmpty(routeEntityList)) {
throw new HzServiceException("获取机器人巡检路线失败!"); throw new HzServiceException("获取机器人巡检路线失败!");
} }

Loading…
Cancel
Save