|
@@ -7,8 +7,8 @@ import com.dragoninfo.dcuc.app.cons.ServiceStatusCons;
|
|
|
import com.dragoninfo.dcuc.app.dto.ServiceResourceDTO;
|
|
|
import com.dragoninfo.dcuc.app.entity.ApplyInfo;
|
|
|
import com.dragoninfo.dcuc.app.entity.ServiceResource;
|
|
|
-import com.dragoninfo.dcuc.app.facade.IApplyInfoFacade;
|
|
|
import com.dragoninfo.dcuc.app.mapper.ServiceResourceMapper;
|
|
|
+import com.dragoninfo.dcuc.app.service.IApplyInfoService;
|
|
|
import com.dragoninfo.dcuc.app.service.IServiceResourceService;
|
|
|
import com.dragoninfo.dcuc.app.vo.ServiceResourceVo;
|
|
|
import com.dragoninfo.dcuc.auth.auth.enumresources.YesNotEnum;
|
|
@@ -59,7 +59,7 @@ public class ServiceResourceServiceImpl extends BaseMybatisService<ServiceResour
|
|
|
private final ServiceResourceMapper serviceResourceMapper;
|
|
|
|
|
|
@Autowired
|
|
|
- private IApplyInfoFacade applyInfoFacade;
|
|
|
+ private IApplyInfoService applyInfoService;
|
|
|
|
|
|
@Autowired
|
|
|
private IOrgInfoFacade orgInfoFacade;
|
|
@@ -115,7 +115,7 @@ public class ServiceResourceServiceImpl extends BaseMybatisService<ServiceResour
|
|
|
String appName = null;
|
|
|
Map<String,ApplyInfo> applyInfoMap = null;
|
|
|
if(null != appNameCondition && StringUtils.isNotBlank(appName = appNameCondition.getValue().toString())) {
|
|
|
- List<ApplyInfo> appList = applyInfoFacade.getAppByAppNameLike(appName);
|
|
|
+ List<ApplyInfo> appList = applyInfoService.getAppByAppNameLike(appName);
|
|
|
if(CollectionUtils.isEmpty(appList)) {
|
|
|
return new PageImpl<>(new ArrayList<>(), searchable.getPage(), 0L);
|
|
|
}
|
|
@@ -144,7 +144,7 @@ public class ServiceResourceServiceImpl extends BaseMybatisService<ServiceResour
|
|
|
Map<String, ApplyInfo> appMap;
|
|
|
if(null == applyInfoMap){
|
|
|
List<String> appCodes = result.stream().map(ServiceResourceVo::getAppCode).distinct().collect(Collectors.toList());
|
|
|
- List<ApplyInfo> applyInfoList = applyInfoFacade.getListByCodes(appCodes);
|
|
|
+ List<ApplyInfo> applyInfoList = applyInfoService.getListByCodes(appCodes);
|
|
|
appMap = applyInfoList.stream().collect(Collectors.toMap(ApplyInfo::getApplyCode,item->item,(old,last)->last));
|
|
|
} else {
|
|
|
appMap = applyInfoMap;
|
|
@@ -198,7 +198,7 @@ public class ServiceResourceServiceImpl extends BaseMybatisService<ServiceResour
|
|
|
return ResponseStatus.fail("300", "服务资源标识符已存在");
|
|
|
}
|
|
|
//判断是否为正确的应用
|
|
|
- ApplyInfo applyInfo = applyInfoFacade.getAppByCode(serviceResourceDTO.getAppCode());
|
|
|
+ ApplyInfo applyInfo = applyInfoService.getAppByCode(serviceResourceDTO.getAppCode());
|
|
|
if (applyInfo == null){
|
|
|
return ResponseStatus.fail("300", "服务提供应用系统不存在");
|
|
|
}
|
|
@@ -413,7 +413,7 @@ public class ServiceResourceServiceImpl extends BaseMybatisService<ServiceResour
|
|
|
break;
|
|
|
case 6:
|
|
|
//判断是否为正确的应用
|
|
|
- ApplyInfo applyInfo = applyInfoFacade.getOneByName(value);
|
|
|
+ ApplyInfo applyInfo = applyInfoService.getOneByName(value);
|
|
|
if (applyInfo == null){
|
|
|
throw new NumberFormatException("第" + (row + 1) + "行'服务提供应用系统名称'不存在!");
|
|
|
}
|
|
@@ -497,7 +497,7 @@ public class ServiceResourceServiceImpl extends BaseMybatisService<ServiceResour
|
|
|
if(StringUtils.isBlank(serviceResourceVo.getAppCode())){
|
|
|
return;
|
|
|
}
|
|
|
- ApplyInfo applyInfo = applyInfoFacade.getAppByCode(serviceResourceVo.getAppCode());
|
|
|
+ ApplyInfo applyInfo = applyInfoService.getAppByCode(serviceResourceVo.getAppCode());
|
|
|
if(null != applyInfo){
|
|
|
serviceResourceVo.setAppName(applyInfo.getApplyName());
|
|
|
}
|