Merge branch 'mzq-sjjq-220929' into 'develop'

Mzq sjjq 220929

See merge request xj-aks/dcuc/auth-back!2

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

@@ -8,10 +8,11 @@ import com.dragoninfo.dcuc.auth.auth.dto.data.*;
 import com.dragoninfo.dcuc.auth.auth.enumresources.SubDataAuthTypeEnum;
 import com.dragoninfo.dcuc.auth.auth.facade.IDataAuthFacade;
 import com.dragoninfo.dcuc.auth.auth.vo.BusResultVO;
+import com.dragoninfo.dcuc.auth.auth.vo.DataAuthAcceptVo;
+import com.dragoninfo.dcuc.auth.auth.vo.DataAuthTreeReactVo;
 import com.dragoninfo.dcuc.auth.sub.dto.LabelSearchDTO;
 import com.dragoninfo.dcuc.auth.sub.facade.IUserCenterApiFacade;
 import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.data.*;
-import com.dragoninfo.dcuc.auth.sub.vo.LabelSearchVo;
 import com.dragoninfo.dcuc.auth.sub.vo.LabelTreeVO;
 import com.dragoninfo.dcuc.authweb.util.VersionUtils;
 import com.dragoninfo.duceap.core.response.Result;
@@ -91,6 +92,14 @@ public class DataAuthController {
         return Result.success(true);
     }
 
+    @ApiOperation(value = "数据资源树联动勾选接口")
+    @PostMapping("tree-react")
+    public Result<List<DataClassifyVo>> treeReact(@RequestBody DataAuthTreeReactVo treeReactVo) {
+        List<DataClassifyDTO> classifyDTOS = dataAuthFacade.treeReact(treeReactVo);
+        List<DataClassifyVo> vos = convertToVos(classifyDTOS);
+        return Result.success(vos);
+    }
+
 
     @ApiOperation(value = "机构数据授权接口")
     @PostMapping(value = "orgDataAuth", produces = "application/json;charset=UTF-8")
@@ -115,7 +124,7 @@ public class DataAuthController {
 
     @ApiOperation(value = "查询多个主体相关数据权限")
     @PostMapping(value = "subListDataAuth", produces = "application/json;charset=UTF-8")
-    public Result subDataAuthList(@RequestBody List<SubDataAuthQueryVo> queryVoList) {
+    public Result<List<DataClassifyVo>> subDataAuthList(@RequestBody List<SubDataAuthQueryVo> queryVoList) {
         List<SubDataAuthQueryDTO> dtos = new ArrayList<>();
         for (SubDataAuthQueryVo vo : queryVoList) {
             SubDataAuthQueryDTO dto = new SubDataAuthQueryDTO();
@@ -211,16 +220,12 @@ public class DataAuthController {
         List<SubDataDTO> dataDTOList = new ArrayList<>();
         for (DataAuthAcceptVo vo : authVoList) {
             SubDataDTO subDataDTO = new SubDataDTO();
-            subDataDTO.setDataType(vo.getDataType());
             String dataId = vo.getDataId();
             //除去分级分类标签的code
             int index = dataId.indexOf(idJoin);
             //从dataId截取拼接各种参数
-            int lastIndex = dataId.lastIndexOf(idJoin);
-            subDataDTO.setDataId(dataId.substring(index+1));
-            subDataDTO.setClassifyCode(dataId.substring(0,index));
-            subDataDTO.setDataCode(dataId.substring(lastIndex+1));
-            subDataDTO.setInnerId(vo.getInnerId());
+            subDataDTO.setDataId(dataId);
+            subDataDTO.setClassifyCode(vo.getClassifyCode());
             dataDTOList.add(subDataDTO);
         }
         subDataAuthDTO.setDataAuthList(dataDTOList);

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/vo/data/DataAuthAcceptVo.java

@@ -1,35 +0,0 @@
-package com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.data;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author mazq
- * @date 2021/4/8
- */
-@ApiModel(value = "同一类别数据授权对象")
-@Data
-public class DataAuthAcceptVo {
-
-    @ApiModelProperty(value = "数据资源唯一标识")
-    private String dataId;
-
-    @ApiModelProperty(value = "数据资源类型,对应类型码值" +
-            "DATA_SECURITY_LEVEL：数据安全级别；" +
-            "LEVEL_1_COLUMN_CLASSIFY：字段一级分类；" +
-            "LEVEL_2_COLUMN_CLASSIFY：字段二级分类；" +
-            "DATA_CLASSIFY：数据分级", dataType = "string")
-    private String dataType;
-
-    @ApiModelProperty(value = "数据资源code")
-    private String dataCode;
-
-    @ApiModelProperty(value = "数据对应的分级分类标签code")
-    private String classifyCode;
-
-    @ApiModelProperty(value = "内部使用唯一标识id")
-    private String innerId;
-
-
-}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/vo/data/LabelDataAuthAcceptVo.java

@@ -1,5 +1,6 @@
 package com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.data;
 
+import com.dragoninfo.dcuc.auth.auth.vo.DataAuthAcceptVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/vo/data/OrgDataAuthAcceptVo.java

@@ -1,5 +1,6 @@
 package com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.data;
 
+import com.dragoninfo.dcuc.auth.auth.vo.DataAuthAcceptVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/vo/data/UserDataAuthAcceptVo.java

@@ -1,5 +1,6 @@
 package com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.data;
 
+import com.dragoninfo.dcuc.auth.auth.vo.DataAuthAcceptVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;