ibizdev提交

app_web/src/locale/lanres/sys-permission/sys-permission_en_US.ts

@@ -60,6 +60,7 @@ export default {
 	},
 	main_grid: {
 		columns: {
+			sys_permissionid: "资源标识",
 			sys_permissionname: "资源名称",
 			pssourcetype: "来源",
 		},

app_web/src/locale/lanres/sys-permission/sys-permission_zh_CN.ts

@@ -59,6 +59,7 @@ export default {
 	},
 	main_grid: {
 		columns: {
+			sys_permissionid: '资源标识',
 			sys_permissionname: '资源名称',
 			pssourcetype: '来源',
 		},

app_web/src/widgets/sys-permission/main-grid/main-grid-base.vue

@@ -16,6 +16,13 @@
             <template v-if="!isSingleSelect">
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
+            <template v-if="getColumnState('sys_permissionid')">
+                <el-table-column show-overflow-tooltip :prop="'sys_permissionid'" :label="$t('entities.sys_permission.main_grid.columns.sys_permissionid')" :width="150" :align="'left'" :sortable="'custom'">
+                    <template v-slot="{row,column}">
+                        <span>{{row.sys_permissionid}}</span>
+                    </template>
+                </el-table-column>
+            </template>
             <template v-if="getColumnState('sys_permissionname')">
                 <el-table-column show-overflow-tooltip :prop="'sys_permissionname'" :label="$t('entities.sys_permission.main_grid.columns.sys_permissionname')" :width="250" :align="'left'" :sortable="'custom'">
                     <template v-slot="{row,column}">
@@ -489,6 +496,13 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof Main
      */
     protected allColumns: any[] = [
+        {
+            name: 'sys_permissionid',
+            label: '资源标识',
+            langtag: 'entities.sys_permission.main_grid.columns.sys_permissionid',
+            show: true,
+            util: 'px'
+        },
         {
             name: 'sys_permissionname',
             label: '资源名称',

app_web/src/widgets/sys-permission/main-grid/main-grid-model.ts

@@ -31,6 +31,11 @@ export default class MainModel {
           prop: 'pssourcetype',
           dataType: 'TEXT',
         },
+        {
+          name: 'sys_permissionid',
+          prop: 'permissionid',
+          dataType: 'GUID',
+        },
         {
           name: 'srfmajortext',
           prop: 'permissionname',

ibzuaa-core/src/main/resources/liquibase/h2_table.xml

@@ -120,7 +120,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[SYS_PERMISSION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_permission-138-7">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_permission-142-7">
         <createTable tableName="IBZPERMISSION">
                 <column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_PERMISSION_SYS_PERMISSI"/>

ibzuaa-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java

@@ -36,14 +36,13 @@ public class PermissionSyncJob implements ApplicationRunner {
     private String systemId;
 
     @Override
-    public void run(ApplicationArguments args) throws Exception {
+    public void run(ApplicationArguments args) {
         if(enablePermissionValid){
             try {
                 InputStream permission= this.getClass().getResourceAsStream("/deprivs/DEPrivs.json"); //获取当前系统所有实体资源能力
                 String permissionResult = IOUtils.toString(permission,"UTF-8");
-                JSONArray jsonNodePermission = JSONArray.parseArray(permissionResult);
-                Map<String,Object> map=new HashMap<String,Object>();
-                map.put("menu",new JSONArray());
+                JSONObject jsonNodePermission = JSONObject.parseObject(permissionResult);
+                Map<String,Object> map=new HashMap<>();
                 map.put("permission",jsonNodePermission);
                 client.pushSystemPermissionData(map,systemId);
             }