ibiz4j 发布系统代码

app_web/src/locale/lanres/entities/jobs-lock/jobs-lock_en_US.ts

@@ -2,6 +2,8 @@
 export default {
   fields: {
     id: '主键ID',
+    name: '名称',
+    owner: '持有者',
     create_time: '创建时间',
   },
 };
\ No newline at end of file

app_web/src/locale/lanres/entities/jobs-lock/jobs-lock_zh_CN.ts

 export default {
   fields: {
     id: '主键ID',
+    name: '名称',
+    owner: '持有者',
     create_time: '创建时间',
   },
 };
\ No newline at end of file

app_web/src/service/jobs-lock/jobs-lock-service-base.ts

@@ -31,7 +31,7 @@ export default class JobsLockServiceBase extends EntityService {
         this.APPLYDEKEY ='jobslock';
         this.APPDEKEY = 'id';
         this.APPDENAME = 'jobslocks';
-        this.APPDETEXT = '';
+        this.APPDETEXT = 'name';
         this.APPNAME = 'web';
         this.SYSTEMNAME = 'ibztask';
     }

app_web/src/service/jobs-log/jobs-log-service-base.ts

@@ -31,7 +31,7 @@ export default class JobsLogServiceBase extends EntityService {
         this.APPLYDEKEY ='jobslog';
         this.APPDEKEY = 'id';
         this.APPDENAME = 'jobslogs';
-        this.APPDETEXT = '';
+        this.APPDETEXT = 'handler';
         this.APPNAME = 'web';
         this.SYSTEMNAME = 'ibztask';
     }

ibztask-core/src/main/java/cn/ibizlab/core/task/domain/JobsLock.java

@@ -47,6 +47,20 @@ public class JobsLock extends EntityMP implements Serializable {
     @JSONField(name = "id")
     @JsonProperty("id")
     private BigInteger id;
+    /**
+     * 名称
+     */
+    @TableField(value = "name")
+    @JSONField(name = "name")
+    @JsonProperty("name")
+    private String name;
+    /**
+     * 持有者
+     */
+    @TableField(value = "owner")
+    @JSONField(name = "owner")
+    @JsonProperty("owner")
+    private String owner;
     /**
      * 创建时间
      */
@@ -58,6 +72,22 @@ public class JobsLock extends EntityMP implements Serializable {
 
 
 
+    /**
+     * 设置 [名称]
+     */
+    public void setName(String name){
+        this.name = name ;
+        this.modify("name",name);
+    }
+
+    /**
+     * 设置 [持有者]
+     */
+    public void setOwner(String owner){
+        this.owner = owner ;
+        this.modify("owner",owner);
+    }
+
     /**
      * 设置 [创建时间]
      */

ibztask-core/src/main/java/cn/ibizlab/core/task/filter/JobsLockSearchContext.java

@@ -27,6 +27,13 @@ import cn.ibizlab.core.task.domain.JobsLock;
 @Data
 public class JobsLockSearchContext extends QueryWrapperContext<JobsLock> {
 
+	private String n_name_like;//[名称]
+	public void setN_name_like(String n_name_like) {
+        this.n_name_like = n_name_like;
+        if(!ObjectUtils.isEmpty(this.n_name_like)){
+            this.getSearchCond().like("name", n_name_like);
+        }
+    }
 
     /**
 	 * 启用快速搜索
@@ -35,6 +42,9 @@ public class JobsLockSearchContext extends QueryWrapperContext<JobsLock> {
 	{
 		 this.query=query;
 		 if(!StringUtils.isEmpty(query)){
+            this.getSearchCond().and( wrapper ->
+                     wrapper.like("name", query)   
+            );
 		 }
 	}
 }

ibztask-core/src/main/java/cn/ibizlab/core/task/filter/JobsLogSearchContext.java

@@ -35,6 +35,9 @@ public class JobsLogSearchContext extends QueryWrapperContext<JobsLog> {
 	{
 		 this.query=query;
 		 if(!StringUtils.isEmpty(query)){
+            this.getSearchCond().and( wrapper ->
+                     wrapper.like("handler", query)   
+            );
 		 }
 	}
 }

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

@@ -60,11 +60,15 @@
 
 
     <!--输出实体[JOBS_LOCK]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-jobs_lock-10-3">
+    <changeSet author="a_A_5d9d78509" id="tab-jobs_lock-13-3">
         <createTable tableName="JOBS_LOCK">
                 <column name="ID" remarks="" type="BIGINT">
                     <constraints primaryKey="true" primaryKeyName="PK_JOBS_LOCK_ID"/>
                 </column>
+                <column name="NAME" remarks="" type="VARCHAR(30)">
+                </column>
+                <column name="OWNER" remarks="" type="VARCHAR(100)">
+                </column>
                 <column name="CREATE_TIME" remarks="" type="BIGINT">
                 </column>
         </createTable>
@@ -72,7 +76,7 @@
 
 
     <!--输出实体[JOBS_LOG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-jobs_log-28-4">
+    <changeSet author="a_A_5d9d78509" id="tab-jobs_log-29-4">
         <createTable tableName="JOBS_LOG">
                 <column name="ID" remarks="" type="BIGINT">
                     <constraints primaryKey="true" primaryKeyName="PK_JOBS_LOG_ID"/>

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

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="JobsLockResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATE_TIME`, t1.`ID` FROM `JOBS_LOCK` t1  ) t1 where id=#{id}]]>
+        <![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自动处理映射关系 -->
@@ -28,12 +28,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATE_TIME`, t1.`ID` FROM `JOBS_LOCK` t1  
+       <![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` FROM `JOBS_LOCK` t1  
+       <![CDATA[	SELECT t1.`CREATE_TIME`, t1.`ID`, t1.`NAME`, t1.`OWNER` FROM `JOBS_LOCK` t1  
 			]]>
     </sql>
 </mapper>

ibztask-provider/ibztask-provider-api/src/main/java/cn/ibizlab/api/dto/JobsLockDTO.java

@@ -31,6 +31,22 @@ public class JobsLockDTO extends DTOBase implements Serializable {
     @JsonProperty("id")
     private BigInteger id;
 
+    /**
+     * 属性 [NAME]
+     *
+     */
+    @JSONField(name = "name")
+    @JsonProperty("name")
+    private String name;
+
+    /**
+     * 属性 [OWNER]
+     *
+     */
+    @JSONField(name = "owner")
+    @JsonProperty("owner")
+    private String owner;
+
     /**
      * 属性 [CREATE_TIME]
      *
@@ -40,6 +56,22 @@ public class JobsLockDTO extends DTOBase implements Serializable {
     private BigInteger createTime;
 
 
+    /**
+     * 设置 [NAME]
+     */
+    public void setName(String  name){
+        this.name = name ;
+        this.modify("name",name);
+    }
+
+    /**
+     * 设置 [OWNER]
+     */
+    public void setOwner(String  owner){
+        this.owner = owner ;
+        this.modify("owner",owner);
+    }
+
     /**
      * 设置 [CREATE_TIME]
      */