Merge branch 'mazq-dataauthmodify-0413' into 'develop'

服务无法启动修改

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

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/DataAuthController.java

@@ -6,6 +6,7 @@ import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.OrgDataAuthAcceptVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.UserDataAuthAcceptVo;
 import com.dragoninfo.duceap.core.response.Result;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -30,8 +31,11 @@ public class DataAuthController {
         return null;
     }
 
+//    @ApiOperation(value = "获取所有数据资源")
+
+
     @ApiOperation(value = "人员数据授权接口")
-    @PostMapping(value = "dataAuth", produces = "application/json;charset=UTF-8")
+    @PostMapping(value = "userDataAuth", produces = "application/json;charset=UTF-8")
     public Result userDataAuth(@RequestBody UserDataAuthAcceptVo userDataAuthAcceptVo){
 
 
@@ -41,7 +45,7 @@ public class DataAuthController {
 
 
     @ApiOperation(value = "机构数据授权接口")
-    @PostMapping(value = "dataAuth", produces = "application/json;charset=UTF-8")
+    @PostMapping(value = "orgDataAuth", produces = "application/json;charset=UTF-8")
     public Result orgDataAuth(@RequestBody OrgDataAuthAcceptVo orgDataAuthAcceptVo){
 
 
@@ -51,7 +55,7 @@ public class DataAuthController {
 
 
     @ApiOperation(value = "业务域标签数据授权接口")
-    @PostMapping(value = "dataAuth", produces = "application/json;charset=UTF-8")
+    @PostMapping(value = "labelDataAuth", produces = "application/json;charset=UTF-8")
     public Result labelDataAuth(@RequestBody LabelDataAuthAcceptVo labelDataAuthAcceptVo){
 
 
@@ -60,6 +64,7 @@ public class DataAuthController {
     }
 
     @ApiOperation(value = "人员视角数据权限查询")
+    @ApiImplicitParam(name = "userId",value = "人员id")
     @GetMapping(value = "userDataAuthInfo")
     public Result userDataAuthInfo(@RequestParam("userId") String userId){