Commit 9583a210 authored by suhuiguang's avatar suhuiguang

1.修改tybootksontime序列化问题

parent a747858b
package com.yeejoin.amos.maintenance.dao.entity; package com.yeejoin.amos.maintenance.dao.entity;
import org.springframework.data.annotation.LastModifiedDate;
import javax.persistence.*;
import java.sql.Time; import java.sql.Time;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.data.annotation.LastModifiedDate;
/** /**
* The persistent class for the p_plan database table. * The persistent class for the p_plan database table.
*
*/ */
@Entity @Entity
@Table(name="p_plan") @Table(name = "p_plan")
@NamedQuery(name="Plan.findAll", query="SELECT p FROM Plan p") @NamedQuery(name = "Plan.findAll", query = "SELECT p FROM Plan p")
public class Plan extends BasicEntity { public class Plan extends BasicEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 部门id * 部门id
*/ */
@Column(name="dept_id") @Column(name = "dept_id")
private String deptId; private String deptId;
/** /**
* 创建者 * 创建者
*/ */
@Column(name="create_by") @Column(name = "create_by")
private String createBy; private String createBy;
/** /**
* 开始时间 * 开始时间
*/ */
@Column(name="day_begin") @Column(name = "day_begin")
private Time dayBegin; private Time dayBegin;
/** /**
* 结束时间 * 结束时间
*/ */
@Column(name="day_end") @Column(name = "day_end")
private Time dayEnd; private Time dayEnd;
/** /**
* 执行间隔(每天执行频率为多次时使用) * 执行间隔(每天执行频率为多次时使用)
*/ */
@Column(name="day_interval") @Column(name = "day_interval")
private int dayInterval; private int dayInterval;
/** /**
* 执行间隔单位:小时,分钟,秒 * 执行间隔单位:小时,分钟,秒
*/ */
@Column(name="day_interval_unit") @Column(name = "day_interval_unit")
private String dayIntervalUnit; private String dayIntervalUnit;
/** /**
* 每天频率:0-一次;1-多次 * 每天频率:0-一次;1-多次
*/ */
@Column(name="day_rate") @Column(name = "day_rate")
private int dayRate = -1; private int dayRate = -1;
/** /**
* 开始时间(执行频率为一次时,使用) * 开始时间(执行频率为一次时,使用)
*/ */
@Column(name="day_time") @Column(name = "day_time")
private String dayTime; private String dayTime;
/** /**
* 工作时长(分钟) * 工作时长(分钟)
...@@ -111,82 +109,82 @@ public class Plan extends BasicEntity { ...@@ -111,82 +109,82 @@ public class Plan extends BasicEntity {
/** /**
* 执行频率(年计划使用) * 执行频率(年计划使用)
*/ */
@Column(name="execute_rate") @Column(name = "execute_rate")
private int executeRate; private int executeRate;
/** /**
* 排序 * 排序
*/ */
@Column(name="in_order") @Column(name = "in_order")
private String inOrder; private String inOrder;
/** /**
* 执行间隔 * 执行间隔
*/ */
@Column(name="execute_interval") @Column(name = "execute_interval")
private int executeInterval; private int executeInterval;
/** /**
* 是否固定巡检日期:0-否;1-是 * 是否固定巡检日期:0-否;1-是
*/ */
@Column(name="is_fixed_date") @Column(name = "is_fixed_date")
private String isFixedDate; private String isFixedDate;
/** /**
* 是否评分 * 是否评分
*/ */
@Column(name="is_score") @Column(name = "is_score")
private String isScore; private String isScore;
/** /**
* 最近更新者 * 最近更新者
*/ */
@Column(name="last_upd_by") @Column(name = "last_upd_by")
private String lastUpdBy; private String lastUpdBy;
/** /**
* 最近更新时间 * 最近更新时间
*/ */
@LastModifiedDate @LastModifiedDate
@Column(name="last_upd_time") @Column(name = "last_upd_time")
private Date lastUpdTime; private Date lastUpdTime;
/** /**
* 最少间隔 * 最少间隔
*/ */
@Column(name="min_space") @Column(name = "min_space")
private int minSpace; private int minSpace;
/** /**
* 月执行类型:第,在 * 月执行类型:第,在
*/ */
@Column(name="month_type") @Column(name = "month_type")
private String monthType; private String monthType;
/** /**
* 计划名称 * 计划名称
*/ */
@Column(name="[name]") @Column(name = "[name]")
private String name; private String name;
/** /**
* 下次任务生成日期 * 下次任务生成日期
*/ */
@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
@Column(name="next_gen_date") @Column(name = "next_gen_date")
private Date nextGenDate; private Date nextGenDate;
/** /**
* 公司Id * 公司Id
*/ */
@Column(name="org_code") @Column(name = "org_code")
private String orgCode; private String orgCode;
/** /**
* 计划开始日期 * 计划开始日期
*/ */
@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
@Column(name="plan_begin") @Column(name = "plan_begin")
private String planBegin; private String planBegin;
/** /**
* 计划结束日期 * 计划结束日期
*/ */
@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
@Column(name="plan_end") @Column(name = "plan_end")
private String planEnd; private String planEnd;
/** /**
* 计划类型:日,周,月,年 * 计划类型:日,周,月,年
*/ */
@Column(name="plan_type") @Column(name = "plan_type")
private String planType; private String planType;
/** /**
* 备注 * 备注
...@@ -203,28 +201,28 @@ public class Plan extends BasicEntity { ...@@ -203,28 +201,28 @@ public class Plan extends BasicEntity {
/** /**
* 路线编号 * 路线编号
*/ */
@Column(name="route_id") @Column(name = "route_id")
private long routeId; private long routeId;
/** /**
* 评分计算公式 * 评分计算公式
*/ */
@Column(name="score_formula") @Column(name = "score_formula")
private String scoreFormula; private String scoreFormula;
/** /**
* 状态:0-已停用;1-正常 * 状态:0-已停用;1-正常
*/ */
@Column(name="[status]") @Column(name = "[status]")
private byte status; private byte status;
/** /**
* 用户编号 * 用户编号
*/ */
@Column(name="user_id") @Column(name = "user_id")
private String userId; private String userId;
/** /**
* 用户名称(多个逗号分隔) * 用户名称(多个逗号分隔)
*/ */
@Column(name="user_name") @Column(name = "user_name")
private String userName; private String userName;
public String getUserName() { public String getUserName() {
...@@ -238,34 +236,34 @@ public class Plan extends BasicEntity { ...@@ -238,34 +236,34 @@ public class Plan extends BasicEntity {
/** /**
* 开始编号 * 开始编号
*/ */
@Column(name="week_begin_num") @Column(name = "week_begin_num")
private int weekBeginNum; private int weekBeginNum;
/** /**
* 周几 * 周几
*/ */
@Column(name="week_day") @Column(name = "week_day")
private int weekDay; private int weekDay;
/** /**
* 结束编号 * 结束编号
*/ */
@Column(name="week_end_num") @Column(name = "week_end_num")
private int weekEndNum; private int weekEndNum;
/** /**
* 哪一天 * 哪一天
*/ */
@Column(name="what_day") @Column(name = "what_day")
private String whatDay; private String whatDay;
/** /**
* 第几周 * 第几周
*/ */
@Column(name="what_week") @Column(name = "what_week")
private int whatWeek; private int whatWeek;
/** /**
* 是否删除:0表示未删除,1表示已删除 * 是否删除:0表示未删除,1表示已删除
*/ */
@Column(name="is_delete") @Column(name = "is_delete")
private boolean isDelete=false; private boolean isDelete = false;
/** /**
* 原始字段 * 原始字段
...@@ -274,22 +272,21 @@ public class Plan extends BasicEntity { ...@@ -274,22 +272,21 @@ public class Plan extends BasicEntity {
private String originalId; private String originalId;
/** /**
*
* 任务id * 任务id
*/ */
@Column(name="plan_task_id") @Column(name = "plan_task_id")
private Long planTaskId = 0L; private Long planTaskId = 0L;
/** /**
* 是否单人执行 * 是否单人执行
*/ */
@Column(name="is_single_execution") @Column(name = "is_single_execution")
private boolean isSingleExecution=false; private boolean isSingleExecution = false;
/** /**
* 用户部门 * 用户部门
*/ */
@Column(name="user_dept") @Column(name = "user_dept")
private String userDept; private String userDept;
public String getUserDept() { public String getUserDept() {
...@@ -401,9 +398,6 @@ public class Plan extends BasicEntity { ...@@ -401,9 +398,6 @@ public class Plan extends BasicEntity {
} }
public String getIsFixedDate() { public String getIsFixedDate() {
return this.isFixedDate; return this.isFixedDate;
} }
...@@ -579,6 +573,7 @@ public class Plan extends BasicEntity { ...@@ -579,6 +573,7 @@ public class Plan extends BasicEntity {
public void setWhatWeek(int whatWeek) { public void setWhatWeek(int whatWeek) {
this.whatWeek = whatWeek; this.whatWeek = whatWeek;
} }
public String getRemark1() { public String getRemark1() {
return remark1; return remark1;
} }
......
...@@ -24,6 +24,10 @@ ...@@ -24,6 +24,10 @@
<groupId>org.typroject</groupId> <groupId>org.typroject</groupId>
<artifactId>tyboot-core-auth</artifactId> <artifactId>tyboot-core-auth</artifactId>
</exclusion> </exclusion>
<exclusion>
<artifactId>fastjson</artifactId>
<groupId>com.alibaba</groupId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
...@@ -36,12 +40,6 @@ ...@@ -36,12 +40,6 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- 添加fastjson 依赖包. -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.15</version>
</dependency>
<dependency> <dependency>
<groupId>org.quartz-scheduler</groupId> <groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId> <artifactId>quartz</artifactId>
......
...@@ -13,11 +13,13 @@ import org.springframework.cloud.openfeign.EnableFeignClients; ...@@ -13,11 +13,13 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.FilterType;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.transaction.annotation.EnableTransactionManagement;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import org.typroject.tyboot.core.restful.config.JsonSerializerManage;
import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler; import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler;
import java.io.IOException; import java.io.IOException;
...@@ -42,8 +44,9 @@ import java.net.UnknownHostException; ...@@ -42,8 +44,9 @@ import java.net.UnknownHostException;
@EnableFeignClients @EnableFeignClients
@EnableAsync @EnableAsync
@EnableEurekaClient @EnableEurekaClient
@ComponentScan({"org.typroject", "com.yeejoin.amos"}) @ComponentScan(value = {"org.typroject", "com.yeejoin.amos"}, excludeFilters = {
@MapperScan(basePackages = {"com.yeejoin.amos.maintenance.business.dao.mapper", "org.typroject.tyboot.core.auth.face.orm.dao","com.yeejoin.amos.boot.biz.common.dao.mapper"}) @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {JsonSerializerManage.class})})
@MapperScan(basePackages = {"com.yeejoin.amos.maintenance.business.dao.mapper", "org.typroject.tyboot.core.auth.face.orm.dao", "com.yeejoin.amos.boot.biz.common.dao.mapper"})
public class MaintenanceApplication { public class MaintenanceApplication {
private static final Logger logger = LoggerFactory.getLogger(MaintenanceApplication.class); private static final Logger logger = LoggerFactory.getLogger(MaintenanceApplication.class);
...@@ -61,7 +64,7 @@ public class MaintenanceApplication { ...@@ -61,7 +64,7 @@ public class MaintenanceApplication {
* @throws IOException * @throws IOException
* @throws URISyntaxException * @throws URISyntaxException
*/ */
public static void main(String[] args) throws UnknownHostException{ public static void main(String[] args) throws UnknownHostException {
logger.info("start Service.........."); logger.info("start Service..........");
ConfigurableApplicationContext context = SpringApplication.run(MaintenanceApplication.class, args); ConfigurableApplicationContext context = SpringApplication.run(MaintenanceApplication.class, args);
GlobalExceptionHandler.setAlwaysOk(true); GlobalExceptionHandler.setAlwaysOk(true);
......
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