Skip to content

A
amos-boot-biz
Commit 70ee6c37 authored by 刘林's avatar 刘林
Browse files
Options

fix(jg):patrol服务添加计划报错问题修复

parent 444db462
Hide whitespace changes
Inline Side-by-side
Showing with 164 additions and 144 deletions
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/src/main/java/com/yeejoin/amos/patrol/core/common/request/MyIdGeneratorConfig.java
View file @ 70ee6c37
......@@ -18,27 +18,30 @@ import java.io.Serializable;
*/
public class MyIdGeneratorConfig implements IdentifierGenerator {
/**
* 终端ID
*/
@Value("${generator.worker_id}")
public long WORKER_ID;
@Value("${generator.worker_id:0}")
public long WORKER_ID;
/**
* 数据中心id
*/
@Value("${generator.datacenter_id}")
public long DATACENTER_ID;
@Value("${generator.datacenter_id:0}")
public long DATACENTER_ID;
private Snowflake snowflake = IdUtil.createSnowflake(WORKER_ID, DATACENTER_ID);
private Snowflake snowflake;
@PostConstruct
public void init() {
WORKER_ID = NetUtil.ipv4ToLong(NetUtil.getLocalhostStr());
snowflake = IdUtil.createSnowflake(WORKER_ID, DATACENTER_ID);
}
public synchronized long snowflakeId() {
if (snowflake == null) {
snowflake = IdUtil.createSnowflake(WORKER_ID, DATACENTER_ID);
}
return snowflake.nextId();
}
......@@ -47,13 +50,10 @@ public class MyIdGeneratorConfig implements IdentifierGenerator {
return snowflake.nextId();
}
@Override
public Serializable generate(SharedSessionContractImplementor session, Object object)
throws HibernateException {
return snowflakeId(WORKER_ID, DATACENTER_ID);
}
}
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/Plan.java
View file @ 70ee6c37
......@@ -2,249 +2,250 @@ package com.yeejoin.amos.patrol.dao.entity;
import org.springframework.data.annotation.LastModifiedDate;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import javax.persistence.*;
import java.sql.Time;
import java.util.Date;
/**
* The persistent class for the p_plan database table.
*
*/
@Entity
@Table(name="p_plan")
@NamedQuery(name="Plan.findAll", query="SELECT p FROM Plan p")
@Table(name = "p_plan")
@NamedQuery(name = "Plan.findAll", query = "SELECT p FROM Plan p")
public class Plan extends BasicEntity {
private static final long serialVersionUID = 1L;
/**
* 部门id
*/
@Column(name="dept_id")
@Column(name = "dept_id")
private String deptId;
/**
* 创建者
*/
@Column(name="create_by")
* 创建者
*/
@Column(name = "create_by")
private String createBy;
/**
* 开始时间
*/
@Column(name="day_begin")
* 开始时间
*/
@Column(name = "day_begin")
@JsonDeserialize(using = TimeDeserializer.class)
private Time dayBegin;
/**
* 结束时间
*/
@Column(name="day_end")
* 结束时间
*/
@Column(name = "day_end")
@JsonDeserialize(using = TimeDeserializer.class)
private Time dayEnd;
/**
* 执行间隔（每天执行频率为多次时使用）
*/
@Column(name="day_interval")
* 执行间隔（每天执行频率为多次时使用）
*/
@Column(name = "day_interval")
private int dayInterval;
/**
* 执行间隔单位：小时，分钟，秒
*/
@Column(name="day_interval_unit")
* 执行间隔单位：小时，分钟，秒
*/
@Column(name = "day_interval_unit")
private String dayIntervalUnit;
/**
* 每天频率：0-一次；1-多次
*/
@Column(name="day_rate")
* 每天频率：0-一次；1-多次
*/
@Column(name = "day_rate")
private int dayRate = -1;
/**
* 开始时间（执行频率为一次时，使用）
*/
@Column(name="day_time")
* 开始时间（执行频率为一次时，使用）
*/
@Column(name = "day_time")
private String dayTime;
/**
* 工作时长（分钟）
*/
* 工作时长（分钟）
*/
private int duration;
/**
* 首次标志
*/
* 首次标志
*/
private int firstFlag;
/**
* 允许误差(分钟)
*/
* 允许误差(分钟)
*/
private int error;
/**
* 执行频率（年计划使用）
*/
@Column(name="execute_rate")
* 执行频率（年计划使用）
*/
@Column(name = "execute_rate")
private int executeRate;
/**
* 排序
*/
@Column(name="in_order")
* 排序
*/
@Column(name = "in_order")
private String inOrder;
/**
* 执行间隔
*/
@Column(name="execute_interval")
* 执行间隔
*/
@Column(name = "execute_interval")
private int executeInterval;
/**
* 是否固定巡检日期：0-否；1-是
*/
@Column(name="is_fixed_date")
* 是否固定巡检日期：0-否；1-是
*/
@Column(name = "is_fixed_date")
private String isFixedDate;
/**
* 是否评分
*/
@Column(name="is_score")
* 是否评分
*/
@Column(name = "is_score")
private String isScore;
/**
* 最近更新者
*/
@Column(name="last_upd_by")
* 最近更新者
*/
@Column(name = "last_upd_by")
private String lastUpdBy;
/**
* 最近更新时间
*/
* 最近更新时间
*/
@LastModifiedDate
@Column(name="last_upd_time")
@Column(name = "last_upd_time")
private Date lastUpdTime;
/**
* 最少间隔
*/
@Column(name="min_space")
* 最少间隔
*/
@Column(name = "min_space")
private int minSpace;
/**
* 月执行类型：第，在
*/
@Column(name="month_type")
* 月执行类型：第，在
*/
@Column(name = "month_type")
private String monthType;
/**
* 计划名称
*/
@Column(name="[name]")
* 计划名称
*/
@Column(name = "[name]")
private String name;
/**
* 下次任务生成日期
*/
* 下次任务生成日期
*/
@Temporal(TemporalType.DATE)
@Column(name="next_gen_date")
@Column(name = "next_gen_date")
private Date nextGenDate;
/**
* 公司Id
*/
@Column(name="org_code")
* 公司Id
*/
@Column(name = "org_code")
private String orgCode;
/**
* 计划开始日期
*/
* 计划开始日期
*/
@Temporal(TemporalType.DATE)
@Column(name="plan_begin")
@Column(name = "plan_begin")
private String planBegin;
/**
* 计划结束日期
*/
* 计划结束日期
*/
@Temporal(TemporalType.DATE)
@Column(name="plan_end")
@Column(name = "plan_end")
private String planEnd;
/**
* 计划类型：日，周，月，年
*/
@Column(name="plan_type")
* 计划类型：日，周，月，年
*/
@Column(name = "plan_type")
private String planType;
/**
* 备注
*/
* 备注
*/
private String remark;
/**
* 备注1
*/
* 备注1
*/
private String remark1;
/**
* 备注2
*/
* 备注2
*/
private String remark2;
/**
* 路线编号
*/
@Column(name="route_id")
* 路线编号
*/
@Column(name = "route_id")
private long routeId;
/**
* 评分计算公式
*/
@Column(name="score_formula")
* 评分计算公式
*/
@Column(name = "score_formula")
private String scoreFormula;
/**
* 状态:0-已停用；1-正常
*/
@Column(name="[status]")
* 状态:0-已停用；1-正常
*/
@Column(name = "[status]")
private byte status;
/**
* 用户编号
*/
@Column(name="user_id")
* 用户编号
*/
@Column(name = "user_id")
private String userId;
/**
* 开始编号
*/
@Column(name="week_begin_num")
* 开始编号
*/
@Column(name = "week_begin_num")
private int weekBeginNum;
/**
* 周几
*/
@Column(name="week_day")
* 周几
*/
@Column(name = "week_day")
private int weekDay;
/**
* 结束编号
*/
@Column(name="week_end_num")
* 结束编号
*/
@Column(name = "week_end_num")
private int weekEndNum;
/**
* 哪一天
*/
@Column(name="what_day")
* 哪一天
*/
@Column(name = "what_day")
private String whatDay;
/**
* 第几周
*/
@Column(name="what_week")
* 第几周
*/
@Column(name = "what_week")
private int whatWeek;
/**
* 是否删除：0表示未删除，1表示已删除
*/
@Column(name="is_delete")
private boolean isDelete=false;
@Column(name = "is_delete")
private boolean isDelete = false;
/**
* 原始字段
*/
@Column(name = "original_id", columnDefinition = "varchar(50) COMMENT '原始字段'")
private String originalId;
/**
*
* 任务id
*/
@Column(name="plan_task_id")
*
* 任务id
*/
@Column(name = "plan_task_id")
private Long planTaskId = 0L;
/**
* 是否单人执行
*/
@Column(name="is_single_execution")
private boolean isSingleExecution=false;
@Column(name = "is_single_execution")
private boolean isSingleExecution = false;
/**
* 用户部门
*/
@Column(name="user_dept")
@Column(name = "user_dept")
private String userDept;
//单位code
// 单位code
@Column(name = "biz_org_code")
private String bizOrgCode;
//单位名称
// 单位名称
@Column(name = "biz_org_name")
private String bizOrgName;
......@@ -288,7 +289,7 @@ public class Plan extends BasicEntity {
public void setDeptId(String deptId) {
this.deptId = deptId;
}
public String getCreateBy() {
return this.createBy;
}
......@@ -297,7 +298,6 @@ public class Plan extends BasicEntity {
this.createBy = createBy;
}
public Time getDayBegin() {
return this.dayBegin;
}
......@@ -376,11 +376,7 @@ public class Plan extends BasicEntity {
public void setInOrder(String inOrder) {
this.inOrder = inOrder;
}
}
public String getIsFixedDate() {
return this.isFixedDate;
......@@ -604,7 +600,7 @@ public class Plan extends BasicEntity {
public void setOriginalId(String originalId) {
this.originalId = originalId;
}
public Long getPlanTaskId() {
return planTaskId;
}
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/TimeDeserializer.java 0 → 100644
View file @ 70ee6c37
package com.yeejoin.amos.patrol.dao.entity;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import java.io.IOException;
import java.sql.Time;
public class TimeDeserializer extends JsonDeserializer<Time> {
@Override
public Time deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
if (p.getCurrentToken().isNumeric()) {
long timeInMillis = p.getLongValue();
return new Time(timeInMillis);
} else if (p.getCurrentToken().isScalarValue()) {
String timeStr = p.getText();
if (timeStr != null && !timeStr.isEmpty()) {
return Time.valueOf(timeStr);
}
}
return null;
}
}
\ No newline at end of file
amos-boot-system-tzs/pom.xml
View file @ 70ee6c37
......@@ -17,7 +17,7 @@
<module>amos-boot-module-96333</module>
<module>amos-boot-module-common</module>
<module>amos-boot-module-cylinder</module>
<module>amos-boot-module-jczs</module>
<!-- <module>amos-boot-module-jczs</module> -->
<module>amos-boot-module-app</module>
<module>amos-boot-module-tzspatrol</module>
<!-- <module>amos-boot-module-ys</module>-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment