feature:服务资源列表接口自测完成

dcuc-app-api/src/main/java/com/dragoninfo/dcuc/app/facade/IServiceResourceFacade.java

@@ -1,6 +1,7 @@
 package com.dragoninfo.dcuc.app.facade;
 
 import com.dragoninfo.dcuc.app.entity.ServiceResource;
+import com.dragoninfo.dcuc.app.vo.ServiceResourceVo;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.data.domain.Page;
@@ -38,4 +39,11 @@ public interface IServiceResourceFacade {
      */
     @PostMapping(value = "getByCodes")
     List<ServiceResource> getServiceByServiceCodes(@RequestBody List<String> list);
+
+    /**
+     * 服务资源列表分页查询
+     * @return
+     */
+    @PostMapping(value = "/search")
+    Page<ServiceResourceVo> page(@RequestBody SearchDTO toSearchDTO);
 }

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/vo/ServiceResourceVo.java

@@ -0,0 +1,153 @@
+package com.dragoninfo.dcuc.app.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 代码千万行,注释第一行,编码不规范,同事两行泪
+ *
+ * @author huang(jy)
+ * @version 1.0
+ * @date 2021/4/28 11:38
+ */
+@ApiModel(value = "服务资源VO")
+public class ServiceResourceVo implements Serializable {
+
+    private String id;
+
+    @ApiModelProperty(value = "资源id")
+    private String resourceId;
+
+    @ApiModelProperty(value = "资源类型")
+    private String resourceType;
+
+
+    @ApiModelProperty(value = "服务资源标识符")
+    private String serviceCode;
+
+    @ApiModelProperty(value = "服务名称")
+    private String serviceName;
+
+    @ApiModelProperty(value = "服务资源状态代码 0：未激活；1：启用；2：停止；3：撤销；")
+    private String serviceStatus;
+
+    @ApiModelProperty(value = "服务访问地址")
+    private String serviceUrl;
+
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+
+    @ApiModelProperty(value = "服务类型")
+    private String serviceType;
+
+    @ApiModelProperty(value = "服务提供方式")
+    private String serviceProvideWay;
+
+    @ApiModelProperty(value = "是否自用服务,0:否，1：是")
+    private String mustSelf;
+
+    @ApiModelProperty(value = "服务提供应用系统code")
+    private String appCode;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getResourceId() {
+        return resourceId;
+    }
+
+    public void setResourceId(String resourceId) {
+        this.resourceId = resourceId;
+    }
+
+    public String getResourceType() {
+        return resourceType;
+    }
+
+    public void setResourceType(String resourceType) {
+        this.resourceType = resourceType;
+    }
+
+    public String getServiceCode() {
+        return serviceCode;
+    }
+
+    public void setServiceCode(String serviceCode) {
+        this.serviceCode = serviceCode;
+    }
+
+    public String getServiceName() {
+        return serviceName;
+    }
+
+    public void setServiceName(String serviceName) {
+        this.serviceName = serviceName;
+    }
+
+    public String getServiceStatus() {
+        return serviceStatus;
+    }
+
+    public void setServiceStatus(String serviceStatus) {
+        this.serviceStatus = serviceStatus;
+    }
+
+    public String getServiceUrl() {
+        return serviceUrl;
+    }
+
+    public void setServiceUrl(String serviceUrl) {
+        this.serviceUrl = serviceUrl;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getServiceType() {
+        return serviceType;
+    }
+
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    public String getServiceProvideWay() {
+        return serviceProvideWay;
+    }
+
+    public void setServiceProvideWay(String serviceProvideWay) {
+        this.serviceProvideWay = serviceProvideWay;
+    }
+
+    public String getMustSelf() {
+        return mustSelf;
+    }
+
+    public void setMustSelf(String mustSelf) {
+        this.mustSelf = mustSelf;
+    }
+
+    public String getAppCode() {
+        return appCode;
+    }
+
+    public void setAppCode(String appCode) {
+        this.appCode = appCode;
+    }
+}

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/facade/ServiceResourceFacade.java

@@ -2,6 +2,7 @@ package com.dragoninfo.dcuc.app.facade;
 
 import com.dragoninfo.dcuc.app.entity.ServiceResource;
 import com.dragoninfo.dcuc.app.service.IServiceResourceService;
+import com.dragoninfo.dcuc.app.vo.ServiceResourceVo;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import com.dragonsoft.duceap.core.search.Searchable;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,4 +38,12 @@ public class ServiceResourceFacade implements IServiceResourceFacade {
     public List<ServiceResource> getServiceByServiceCodes(List<String> list) {
         return serviceResourceService.getServiceByServiceCodes(list);
     }
+    /**
+     * 服务资源列表分页查询
+     * @return
+     */
+    @Override
+    public Page<ServiceResourceVo> page(SearchDTO searchDTO) {
+        return serviceResourceService.page(Searchable.toSearchable(searchDTO));
+    }
 }

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/IServiceResourceService.java

@@ -2,6 +2,7 @@ package com.dragoninfo.dcuc.app.service;
 
 import com.dragoninfo.dcuc.app.dto.ServiceResourceDTO;
 import com.dragoninfo.dcuc.app.entity.ServiceResource;
+import com.dragoninfo.dcuc.app.vo.ServiceResourceVo;
 import com.dragonsoft.duceap.core.search.Searchable;
 import com.dragonsoft.duceap.core.service.IBaseService;
 import org.springframework.data.domain.Page;
@@ -40,4 +41,9 @@ public interface IServiceResourceService extends IBaseService<ServiceResource, S
      * @return
      */
     boolean updateById(ServiceResourceDTO dto);
+    /**
+     * 服务资源列表分页查询
+     * @return
+     */
+    Page<ServiceResourceVo> page(Searchable toSearchable);
 }

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/impl/ServiceResourceServiceImpl.java

@@ -1,19 +1,23 @@
 package com.dragoninfo.dcuc.app.service.impl;
 
 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.ServiceResource;
 import com.dragoninfo.dcuc.app.mapper.ServiceResourceMapper;
 import com.dragoninfo.dcuc.app.service.IServiceResourceService;
+import com.dragoninfo.dcuc.app.vo.ServiceResourceVo;
 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.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -63,4 +67,21 @@ public class ServiceResourceServiceImpl extends BaseMybatisService<ServiceResour
         serviceResourceMapper.updateById(serviceResource);
         return true;
     }
+    /**
+     * 服务资源列表分页查询
+     * @return
+     */
+    @Override
+    public Page<ServiceResourceVo> page(Searchable searchable) {
+        Page<ServiceResource> serviceResources = serviceResourceMapper.pagingBySearchable(searchable);
+        List<ServiceResourceVo> result = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(serviceResources.getContent())){
+            for (ServiceResource serviceResource :serviceResources.getContent()){
+                ServiceResourceVo serviceResourceVo = new ServiceResourceVo();
+                BeanUtils.copyProperties(serviceResource, serviceResourceVo);
+                result.add(serviceResourceVo);
+            }
+        }
+        return new PageImpl<>(result, searchable.getPage(), serviceResources.getTotalElements());
+    }
 }