I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

细节优化

Browse Source 
bug修复
yun-zuoyi
yunhao.wang 6 years ago
parent 8e7550072b
commit f6ed505fc4
2 changed files with 54 additions and 51 deletions
Show Stats Download Patch File Download Diff File

16
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
Unescape Escape View File

@ -1,5 +1,7 @@
package cn.estsh.i3plus.pojo.form.sqlpack;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.form.bean.*;
import org.apache.commons.lang3.StringUtils;
@ -154,15 +156,15 @@ public final class FormHqlPack {
* @param bfIntercept 查询条件
* @return hql
*/
public static String packHqlBfIntercept(BfIntercept bfIntercept) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlBfIntercept(BfIntercept bfIntercept) {
DdlPackBean ddlPackBean = new DdlPackBean();
HqlPack.getStringLikerPack(bfIntercept.getInterceptName(), "interceptName", result);
HqlPack.getNumEqualPack(bfIntercept.getExecuteMode(), "executeMode", result);
HqlPack.getNumEqualPack(bfIntercept.getIsDeleted(), "isDeleted", result);
result.append(bfIntercept.orderBy());
DdlPreparedPack.getStringLikerPack(bfIntercept.getInterceptName(), "interceptName", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfIntercept.getExecuteMode(), "executeMode", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfIntercept.getIsDeleted(), "isDeleted", ddlPackBean);
ddlPackBean.setOrderByStr(bfIntercept.orderBy());
return result.toString();
return ddlPackBean;
}
/**

81
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java
Unescape Escape View File

@ -1,8 +1,6 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -11,7 +9,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@ -28,84 +25,88 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_TASK_PLAN")
@Api(value="任务计划",description = "任务计划")
@Table(name = "SYS_TASK_PLAN")
@Api(value = "任务计划", description = "任务计划")
public class SysTaskPlan extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="名称")
@Column(name = "NAME")
@ApiParam(value = "名称")
private String name;
@Column(name="GROUP_NAME")
@ApiParam(value ="组名称")
@Column(name = "GROUP_NAME")
@ApiParam(value = "组名称")
private String groupName;
@Column(name="TASK_CYCLE_ID")
@ApiParam(value ="任务周期ID" , example = "-1")
@Column(name = "TASK_CYCLE_ID")
@ApiParam(value = "任务周期ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskCycleId;
@Column(name="TASK_CYCLE_NAME_RDD")
@ApiParam(value ="任务周期名称")
@Column(name = "TASK_CYCLE_NAME_RDD")
@ApiParam(value = "任务周期名称")
private String taskCycleNameRdd;
@Column(name="TASK_CYCLE_EXPS_RDD")
@ApiParam(value ="任务周期表达式")
@Column(name = "TASK_CYCLE_EXPS_RDD")
@ApiParam(value = "任务周期表达式")
private String taskCycleExpsRdd;
@Column(name="TASK_PLAN_EXEC_NUM")
@ApiParam(value ="定时任务运行次数" , example ="0")
@Column(name = "TASK_PLAN_EXEC_NUM")
@ApiParam(value = "定时任务运行次数", example = "0")
private Integer taskPlanExecNum;
public int getTaskPlanExecNumValue(){
if(taskPlanExecNum == null){
/**
* 获取定时任务运行次数
* @return 定时任务运行次数
*/
public int getTaskPlanExecNumValue() {
if (taskPlanExecNum == null) {
return 0;
}else{
} else {
return taskPlanExecNum.intValue();
}
}
// 枚举 ImppEnumUtil.TASK_METHOD_TYPE.CLASS_METHOD
@Column(name="TASK_METHOD_TYPE")
@ApiParam(value ="任务执行类型" ,example = "-1")
@Column(name = "TASK_METHOD_TYPE")
@ApiParam(value = "任务执行类型", example = "-1")
private Integer taskMethodType;
@Column(name="TASK_ID")
@ApiParam(value ="定时任务id")
@Column(name = "TASK_ID")
@ApiParam(value = "定时任务id")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskId;
@Column(name="TASK_NAME_RDD")
@ApiParam(value ="定时任务名称")
@Column(name = "TASK_NAME_RDD")
@ApiParam(value = "定时任务名称")
private String taskNameRdd;
@Column(name="TASK_SOFT_TYPE_RDD")
@ApiParam(value ="任务所属模块")
@Column(name = "TASK_SOFT_TYPE_RDD")
@ApiParam(value = "任务所属模块")
private Integer taskSoftTypeRdd;
@Column(name="TASK_PLAN_PARAM")
@ApiParam(value ="任务计划参数")
@Column(name = "TASK_PLAN_PARAM")
@ApiParam(value = "任务计划参数")
private String taskPlanParam;
@Column(name="TASK_CYCLE_START_DATE_TIME_RDD")
@ApiParam(value ="任务开始时间")
@Column(name = "TASK_CYCLE_START_DATE_TIME_RDD")
@ApiParam(value = "任务开始时间")
private String taskCycleStartDateTimeRdd;
@Column(name="TASK_CYCLE_END_DATE_TIME_RDD")
@ApiParam(value ="任务结束时间")
@Column(name = "TASK_CYCLE_END_DATE_TIME_RDD")
@ApiParam(value = "任务结束时间")
private String taskCycleEndDateTimeRdd;
@Column(name="TASK_PLAN_DESCRIPTION")
@ApiParam(value ="任务计划描述" , access ="任务计划描述")
@Column(name = "TASK_PLAN_DESCRIPTION")
@ApiParam(value = "任务计划描述", access = "任务计划描述")
private String taskPlanDescription;
// 枚举 CommonEnumUtil.TRUE_OR_FALSE
@Column(name="TASK_PLAN_STATUS")
@ApiParam(value ="任务状态" , example ="1")
@Column(name = "TASK_PLAN_STATUS")
@ApiParam(value = "任务状态", example = "1")
private Integer taskPlanStatus;
@Column(name="LAST_RUN_DATE_TIME")
@ApiParam(value ="最后运行时间" , access ="最后运行时间")
@Column(name = "LAST_RUN_DATE_TIME")
@ApiParam(value = "最后运行时间", access = "最后运行时间")
private String lastRunDateTime;
// 枚举 CommonEnumUtil.TRUE_OR_FALSE

Write Preview
Loading…
Cancel
Save