导入同步接口修改

src/api/application.js

@@ -9,13 +9,6 @@ export const vendorRestApi = restApi("/appsvr/v2/manufacturer", { loading: true
 // 应用管理
 export const appRestApi = restApi("/appsvr/v2/app");
 
-// 应用同步
-export function appSync() { 
-     return request({
-         url: "/appsvr/v2/sync",
-         method: "get"
-     })
- }
 
 // 获取所有应用不分页
 export function allApps(status) {

src/api/data-auth.js

@@ -246,15 +246,6 @@ export function getAuthUserDetail(id) {
     });
 }
 
-// 人员同步
-export function authUserSync() {
-    return request({
-        url: `${authUserBaseUrl}/sync`,
-        method: "GET"
-    });
-}
-
-
 /****************************** 机构属性管理 ************************************ */
 const authOrgBaseUrl = "/authsvr/v2/authorginfo"
 // 机构详情
@@ -265,13 +256,6 @@ export function orgInfoDetail(id) {
     });
 }
 
-// 机构同步
-export function authOrgSync() {
-    return request({
-        url: `${authOrgBaseUrl}/sync`,
-        method: "GET"
-    });
-}
 
 /******************************* 主客体授权管理    ********************************* */
 const propBaseUrl = "/attrsvr/v2"

src/api/import.js

@@ -0,0 +1,30 @@
+/**
+ * 导入相关接口
+@author linqian
+@Date：2021-06-08
+ */
+
+function getUrl(path) {
+    return `/subimportsvr/v2/${path}/import`;
+}
+
+// 应用导入
+export const appImportUrl = getUrl("app");
+
+// 机构导入
+export const orgImportUrl = getUrl("org");
+
+// 功能导入
+export const funImportUrl = getUrl("fun");
+
+// 服务导入
+export const serviceImportUrl = getUrl("service");
+
+// 人员导入
+export const userImportUrl = getUrl("user");
+
+// 数据分级导入
+export const dataLevelImportUrl = getUrl("dataLevel");
+
+// 数据安全级别导入
+export const dataSafeLevelImportUrl = getUrl("dataSec");

src/api/sync.js

@@ -0,0 +1,73 @@
+/**
+ * 同步相关接口
+@author linqian
+@Date：2021-06-08
+ */
+
+import request from "@/utils/request";
+
+const baseUrl = "/syncsvr/v2";
+
+// 应用信息同步
+export function appSync() {
+    return request({
+        url: `${baseUrl}/appSync`,
+        method: "get"
+    });
+}
+
+// 数据资源分类同步
+export function dataSourceSync() {
+    return request({
+        url: `${baseUrl}/dataClaSync`,
+        method: "GET"
+    });
+}
+
+// 数据分级同步
+export function dataLevelSync() {
+    return request({
+        url: `${baseUrl}/dataLevelSync`,
+        method: "GET"
+    });
+}
+
+// 数据安全等级同步
+export function dataSafeLevelSync() {
+    return request({
+        url: `${baseUrl}/dataSecSync`,
+        method: "GET"
+    });
+}
+
+// 字段分级分类同步
+export function fieldSortSync() {
+    return request({
+        url: `${baseUrl}/fieldClaSync`,
+        method: "GET"
+    });
+}
+
+// 人员同步
+export function authUserSync() {
+    return request({
+        url: `${baseUrl}/userSync`,
+        method: "GET"
+    });
+}
+
+// 机构同步
+export function authOrgSync() {
+    return request({
+        url: `${baseUrl}/orgSync`,
+        method: "GET"
+    });
+}
+
+// 服务同步
+export function authSerSync() {
+    return request({
+        url: `${baseUrl}/serSync`,
+        method: "GET"
+    });
+}

src/pages/data-auth-module/auth-object-manage/appfun-resource-manage/app-list.vue

@@ -66,7 +66,8 @@
 <script>
 import importFile from "@/pages/common/import";
 import addAppForm from "./add-app-form";
-import { appRestApi, appSync } from "@/api/application";
+import { appRestApi } from "@/api/application";
+import { appSync } from "@/api/sync"
 import addFuncForm from "./add-func-form";
 
 export default {

src/pages/data-auth-module/auth-object-manage/service-resource-manage/index.vue

@@ -11,10 +11,15 @@
                 <el-input v-model="form.serviceName.value" placeholder="请输入数据资源名称" clearable></el-input>
             </el-form-item>
             <el-form-item label="数据提供方式">
-                <dg-select v-model="form.serviceProvideWay.value" enum="ServiceProvideWayEnum" placeholder="请选择数据提供方式" clearable></dg-select>
+                <dg-select
+                    v-model="form.serviceProvideWay.value"
+                    enum="ServiceProvideWayEnum"
+                    placeholder="请选择数据提供方式"
+                    clearable
+                ></dg-select>
             </el-form-item>
             <el-form-item label="数据提供应用系统名称">
-                <el-input v-model="form.appName.value" placeholder="请输入数据提供应用系统名称"  clearable></el-input>
+                <el-input v-model="form.appName.value" placeholder="请输入数据提供应用系统名称" clearable></el-input>
             </el-form-item>
             <el-form-item>
                 <dg-button type="primary" @click="handleSearch" icon="el-icon-search">查询</dg-button>
@@ -23,17 +28,27 @@
         </el-form>
         <!-- 操作 -->
         <dg-row zebra="10px">
-            <dg-button type="primary" icon="el-icon-upload2" @click="handleImport">导入</dg-button>
+            <dg-button type="primary" icon="el-icon-upload2" @click="handleSynchro">导入</dg-button>
             <dg-button type="primary" icon="el-icon-circle-plus-outline" @click="handleAdd">新增</dg-button>
-            <!-- <dg-button type="primary" icon="el-icon-refresh" @click="handleSync">同步</dg-button> -->
+            <dg-button type="primary" icon="el-icon-refresh" @click="handleSync">同步</dg-button>
         </dg-row>
         <!-- 表格 -->
         <dg-table ref="table" :url="tableUrl" :condition="form" border row-key="id">
             <dg-table-column type="index" width="75" label="序号" align="center"></dg-table-column>
             <dg-table-column prop="serviceCode" label="服务资源标识符" align="center"></dg-table-column>
             <dg-table-column prop="serviceName" label="服务资源名称" align="center"></dg-table-column>
-            <dg-table-column prop="serviceType" label="服务类型" align="center" enum="ServiceResourceTypeEnum"></dg-table-column>
-            <dg-table-column prop="serviceProvideWay" label="服务提供方式" align="center" enum="ServiceProvideWayEnum"></dg-table-column>
+            <dg-table-column
+                prop="serviceType"
+                label="服务类型"
+                align="center"
+                enum="ServiceResourceTypeEnum"
+            ></dg-table-column>
+            <dg-table-column
+                prop="serviceProvideWay"
+                label="服务提供方式"
+                align="center"
+                enum="ServiceProvideWayEnum"
+            ></dg-table-column>
             <dg-table-column prop="mustSelf" label="是否自用服务" align="center" enum="BooleanEnum"></dg-table-column>
             <dg-table-column prop="appName" label="服务提供应用系统名称" align="center"></dg-table-column>
             <dg-table-column label="操作" align="center">
@@ -59,6 +74,8 @@
 import importFile from "@/pages/common/import";
 import addForm from "./add-form";
 import * as Api from "@/api/ser-resource-manage";
+import { serviceImportUrl } from "@/api/import";
+import { authSerSync } from "@/api/sync";
 export default {
     components: {
         addForm
@@ -70,11 +87,11 @@ export default {
                     value: "",
                     op: "="
                 },
-                 serviceName: {
+                serviceName: {
                     value: "",
                     op: "like"
                 },
-                 appName: {
+                appName: {
                     value: "",
                     op: "like"
                 }
@@ -108,7 +125,7 @@ export default {
         handleDelete(row) {
             this.$dgConfirm(`是否确认删除该条服务资源！`, "提示", {}).then(() => {
                 Api.del(row.id).then((res) => {
-                    const msg = res.data.content || '删除成功!';
+                    const msg = res.data.content || "删除成功!";
                     this.$message.success(msg);
                     this.handleSearch();
                 });
@@ -138,7 +155,7 @@ export default {
                 content: importFile,
                 props: {
                     temp: "serviceResource",
-                    action: "/authsvr/v2/resource/import"
+                    action: serviceImportUrl
                 },
                 on: {
                     success(params) {
@@ -183,13 +200,16 @@ export default {
             });
         },
         /**
-         * 同步
+         * @description:同步方法，假同步
          */
-        handleSync() {},
-
-    },
-    created() {
+        handleSynchro() {
+            authSerSync().then((res) => {
+                this.$message.success("同步成功");
+                this.handleSearch();
+            });
+        }
     },
+    created() {},
     mounted() {}
 };
 </script>

src/pages/data-auth-module/auth-object-manage/sort-code-manage/data-level.vue

@@ -18,8 +18,8 @@
         <!-- 操作 -->
         <dg-row zebra="10px">
             <dg-button type="primary" icon="el-icon-circle-plus-outline" @click="handleAdd">新增</dg-button>
-            <!-- <dg-button type="primary" icon="el-icon-refresh" @click="handleSync">同步</dg-button> -->
-            <!-- <dg-button type="primary" @click="handleImport" icon="el-icon-upload">导入</dg-button> -->
+            <dg-button type="primary" icon="el-icon-refresh" @click="handleSynchro">同步</dg-button>
+            <dg-button type="primary" @click="handleImport" icon="el-icon-upload">导入</dg-button>
         </dg-row>
         <!-- 列表 -->
         <dg-table ref="table" :url="dataLevelTableUrl" :condition="form" border row-key="id">
@@ -50,6 +50,8 @@
 import importFile from "@/pages/common/import";
 import { dataLevelTableUrl, delDataLevel } from "@/api/data-auth";
 import addForm from "./forms/data-level-form";
+import { dataLevelSync } from "@/api/sync"
+import {  dataLevelImportUrl } from "@/api/import"
 export default {
     components: {},
     data() {
@@ -136,11 +138,12 @@ export default {
                 title: "数据分级表码导入",
                 content: importFile,
                 props: {
-                    temp: "模板",
-                    action: "action"
+                    temp: "dataLevel",
+                    action: dataLevelImportUrl
                 },
                 on: {
                     success(params) {
+                        vm.handleSearch();
                         layer.close(layer.dialogIndex);
                     }
                 },
@@ -151,7 +154,16 @@ export default {
                 },
                 area: ["550px", "500px"]
             });
-        }
+        },
+          /**
+         * @description:同步方法，假同步
+         */
+        handleSynchro() {
+            dataLevelSync().then(res => {
+                this.$message.success("同步成功");
+                this.handleSearch();
+            })
+        },
     },
     created() {},
     mounted() {}

src/pages/data-auth-module/auth-object-manage/sort-code-manage/field-sort-code.vue

@@ -21,7 +21,7 @@
         <!-- 操作 -->
         <dg-row zebra="10px">
             <dg-button type="primary" icon="el-icon-circle-plus-outline" @click="handleAdd">新增</dg-button>
-            <!-- <dg-button type="primary" icon="el-icon-refresh" @click="handleSync">同步</dg-button> -->
+            <dg-button type="primary" icon="el-icon-refresh" @click="handleSynchro">同步</dg-button>
             <!-- <dg-button type="primary" @click="handleImport" icon="el-icon-upload">导入</dg-button> -->
         </dg-row>
         <!-- 列表 -->
@@ -31,7 +31,7 @@
             <dg-table-column prop="firName" label="字段一级分类" align="center"></dg-table-column>
             <dg-table-column prop="secCode" label="字段二级代码" align="center"></dg-table-column>
             <dg-table-column prop="secName" label="字段二级分类" align="center"></dg-table-column>
-             <dg-table-column prop="remark" label="说明" align="center"></dg-table-column>
+            <dg-table-column prop="remark" label="说明" align="center"></dg-table-column>
             <dg-table-column label="操作" align="center" width="120px">
                 <template slot-scope="scope">
                     <div class="u-table__operation">
@@ -55,6 +55,7 @@
 import importFile from "@/pages/common/import";
 import fieldSortForm from "./forms/field-sort-form";
 import { fieldClassifyTableUrl, delFieldClassify } from "@/api/data-auth";
+import { fieldSortSync } from "@/api/sync";
 
 export default {
     components: {},
@@ -170,6 +171,15 @@ export default {
                 },
                 area: ["550px", "500px"]
             });
+        },
+        /**
+         * @description:同步方法，假同步
+         */
+        handleSynchro() {
+            fieldSortSync().then((res) => {
+                this.$message.success("同步成功");
+                this.handleSearch();
+            });
         }
     },
     created() {},

src/pages/data-auth-module/auth-object-manage/sort-code-manage/safe-level-code.vue

@@ -17,8 +17,8 @@
         <!-- 导入 -->
         <dg-row zebra="10px">
             <dg-button type="primary" icon="el-icon-circle-plus-outline" @click="handleAdd">新增</dg-button>
-            <!-- <dg-button type="primary" icon="el-icon-refresh" @click="handleSync">同步</dg-button> -->
-            <!-- <dg-button type="primary" @click="handleImport" icon="el-icon-upload">导入</dg-button> -->
+            <dg-button type="primary" icon="el-icon-refresh" @click="handleSynchro">同步</dg-button>
+            <dg-button type="primary" @click="handleImport" icon="el-icon-upload">导入</dg-button>
         </dg-row>
         <!-- 列表 -->
         <Table ref="myTable" :url="dataSecLevTableUrl" :headerData="safeLevelForm" :condition="form">
@@ -44,9 +44,11 @@
 <script>
 import importFile from "@/pages/common/import";
 import { dataSecLevTableUrl, getDataSecLevDetail, saveDataSecLev, delDataSecLev } from "@/api/data-auth";
+import { dataSafeLevelSync } from "@/api/sync";
 import { safeLevelForm } from "./DataConfig";
 import Form from "@/pages/common/form";
 import Table from "@/pages/common/table";
+import { dataSafeLevelImportUrl } from "@/api/import"
 export default {
     components: { Table },
     data() {
@@ -83,11 +85,12 @@ export default {
                 title: "数据安全级别表码导入",
                 content: importFile,
                 props: {
-                    temp: "模板",
-                    action: "action"
+                    temp: "dataSec",
+                    action: dataSafeLevelImportUrl
                 },
                 on: {
                     success(params) {
+                        vm.handleSearch();
                         layer.close(layer.dialogIndex);
                     }
                 },
@@ -152,6 +155,15 @@ export default {
                 },
                 area: ["500px", "400px"]
             });
+        },
+          /**
+         * @description:同步方法，假同步
+         */
+        handleSynchro() {
+            dataSafeLevelSync().then((res) => {
+                this.$message.success("同步成功");
+                this.handleSearch();
+            });
         }
     },
     created() {

src/pages/data-auth-module/auth-object-manage/sort-code-manage/source-sort-code.vue

@@ -24,7 +24,7 @@
           <!-- 操作 -->
         <dg-row zebra="10px">
             <dg-button type="primary" icon="el-icon-circle-plus-outline" @click="handleAdd">新增</dg-button>
-            <!-- <dg-button type="primary" icon="el-icon-refresh" @click="handleSync">同步</dg-button> -->
+            <dg-button type="primary" icon="el-icon-refresh" @click="handleSynchro">同步</dg-button>
             <!-- <dg-button type="primary" @click="handleImport" icon="el-icon-upload">导入</dg-button> -->
         </dg-row>
         <!-- 列表 -->
@@ -61,6 +61,7 @@
 import importFile from "@/pages/common/import";
 import sourceSortForm from "./forms/source-sort-form";
 import { dataSourceClaTableUrl, delDataSourceCla } from "@/api/data-auth";
+import { dataSourceSync } from "@/api/sync";
 export default {
     components: {},
     data() {
@@ -179,6 +180,15 @@ export default {
                 },
                 area: ["550px", "500px"]
             });
+        },
+            /**
+         * @description:同步方法，假同步
+         */
+        handleSynchro() {
+            dataSourceSync().then((res) => {
+                this.$message.success("同步成功");
+                this.handleSearch();
+            });
         }
     },
     created() {},

src/pages/data-auth-module/auth-subject-manage/DataConfig.js

@@ -14,7 +14,7 @@ const UserTableData = [
     },
     {
         label: "姓名",
-        prop: "userName"
+        prop: "name"
     },
     {
         label: "身份证号码",
@@ -151,7 +151,7 @@ const cardServiceList = [
 
 const typeData = {
     10: [
-        { label: "姓名", value: "userName" },
+        { label: "姓名", value: "name" },
         { label: "性别", value: "sex", code: "DM_SEX" },
         { label: "身份证号码", value: "idcard" },
         { label: "省份", value: "area", code: "DM_AREA_CODE" },
@@ -187,7 +187,7 @@ const institutionField = [
     { label: "机构类型", value: "orgType", enum: "OrgKindEnum" },
     { label: "机构名称", value: "fullName" },
     { label: "行政区划", value: "areaCode" },
-    { label: "机构代码", value: "orgCode" },
+    { label: "机构代码", value: "code" },
     { label: "机构类别", value: "unitClass", code: "T_MD_ORGTYPE" },
     { label: "单位层级", value: "orgLevel", code: "T_MD_ORG_LEVEL" },
     { label: "单位级别", value: "orgRank", code: "T_MD_ORG_RANK" },

src/pages/data-auth-module/auth-subject-manage/app-prop-manage/index.vue

@@ -62,7 +62,9 @@ import { ApplicationTableData } from "../DataConfig";
 // import detail from "./detail";
 import detail from "../../auth-object-manage/appfun-resource-manage/add-app-form";
 import importFile from "@/pages/common/import";
-import { appRestApi, appSync } from "@/api/application";
+import { appRestApi } from "@/api/application";
+import { appSync } from "@/api/sync"
+import { appImportUrl } from "@/api/import"
 export default {
     name: "application-properties", // 组件名称
     props: {
@@ -118,7 +120,7 @@ export default {
                 content: importFile,
                 props: {
                     temp: "apply",
-                    action: "/appsvr/v2/app/import"
+                    action: appImportUrl
                 },
                 on: {
                     success(params) {
@@ -143,7 +145,7 @@ export default {
         handleSynchro() {
             appSync().then(res => {
                 this.$message.success("同步成功");
-                // this.handleSearch();
+                this.handleSearch();
             })
         },
         /**

src/pages/data-auth-module/auth-subject-manage/org-prop-manage/index.vue

@@ -54,8 +54,10 @@
 <script>
 import Tree from "@/pages/common/tree";
 import { institutionField } from "../DataConfig";
-import { orgInfoDetail, authOrgSync } from "@/api/data-auth";
+import { orgInfoDetail } from "@/api/data-auth";
+import { authOrgSync } from "@/api/sync"
 import importFile from "@/pages/common/import";
+import { orgImportUrl  } from "@/api/import"
 export default {
     name: "institutional-attributes", // 组件名称
     props: {},
@@ -83,7 +85,7 @@ export default {
                 content: importFile,
                 props: {
                     temp: "org",
-                    action: "/authsvr/v2/authorginfo/import"
+                    action: orgImportUrl
                 },
                 on: {
                     success(params) {
@@ -105,7 +107,7 @@ export default {
         handleSynchro() {
             authOrgSync().then(res => {
                 this.$message.success("同步成功");
-                // this.handleSearch();
+                this.handleSearch();
             })
         },
         /**

src/pages/data-auth-module/auth-subject-manage/user-prop-manage/index.vue

@@ -13,7 +13,7 @@
                 </dg-select>
             </el-form-item>
             <el-form-item label="姓名">
-                <el-input v-model="form.userName.value" placeholder="请输入姓名" clearable></el-input>
+                <el-input v-model="form.name.value" placeholder="请输入姓名" clearable></el-input>
             </el-form-item>
             <el-form-item label="身份证号">
                 <el-input v-model="form.idcard.value" placeholder="请输入身份证号" clearable></el-input>
@@ -53,11 +53,13 @@
 <script>
 import Table from "@/pages/common/table";
 import { UserTableData } from "../DataConfig";
-import { authUserTableUrl, authUserSync } from "@/api/data-auth";
+import { authUserTableUrl } from "@/api/data-auth";
+import { authUserSync } from "@/api/sync"
 import baseApi from "@/api/jz-base";
 import detail from "./detail";
 import importFile from "@/pages/common/import";
 import selectTree from "@/pages/common/select-tree";
+import { userImportUrl } from "@/api/import"
 export default {
     name: "user-attributes", // 组件名称
     props: {
@@ -68,7 +70,7 @@ export default {
         return {
             // 参数名称及默认值
             form: {
-                userName: {
+                name: {
                     value: "",
                     op: "like"
                 },
@@ -124,7 +126,7 @@ export default {
                 content: importFile,
                 props: {
                     temp: "user",
-                    action: "/authsvr/v2/authuserinfo/import"
+                    action: userImportUrl
                 },
                 on: {
                     success(params) {
@@ -146,7 +148,7 @@ export default {
         handleSynchro() {
             authUserSync().then(res => {
                 this.$message.success("同步成功");
-                // this.handleSearch();
+                this.handleSearch();
             })
         },
         /**