feature: 人员导入修改、分级分类保存dataCode

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

@@ -216,8 +216,8 @@ public class DataAuthController {
         List<SubDataDTO> dataDTOList = new ArrayList<>();
         for (DataAuthAcceptVo vo : authVoList) {
             SubDataDTO subDataDTO = new SubDataDTO();
-            String dataId = vo.getDataId();
-            subDataDTO.setDataId(dataId);
+            subDataDTO.setDataId(vo.getDataId());
+            subDataDTO.setDataCode(vo.getDataCode());
             subDataDTO.setClassifyCode(vo.getClassifyCode());
             dataDTOList.add(subDataDTO);
         }

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

@@ -15,12 +15,6 @@ public class SubDataVo {
     @ApiModelProperty(value = "数据资源唯一标识")
     private String dataId;
 
-    @ApiModelProperty(value = "数据类型")
-    private String dataType;
-
-    @ApiModelProperty(value = "数据资源code集合")
-    private String dataCode;
-
     @ApiModelProperty(value = "数据对应的分级分类标签code")
     private String classifyCode;
 

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/sub/SubSyncController.java

@@ -150,5 +150,14 @@ public class SubSyncController {
         }
     }
 
-
+    @ApiOperation(value = "表和列资源同步")
+    @GetMapping(value = "tableColumnSync")
+    public Result tableColumnSync() {
+        ResponseStatus response = dataResourceFacade.syncTableAndColumn();
+        if (ResponseStatus.SUCCESS_CODE.equals(response.getStatusCode())) {
+            return Result.success();
+        } else {
+            return Result.failMessage(response.getMessage());
+        }
+    }
 }

src/main/resources/application-base.yml

@@ -35,7 +35,7 @@ management:
 duceap:
   swagger:
     enabled: true
-    package-path: com.dragoninfo.dcuc.authweb.restcontroller.audit.v2
+    package-path: com.dragoninfo.dcuc.authweb.restcontroller.auth
   license:
     #配置用来指定license对接的后端项目地址(格式：ip:port/context，如http://10.10.10.10:8080/ctx)，
     #默认使用HttpServletRequest.getLocalAddr()方法获取ip地址，
@@ -62,10 +62,10 @@ duceap:
       #单点登录服务接口地址
       SSOValidateUrl:  http://192.168.6.128:9995/didsserver/serviceValidate
       #跳转前端地址
-      SSOServiceUrl: http://10.11.0.168:8871/dcucauth/login
+      SSOServiceUrl: http://10.11.1.25:8871/dcucauth/login
       #单点登录服务接口地址
       webServiceUrl: http://192.168.6.128:9995/didsserver/webservices/
-      noFilterUrl: services,hessian,commons,install.action,.xml,/install,/widgets-src/,/authorizationPage.html,/importAuthorizationFile.html,/license/LicenseManagerServlet,/authorizationFile/,/api/,/js/,/png/,/rest/,/dataresourcesrv/
+      noFilterUrl: services,hessian,commons,install.action,.xml,/install,/widgets-src/,/authorizationPage.html,/importAuthorizationFile.html,/license/LicenseManagerServlet,/authorizationFile/,/api/,/js/,/png/,/rest/,/dataresourcesrv/,/swagger-ui.html,/v2/
 hystrix:
   command:
     default: