ibiz4j 发布系统代码

app_web/src/components/app-picker/app-picker.vue

@@ -242,7 +242,7 @@ export default class AppPicker extends Vue {
      * @param {*} oldVal
      * @memberof AppPicker
      */
-    @Watch('value')
+    @Watch('value',{immediate: true})
     public onValueChange(newVal: any, oldVal: any) {
         this.curvalue = newVal;
         if (Object.is(this.editortype, 'dropdown') && this.valueitem) {

app_web/src/engine/view/md-view-engine.ts

@@ -367,6 +367,13 @@ export default class MDViewEngine extends ViewEngine {
      * @memberof MDViewEngine
      */
     public MDCtrlLoad(args: any[]) {
+        let cacheArray:Array<any> = [];
+        if(args.length >0){
+            args.forEach((item:any) =>{
+                cacheArray.push({srfkey:item.srfkey,srfmajortext:item.srfmajortext});
+            })
+        }
+        this.view.initNavData(cacheArray);
         if (this.view) {
             this.view.$emit('viewload', args);
         }

app_web/src/service/app/navdata-service.ts

@@ -63,6 +63,7 @@ export interface ServiceState {
 }
 
 import { Subject } from 'rxjs';
+
 /**
  * 导航数据服务
  * 
@@ -81,6 +82,15 @@ export default class NavDataService {
      */
     private static navDataService: NavDataService;
 
+    /**
+     * 缓存对象
+     *
+     * @private
+     * @type {(any)}
+     * @memberof NavDataService
+     */
+    private store:  any;
+
     /**
      * 服务状态
      * 
@@ -119,10 +129,11 @@ export default class NavDataService {
      * @returns {NavDataService}
      * @memberof NavDataService
      */
-    public static getInstance(): NavDataService {
+    public static getInstance(store: any): NavDataService {
         if (!NavDataService.navDataService) {
             NavDataService.navDataService = new NavDataService();
         }
+        this.navDataService.store = store;
         return this.navDataService;
     }
 
@@ -246,6 +257,15 @@ export default class NavDataService {
      * @memberof NavDataService
      */
     public getNavData(){
-        return this.navDataStack;
+        if(this.navDataStack && this.navDataStack.length >0){
+            this.navDataStack.forEach((item:any,index) =>{
+                if(item && item.data && this.navDataStack[index+1]){
+                    this.navDataStack[index+1] = Object.assign(this.navDataStack[index+1],{isselected:true});
+                }
+            })
+            return this.navDataStack;
+        }else{
+            return [];
+        }
     }
 }
\ No newline at end of file

ibztask-core/src/main/resources/mapper/task/jobsinfo/JobsInfoMapper.xml

@@ -10,6 +10,9 @@
 	<select id="selectById"  resultMap="JobsInfoResultMap" databaseId="oracle">
         <![CDATA[select t1.* from (SELECT t1.APP, t1.AUTHOR, t1.CREATE_TIME, t1.CRON, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.LAST_TIME, t1.NEXT_TIME, t1.PARAM, t1.REMARK, t1.STATUS, t1.TENANT_ID, t1.TIMEOUT, t1.UPDATE_TIME FROM JOBS_INFO t1  ) t1 where id=#{id}]]>
     </select>
+	<select id="selectById"  resultMap="JobsInfoResultMap" databaseId="postgresql">
+        <![CDATA[select t1.* from (SELECT t1.APP, t1.AUTHOR, t1.CREATE_TIME, t1.CRON, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.LAST_TIME, t1.NEXT_TIME, t1.PARAM, t1.REMARK, t1.STATUS, t1.TENANT_ID, t1.TIMEOUT, t1.UPDATE_TIME FROM JOBS_INFO t1  ) t1 where id=#{id}]]>
+    </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
     <resultMap id="JobsInfoResultMap" type="cn.ibizlab.core.task.domain.JobsInfo" autoMapping="true">
@@ -44,6 +47,11 @@
        <![CDATA[	SELECT t1.APP, t1.AUTHOR, t1.CREATE_TIME, t1.CRON, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.LAST_TIME, t1.NEXT_TIME, t1.PARAM, t1.REMARK, t1.STATUS, t1.TENANT_ID, t1.TIMEOUT, t1.UPDATE_TIME FROM JOBS_INFO t1  
 			]]>
     </sql>
+    <!--数据查询[Default]-->
+    <sql id="Default" databaseId="postgresql">
+       <![CDATA[	SELECT t1.APP, t1.AUTHOR, t1.CREATE_TIME, t1.CRON, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.LAST_TIME, t1.NEXT_TIME, t1.PARAM, t1.REMARK, t1.STATUS, t1.TENANT_ID, t1.TIMEOUT, t1.UPDATE_TIME FROM JOBS_INFO t1  
+			]]>
+    </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
        <![CDATA[	SELECT t1.`APP`, t1.`AUTHOR`, t1.`CREATE_TIME`, t1.`CRON`, t1.`FAIL_RETRY_COUNT`, t1.`HANDLER`, t1.`ID`, t1.`LAST_TIME`, t1.`NEXT_TIME`, t1.`PARAM`, t1.`REMARK`, t1.`STATUS`, t1.`TENANT_ID`, t1.`TIMEOUT`, t1.`UPDATE_TIME` FROM `JOBS_INFO` t1  
@@ -54,5 +62,10 @@
        <![CDATA[	SELECT t1.APP, t1.AUTHOR, t1.CREATE_TIME, t1.CRON, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.LAST_TIME, t1.NEXT_TIME, t1.PARAM, t1.REMARK, t1.STATUS, t1.TENANT_ID, t1.TIMEOUT, t1.UPDATE_TIME FROM JOBS_INFO t1  
 			]]>
     </sql>
+    <!--数据查询[View]-->
+    <sql id="View" databaseId="postgresql">
+       <![CDATA[	SELECT t1.APP, t1.AUTHOR, t1.CREATE_TIME, t1.CRON, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.LAST_TIME, t1.NEXT_TIME, t1.PARAM, t1.REMARK, t1.STATUS, t1.TENANT_ID, t1.TIMEOUT, t1.UPDATE_TIME FROM JOBS_INFO t1  
+			]]>
+    </sql>
 </mapper>
 

ibztask-core/src/main/resources/mapper/task/jobslock/JobsLockMapper.xml

@@ -10,6 +10,9 @@
 	<select id="selectById"  resultMap="JobsLockResultMap" databaseId="oracle">
         <![CDATA[select t1.* from (SELECT t1.CREATE_TIME, t1.ID, t1.NAME, t1.OWNER FROM JOBS_LOCK t1  ) t1 where id=#{id}]]>
     </select>
+	<select id="selectById"  resultMap="JobsLockResultMap" databaseId="postgresql">
+        <![CDATA[select t1.* from (SELECT t1.CREATE_TIME, t1.ID, t1.NAME, t1.OWNER FROM JOBS_LOCK t1  ) t1 where id=#{id}]]>
+    </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
     <resultMap id="JobsLockResultMap" type="cn.ibizlab.core.task.domain.JobsLock" autoMapping="true">
@@ -39,6 +42,11 @@
        <![CDATA[	SELECT t1.CREATE_TIME, t1.ID, t1.NAME, t1.OWNER FROM JOBS_LOCK t1  
 			]]>
     </sql>
+    <!--数据查询[Default]-->
+    <sql id="Default" databaseId="postgresql">
+       <![CDATA[	SELECT t1.CREATE_TIME, t1.ID, t1.NAME, t1.OWNER FROM JOBS_LOCK t1  
+			]]>
+    </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
        <![CDATA[	SELECT t1.`CREATE_TIME`, t1.`ID`, t1.`NAME`, t1.`OWNER` FROM `JOBS_LOCK` t1  
@@ -49,5 +57,10 @@
        <![CDATA[	SELECT t1.CREATE_TIME, t1.ID, t1.NAME, t1.OWNER FROM JOBS_LOCK t1  
 			]]>
     </sql>
+    <!--数据查询[View]-->
+    <sql id="View" databaseId="postgresql">
+       <![CDATA[	SELECT t1.CREATE_TIME, t1.ID, t1.NAME, t1.OWNER FROM JOBS_LOCK t1  
+			]]>
+    </sql>
 </mapper>
 

ibztask-core/src/main/resources/mapper/task/jobslog/JobsLogMapper.xml

@@ -10,6 +10,9 @@
 	<select id="selectById"  resultMap="JobsLogResultMap" databaseId="oracle">
         <![CDATA[select t1.* from (SELECT t1.ADDRESS, t1.CREATE_TIME, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.JOB_ID, t1.PARAM, t1.TRIGGER_CODE, t1.TRIGGER_MSG, t1.TRIGGER_TYPE FROM JOBS_LOG t1  ) t1 where id=#{id}]]>
     </select>
+	<select id="selectById"  resultMap="JobsLogResultMap" databaseId="postgresql">
+        <![CDATA[select t1.* from (SELECT t1.ADDRESS, t1.CREATE_TIME, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.JOB_ID, t1.PARAM, t1.TRIGGER_CODE, t1.TRIGGER_MSG, t1.TRIGGER_TYPE FROM JOBS_LOG t1  ) t1 where id=#{id}]]>
+    </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
     <resultMap id="JobsLogResultMap" type="cn.ibizlab.core.task.domain.JobsLog" autoMapping="true">
@@ -44,6 +47,11 @@
        <![CDATA[	SELECT t1.ADDRESS, t1.CREATE_TIME, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.JOB_ID, t1.PARAM, t1.TRIGGER_CODE, t1.TRIGGER_TYPE FROM JOBS_LOG t1  
 			]]>
     </sql>
+    <!--数据查询[Default]-->
+    <sql id="Default" databaseId="postgresql">
+       <![CDATA[	SELECT t1.ADDRESS, t1.CREATE_TIME, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.JOB_ID, t1.PARAM, t1.TRIGGER_CODE, t1.TRIGGER_TYPE FROM JOBS_LOG t1  
+			]]>
+    </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
        <![CDATA[	SELECT t1.`ADDRESS`, t1.`CREATE_TIME`, t1.`FAIL_RETRY_COUNT`, t1.`HANDLER`, t1.`ID`, t1.`JOB_ID`, t1.`PARAM`, t1.`TRIGGER_CODE`, t1.`TRIGGER_MSG`, t1.`TRIGGER_TYPE` FROM `JOBS_LOG` t1  
@@ -54,5 +62,10 @@
        <![CDATA[	SELECT t1.ADDRESS, t1.CREATE_TIME, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.JOB_ID, t1.PARAM, t1.TRIGGER_CODE, t1.TRIGGER_MSG, t1.TRIGGER_TYPE FROM JOBS_LOG t1  
 			]]>
     </sql>
+    <!--数据查询[View]-->
+    <sql id="View" databaseId="postgresql">
+       <![CDATA[	SELECT t1.ADDRESS, t1.CREATE_TIME, t1.FAIL_RETRY_COUNT, t1.HANDLER, t1.ID, t1.JOB_ID, t1.PARAM, t1.TRIGGER_CODE, t1.TRIGGER_MSG, t1.TRIGGER_TYPE FROM JOBS_LOG t1  
+			]]>
+    </sql>
 </mapper>
 

ibztask-core/src/main/resources/mapper/task/jobsregistry/JobsRegistryMapper.xml

@@ -10,6 +10,9 @@
 	<select id="selectById"  resultMap="JobsRegistryResultMap" databaseId="oracle">
         <![CDATA[select t1.* from (SELECT t1.ADDRESS, t1.APP, t1.ID, t1.STATUS, t1.UPDATE_TIME FROM JOBS_REGISTRY t1  ) t1 where id=#{id}]]>
     </select>
+	<select id="selectById"  resultMap="JobsRegistryResultMap" databaseId="postgresql">
+        <![CDATA[select t1.* from (SELECT t1.ADDRESS, t1.APP, t1.ID, t1.STATUS, t1.UPDATE_TIME FROM JOBS_REGISTRY t1  ) t1 where id=#{id}]]>
+    </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
     <resultMap id="JobsRegistryResultMap" type="cn.ibizlab.core.task.domain.JobsRegistry" autoMapping="true">
@@ -39,6 +42,11 @@
        <![CDATA[	SELECT t1.ADDRESS, t1.APP, t1.ID, t1.STATUS, t1.UPDATE_TIME FROM JOBS_REGISTRY t1  
 			]]>
     </sql>
+    <!--数据查询[Default]-->
+    <sql id="Default" databaseId="postgresql">
+       <![CDATA[	SELECT t1.ADDRESS, t1.APP, t1.ID, t1.STATUS, t1.UPDATE_TIME FROM JOBS_REGISTRY t1  
+			]]>
+    </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
        <![CDATA[	SELECT t1.`ADDRESS`, t1.`APP`, t1.`ID`, t1.`STATUS`, t1.`UPDATE_TIME` FROM `JOBS_REGISTRY` t1  
@@ -49,5 +57,10 @@
        <![CDATA[	SELECT t1.ADDRESS, t1.APP, t1.ID, t1.STATUS, t1.UPDATE_TIME FROM JOBS_REGISTRY t1  
 			]]>
     </sql>
+    <!--数据查询[View]-->
+    <sql id="View" databaseId="postgresql">
+       <![CDATA[	SELECT t1.ADDRESS, t1.APP, t1.ID, t1.STATUS, t1.UPDATE_TIME FROM JOBS_REGISTRY t1  
+			]]>
+    </sql>
 </mapper>