Merge branch 'feature-buservice-0621' into 'develop'

Feature buservice 0621

See merge request dcuc-tjdsj/auth-back!67

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.dragoninfo</groupId>
     <artifactId>dcuc-auth-back</artifactId>
-    <version>2.3.0-tjdsj-SNAPSHOT</version>
+    <version>2.3.1-tjdsj-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -113,7 +113,7 @@
         <dependency>
             <groupId>com.dragoninfo</groupId>
             <artifactId>dcuc-auth-api</artifactId>
-            <version>2.3.0-tjdsj-SNAPSHOT</version>
+            <version>2.3.1-tjdsj-SNAPSHOT</version>
         </dependency>
         <!--redis缓存-->
         <dependency>

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v1/controller/AuthServiceController.java

@@ -214,6 +214,7 @@ public class AuthServiceController {
         requestMap.put("appName", new SearchOperator[]{SearchOperator.eq, SearchOperator.like});
         requestMap.put("appOrgName", new SearchOperator[]{SearchOperator.eq, SearchOperator.like});
         requestMap.put("appOrgCode", new SearchOperator[]{SearchOperator.eq});
+        requestMap.put("serviceResourceId", new SearchOperator[]{SearchOperator.eq});
         requestMap.put("appManagerOrgName", new SearchOperator[]{SearchOperator.eq, SearchOperator.like});
         requestMap.put("applicantName", new SearchOperator[]{SearchOperator.eq, SearchOperator.like});
         requestMap.put("serviceName", new SearchOperator[]{SearchOperator.eq, SearchOperator.like});

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v1/vo/ServiceAuthFlowAcceptVo.java

@@ -97,6 +97,9 @@ public class ServiceAuthFlowAcceptVo {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date endTime;
 
+    @ApiModelProperty(value = "服务共享方式")
+    private String fwgxfs;
+
     /**
      * 访问资源信息
      */

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v1/vo/ServiceAuthResultVo.java

@@ -81,4 +81,13 @@ public class ServiceAuthResultVo {
 
     @ApiModelProperty(value = "服务授权状态")
     private String authStatus;
+
+    @ApiModelProperty(value = "服务资源提供方  tj_service:数据资源目录  bu_service 部级服务资源")
+    private String serviceResourceId;
+
+    @ApiModelProperty(value = "服务共享方式 目前只用bu服务资源才有值")
+    private String serviceSharedWay;
+
+    @ApiModelProperty(value = "服务类型")
+    private String serviceType;
 }

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v3/controller/WorkFlowApiV3Controller.java

@@ -89,6 +89,7 @@ public class WorkFlowApiV3Controller {
         dto.setUser(idcard);
         dto.setUserToken(userToken);
         dto.setAppToken(appToken);
+        dto.setServiceSharedWay(serviceAuthFlowVo.getFwgxfs());
         //任务信息
         if (CollectionUtils.isNotEmpty(serviceAuthFlowVo.getActivitiHolderList())){
             List<ActivitiHolderDTO> activitiHolderDTOS=new ArrayList<>();