|
@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
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.IServiceResourceService;
|
|
|
import com.dragoninfo.dcuc.app.vo.ServiceResourceVo;
|
|
@@ -12,6 +14,7 @@ import com.dragonsoft.duceap.base.enums.BooleanEnum;
|
|
|
import com.dragonsoft.duceap.core.search.Searchable;
|
|
|
import com.dragonsoft.duceap.mybaitsplus.core.services.BaseMybatisService;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.data.domain.Page;
|
|
|
import org.springframework.data.domain.PageImpl;
|
|
|
import org.springframework.stereotype.Service;
|
|
@@ -31,6 +34,9 @@ public class ServiceResourceServiceImpl extends BaseMybatisService<ServiceResour
|
|
|
|
|
|
private final ServiceResourceMapper serviceResourceMapper;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private IApplyInfoFacade applyInfoFacade;
|
|
|
+
|
|
|
public ServiceResourceServiceImpl(ServiceResourceMapper serviceResourceMapper) {
|
|
|
super(serviceResourceMapper);
|
|
|
this.serviceResourceMapper = serviceResourceMapper;
|
|
@@ -79,9 +85,23 @@ public class ServiceResourceServiceImpl extends BaseMybatisService<ServiceResour
|
|
|
for (ServiceResource serviceResource :serviceResources.getContent()){
|
|
|
ServiceResourceVo serviceResourceVo = new ServiceResourceVo();
|
|
|
BeanUtils.copyProperties(serviceResource, serviceResourceVo);
|
|
|
+ //设置应用名称
|
|
|
+ appendAppName(serviceResourceVo);
|
|
|
result.add(serviceResourceVo);
|
|
|
}
|
|
|
}
|
|
|
return new PageImpl<>(result, searchable.getPage(), serviceResources.getTotalElements());
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 设置应用名称
|
|
|
+ * @param serviceResourceVo
|
|
|
+ */
|
|
|
+ private void appendAppName(ServiceResourceVo serviceResourceVo) {
|
|
|
+ ApplyInfo applyInfo = applyInfoFacade.getAppByCode(serviceResourceVo.getAppCode());
|
|
|
+ if(null != applyInfo){
|
|
|
+ serviceResourceVo.setAppName(applyInfo.getApplyName());
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
}
|