Commit c076747ea9f5f22428bfb9d8e13934e06aa4a516

Authored by 王通
1 parent e7e841a7

1.@GeneratedValue(strategy = GenerationType.IDENTITY),springboot1中默认值AUTO可用,版本2必须用自增长

Showing 53 changed files with 54 additions and 154 deletions
src/main/java/com/bsth/entity/Business.java
@@ -29,7 +29,7 @@ public class Business { @@ -29,7 +29,7 @@ public class Business {
29 29
30 // ID 30 // ID
31 @Id 31 @Id
32 - @GeneratedValue(strategy = GenerationType.IDENTITY)(strategy = GenerationType.IDENTITY) 32 + @GeneratedValue(strategy = GenerationType.IDENTITY)
33 private Integer id; 33 private Integer id;
34 34
35 // 企业<公司>名称 35 // 企业<公司>名称
src/main/java/com/bsth/entity/LineInformation.java
@@ -28,7 +28,7 @@ import javax.persistence.Table; @@ -28,7 +28,7 @@ import javax.persistence.Table;
28 public class LineInformation { 28 public class LineInformation {
29 29
30 @Id 30 @Id
31 - @GeneratedValue(strategy = GenerationType.IDENTITY)(strategy = GenerationType.IDENTITY) 31 + @GeneratedValue(strategy = GenerationType.IDENTITY)
32 private Integer id; 32 private Integer id;
33 33
34 // 线路标准信息类型 34 // 线路标准信息类型
src/main/java/com/bsth/entity/LineVersions.java
@@ -28,7 +28,7 @@ import javax.persistence.Table; @@ -28,7 +28,7 @@ import javax.persistence.Table;
28 public class LineVersions{ 28 public class LineVersions{
29 29
30 @Id 30 @Id
31 - @GeneratedValue(strategy = GenerationType.IDENTITY)(strategy = GenerationType.IDENTITY) 31 + @GeneratedValue(strategy = GenerationType.IDENTITY)
32 /** ID 主键(唯一标识符) int length(11) */ 32 /** ID 主键(唯一标识符) int length(11) */
33 private Integer id; 33 private Integer id;
34 34
src/main/java/com/bsth/entity/LsSectionRoute.java
@@ -29,7 +29,7 @@ import javax.persistence.Table; @@ -29,7 +29,7 @@ import javax.persistence.Table;
29 public class LsSectionRoute { 29 public class LsSectionRoute {
30 30
31 @Id 31 @Id
32 - @GeneratedValue(strategy = GenerationType.IDENTITY)(strategy = GenerationType.IDENTITY) 32 + @GeneratedValue(strategy = GenerationType.IDENTITY)
33 private Integer id; 33 private Integer id;
34 34
35 // 路段路由序号 35 // 路段路由序号
src/main/java/com/bsth/entity/LsStationRoute.java
@@ -27,7 +27,7 @@ public class LsStationRoute { @@ -27,7 +27,7 @@ public class LsStationRoute {
27 27
28 //站点路由ID 28 //站点路由ID
29 @Id 29 @Id
30 - @GeneratedValue(strategy = GenerationType.IDENTITY)(strategy = GenerationType.IDENTITY) 30 + @GeneratedValue(strategy = GenerationType.IDENTITY)
31 private Integer id; 31 private Integer id;
32 32
33 // 站点路由序号 33 // 站点路由序号
src/main/java/com/bsth/entity/Refuel.java
@@ -2,10 +2,7 @@ package com.bsth.entity; @@ -2,10 +2,7 @@ package com.bsth.entity;
2 2
3 import java.util.Date; 3 import java.util.Date;
4 4
5 -import javax.persistence.Entity;  
6 -import javax.persistence.GeneratedValue;  
7 -import javax.persistence.Id;  
8 -import javax.persistence.Table; 5 +import javax.persistence.*;
9 6
10 /** 7 /**
11 * Created in 19/9/3. 8 * Created in 19/9/3.
src/main/java/com/bsth/entity/Road.java
@@ -9,7 +9,7 @@ import javax.persistence.Table; @@ -9,7 +9,7 @@ import javax.persistence.Table;
9 public class Road { 9 public class Road {
10 10
11 @Id 11 @Id
12 - /*@GeneratedValue(strategy = GenerationType.IDENTITY)(strategy = GenerationType.IDENTITY)*/ 12 + /*@GeneratedValue(strategy = GenerationType.IDENTITY)*/
13 private Integer id; 13 private Integer id;
14 14
15 // 路段编码 15 // 路段编码
src/main/java/com/bsth/entity/RoadSpeed.java
@@ -14,7 +14,7 @@ import javax.persistence.Table; @@ -14,7 +14,7 @@ import javax.persistence.Table;
14 public class RoadSpeed { 14 public class RoadSpeed {
15 15
16 @Id 16 @Id
17 - @GeneratedValue(strategy = GenerationType.IDENTITY)(strategy = GenerationType.IDENTITY) 17 + @GeneratedValue(strategy = GenerationType.IDENTITY)
18 private Integer id; 18 private Integer id;
19 19
20 // 路段名称 20 // 路段名称
src/main/java/com/bsth/entity/Section.java
@@ -28,7 +28,7 @@ import javax.persistence.Table; @@ -28,7 +28,7 @@ import javax.persistence.Table;
28 public class Section { 28 public class Section {
29 29
30 @Id 30 @Id
31 - /*@GeneratedValue(strategy = GenerationType.IDENTITY)(strategy = GenerationType.IDENTITY)*/ 31 + /*@GeneratedValue(strategy = GenerationType.IDENTITY)*/
32 private Integer id; 32 private Integer id;
33 33
34 // 路段编码 34 // 路段编码
src/main/java/com/bsth/entity/SectionRoute.java
@@ -31,7 +31,7 @@ import javax.persistence.Table; @@ -31,7 +31,7 @@ import javax.persistence.Table;
31 public class SectionRoute { 31 public class SectionRoute {
32 32
33 @Id 33 @Id
34 - @GeneratedValue(strategy = GenerationType.IDENTITY)(strategy = GenerationType.IDENTITY) 34 + @GeneratedValue(strategy = GenerationType.IDENTITY)
35 private Integer id; 35 private Integer id;
36 36
37 // 路段路由序号 37 // 路段路由序号
src/main/java/com/bsth/entity/SectionRouteCache.java
@@ -31,7 +31,7 @@ import javax.persistence.Table; @@ -31,7 +31,7 @@ import javax.persistence.Table;
31 public class SectionRouteCache { 31 public class SectionRouteCache {
32 32
33 @Id 33 @Id
34 - @GeneratedValue(strategy = GenerationType.IDENTITY)(strategy = GenerationType.IDENTITY) 34 + @GeneratedValue(strategy = GenerationType.IDENTITY)
35 private Integer id; 35 private Integer id;
36 36
37 // 路段路由序号 37 // 路段路由序号
src/main/java/com/bsth/entity/SectionSpeed.java
@@ -21,7 +21,7 @@ import javax.persistence.Table; @@ -21,7 +21,7 @@ import javax.persistence.Table;
21 public class SectionSpeed { 21 public class SectionSpeed {
22 22
23 @Id 23 @Id
24 - @GeneratedValue(strategy = GenerationType.IDENTITY)(strategy = GenerationType.IDENTITY) 24 + @GeneratedValue(strategy = GenerationType.IDENTITY)
25 private Integer id; 25 private Integer id;
26 26
27 // 线路信息 27 // 线路信息
src/main/java/com/bsth/entity/Station.java
@@ -31,7 +31,7 @@ import java.util.Date; @@ -31,7 +31,7 @@ import java.util.Date;
31 public class Station { 31 public class Station {
32 32
33 @Id 33 @Id
34 - /*@GeneratedValue(strategy = GenerationType.IDENTITY)(strategy = GenerationType.IDENTITY)*/ 34 + /*@GeneratedValue(strategy = GenerationType.IDENTITY)*/
35 private Integer id; 35 private Integer id;
36 36
37 // 站点编码 37 // 站点编码
src/main/java/com/bsth/entity/StationRoute.java
@@ -29,7 +29,7 @@ public class StationRoute { @@ -29,7 +29,7 @@ public class StationRoute {
29 29
30 //站点路由ID 30 //站点路由ID
31 @Id 31 @Id
32 - @GeneratedValue(strategy = GenerationType.IDENTITY)(strategy = GenerationType.IDENTITY) 32 + @GeneratedValue(strategy = GenerationType.IDENTITY)
33 private Integer id; 33 private Integer id;
34 34
35 // 站点路由序号 35 // 站点路由序号
src/main/java/com/bsth/entity/StationRouteCache.java
@@ -30,7 +30,7 @@ public class StationRouteCache { @@ -30,7 +30,7 @@ public class StationRouteCache {
30 30
31 //站点路由ID 31 //站点路由ID
32 @Id 32 @Id
33 - @GeneratedValue(strategy = GenerationType.IDENTITY)(strategy = GenerationType.IDENTITY) 33 + @GeneratedValue(strategy = GenerationType.IDENTITY)
34 private Integer id; 34 private Integer id;
35 35
36 // 站点路由序号 36 // 站点路由序号
src/main/java/com/bsth/entity/calc/CalcBusMileage.java
@@ -2,10 +2,7 @@ package com.bsth.entity.calc; @@ -2,10 +2,7 @@ package com.bsth.entity.calc;
2 2
3 import java.util.Date; 3 import java.util.Date;
4 4
5 -import javax.persistence.Entity;  
6 -import javax.persistence.GeneratedValue;  
7 -import javax.persistence.Id;  
8 -import javax.persistence.Table; 5 +import javax.persistence.*;
9 6
10 @Entity 7 @Entity
11 @Table(name = "calc_bus_mileage") 8 @Table(name = "calc_bus_mileage")
src/main/java/com/bsth/entity/calc/CalcInterval.java
@@ -2,11 +2,7 @@ package com.bsth.entity.calc; @@ -2,11 +2,7 @@ package com.bsth.entity.calc;
2 2
3 import java.util.Date; 3 import java.util.Date;
4 4
5 -import javax.persistence.Entity;  
6 -import javax.persistence.GeneratedValue;  
7 -import javax.persistence.Id;  
8 -import javax.persistence.Table;  
9 -import javax.persistence.Transient; 5 +import javax.persistence.*;
10 6
11 import com.bsth.data.BasicData; 7 import com.bsth.data.BasicData;
12 8
src/main/java/com/bsth/entity/calc/CalcLbStatuAnaly.java
@@ -2,10 +2,7 @@ package com.bsth.entity.calc; @@ -2,10 +2,7 @@ package com.bsth.entity.calc;
2 2
3 import java.util.Date; 3 import java.util.Date;
4 4
5 -import javax.persistence.Entity;  
6 -import javax.persistence.GeneratedValue;  
7 -import javax.persistence.Id;  
8 -import javax.persistence.Table; 5 +import javax.persistence.*;
9 6
10 @Entity 7 @Entity
11 @Table(name = "calc_lb_statu_analy") 8 @Table(name = "calc_lb_statu_analy")
src/main/java/com/bsth/entity/calc/CalcLineMileage.java
@@ -2,10 +2,7 @@ package com.bsth.entity.calc; @@ -2,10 +2,7 @@ package com.bsth.entity.calc;
2 2
3 import java.util.Date; 3 import java.util.Date;
4 4
5 -import javax.persistence.Entity;  
6 -import javax.persistence.GeneratedValue;  
7 -import javax.persistence.Id;  
8 -import javax.persistence.Table; 5 +import javax.persistence.*;
9 6
10 @Entity 7 @Entity
11 @Table(name = "calc_line_mileage") 8 @Table(name = "calc_line_mileage")
src/main/java/com/bsth/entity/calc/CalcStatistics.java
@@ -2,11 +2,7 @@ package com.bsth.entity.calc; @@ -2,11 +2,7 @@ package com.bsth.entity.calc;
2 2
3 import java.util.Date; 3 import java.util.Date;
4 4
5 -import javax.persistence.Entity;  
6 -import javax.persistence.GeneratedValue;  
7 -import javax.persistence.Id;  
8 -import javax.persistence.Table;  
9 -import javax.persistence.Transient; 5 +import javax.persistence.*;
10 6
11 @Entity 7 @Entity
12 @Table(name = "calc_statistics") 8 @Table(name = "calc_statistics")
src/main/java/com/bsth/entity/calc/CalcWaybill.java
@@ -2,10 +2,7 @@ package com.bsth.entity.calc; @@ -2,10 +2,7 @@ package com.bsth.entity.calc;
2 2
3 import java.util.Date; 3 import java.util.Date;
4 4
5 -import javax.persistence.Entity;  
6 -import javax.persistence.GeneratedValue;  
7 -import javax.persistence.Id;  
8 -import javax.persistence.Table; 5 +import javax.persistence.*;
9 6
10 @Entity 7 @Entity
11 @Table(name = "calc_waybill") 8 @Table(name = "calc_waybill")
src/main/java/com/bsth/entity/directive/D64.java
1 package com.bsth.entity.directive; 1 package com.bsth.entity.directive;
2 2
3 -import javax.persistence.Table;  
4 -import javax.persistence.Transient;  
5 -import javax.persistence.Embeddable;  
6 -import javax.persistence.Entity;  
7 -import javax.persistence.GeneratedValue;  
8 -import javax.persistence.Id; 3 +import javax.persistence.*;
9 4
10 /** 5 /**
11 * 6 *
src/main/java/com/bsth/entity/excep/Abnormal.java
1 package com.bsth.entity.excep; 1 package com.bsth.entity.excep;
2 2
3 -import javax.persistence.Entity;  
4 -import javax.persistence.GeneratedValue;  
5 -import javax.persistence.Id;  
6 -import javax.persistence.Table; 3 +import javax.persistence.*;
7 4
8 /** 5 /**
9 * 6 *
src/main/java/com/bsth/entity/excep/Offline.java
@@ -2,11 +2,7 @@ package com.bsth.entity.excep; @@ -2,11 +2,7 @@ package com.bsth.entity.excep;
2 2
3 import java.util.Date; 3 import java.util.Date;
4 4
5 -import javax.persistence.Entity;  
6 -import javax.persistence.GeneratedValue;  
7 -import javax.persistence.Id;  
8 -import javax.persistence.Table;  
9 -import javax.persistence.Transient; 5 +import javax.persistence.*;
10 6
11 /** 7 /**
12 * 掉线 8 * 掉线
src/main/java/com/bsth/entity/excep/Outbound.java
@@ -2,11 +2,7 @@ package com.bsth.entity.excep; @@ -2,11 +2,7 @@ package com.bsth.entity.excep;
2 2
3 import java.util.Date; 3 import java.util.Date;
4 4
5 -import javax.persistence.Entity;  
6 -import javax.persistence.GeneratedValue;  
7 -import javax.persistence.Id;  
8 -import javax.persistence.Table;  
9 -import javax.persistence.Transient; 5 +import javax.persistence.*;
10 6
11 /** 7 /**
12 * 越界 8 * 越界
src/main/java/com/bsth/entity/excep/Speeding.java
@@ -2,11 +2,7 @@ package com.bsth.entity.excep; @@ -2,11 +2,7 @@ package com.bsth.entity.excep;
2 2
3 import java.util.Date; 3 import java.util.Date;
4 4
5 -import javax.persistence.Entity;  
6 -import javax.persistence.GeneratedValue;  
7 -import javax.persistence.Id;  
8 -import javax.persistence.Table;  
9 -import javax.persistence.Transient; 5 +import javax.persistence.*;
10 6
11 /** 7 /**
12 * 超速 8 * 超速
src/main/java/com/bsth/entity/logger/Logger.java
1 package com.bsth.entity.logger; 1 package com.bsth.entity.logger;
2 2
3 import javax.persistence.GeneratedValue; 3 import javax.persistence.GeneratedValue;
  4 +import javax.persistence.GenerationType;
4 import javax.persistence.Id; 5 import javax.persistence.Id;
5 import javax.persistence.MappedSuperclass; 6 import javax.persistence.MappedSuperclass;
6 7
src/main/java/com/bsth/entity/mcy_forms/Changetochange.java
1 package com.bsth.entity.mcy_forms; 1 package com.bsth.entity.mcy_forms;
2 2
3 -import javax.persistence.Entity;  
4 -import javax.persistence.GeneratedValue;  
5 -import javax.persistence.Id;  
6 -import javax.persistence.Table; 3 +import javax.persistence.*;
7 4
8 @Entity 5 @Entity
9 @Table(name = "bsth_c_chtoch") 6 @Table(name = "bsth_c_chtoch")
src/main/java/com/bsth/entity/oil/Cdl.java
@@ -2,11 +2,7 @@ package com.bsth.entity.oil; @@ -2,11 +2,7 @@ package com.bsth.entity.oil;
2 2
3 import java.util.Date; 3 import java.util.Date;
4 4
5 -import javax.persistence.Entity;  
6 -import javax.persistence.GeneratedValue;  
7 -import javax.persistence.Id;  
8 -import javax.persistence.Table;  
9 -import javax.persistence.Transient; 5 +import javax.persistence.*;
10 6
11 import com.bsth.data.BasicData; 7 import com.bsth.data.BasicData;
12 8
src/main/java/com/bsth/entity/oil/Cwjy.java
@@ -2,11 +2,7 @@ package com.bsth.entity.oil; @@ -2,11 +2,7 @@ package com.bsth.entity.oil;
2 2
3 import java.util.Date; 3 import java.util.Date;
4 4
5 -import javax.persistence.Entity;  
6 -import javax.persistence.GeneratedValue;  
7 -import javax.persistence.Id;  
8 -import javax.persistence.Table;  
9 -import javax.persistence.Transient; 5 +import javax.persistence.*;
10 6
11 import com.bsth.data.BasicData; 7 import com.bsth.data.BasicData;
12 8
src/main/java/com/bsth/entity/oil/Cyl.java
@@ -2,11 +2,7 @@ package com.bsth.entity.oil; @@ -2,11 +2,7 @@ package com.bsth.entity.oil;
2 2
3 import java.util.Date; 3 import java.util.Date;
4 4
5 -import javax.persistence.Entity;  
6 -import javax.persistence.GeneratedValue;  
7 -import javax.persistence.Id;  
8 -import javax.persistence.Table;  
9 -import javax.persistence.Transient; 5 +import javax.persistence.*;
10 6
11 import com.bsth.data.BasicData; 7 import com.bsth.data.BasicData;
12 8
src/main/java/com/bsth/entity/oil/Dlb.java
@@ -3,11 +3,7 @@ package com.bsth.entity.oil; @@ -3,11 +3,7 @@ package com.bsth.entity.oil;
3 import java.text.DecimalFormat; 3 import java.text.DecimalFormat;
4 import java.util.Date; 4 import java.util.Date;
5 5
6 -import javax.persistence.Entity;  
7 -import javax.persistence.GeneratedValue;  
8 -import javax.persistence.Id;  
9 -import javax.persistence.Table;  
10 -import javax.persistence.Transient; 6 +import javax.persistence.*;
11 7
12 import org.springframework.format.annotation.DateTimeFormat; 8 import org.springframework.format.annotation.DateTimeFormat;
13 9
src/main/java/com/bsth/entity/oil/Jdl.java
@@ -2,10 +2,7 @@ package com.bsth.entity.oil; @@ -2,10 +2,7 @@ package com.bsth.entity.oil;
2 2
3 import java.util.Date; 3 import java.util.Date;
4 4
5 -import javax.persistence.Entity;  
6 -import javax.persistence.GeneratedValue;  
7 -import javax.persistence.Id;  
8 -import javax.persistence.Table; 5 +import javax.persistence.*;
9 6
10 import org.springframework.format.annotation.DateTimeFormat; 7 import org.springframework.format.annotation.DateTimeFormat;
11 8
src/main/java/com/bsth/entity/oil/Lsylb.java
@@ -3,11 +3,7 @@ package com.bsth.entity.oil; @@ -3,11 +3,7 @@ package com.bsth.entity.oil;
3 import java.text.DecimalFormat; 3 import java.text.DecimalFormat;
4 import java.util.Date; 4 import java.util.Date;
5 5
6 -import javax.persistence.Entity;  
7 -import javax.persistence.GeneratedValue;  
8 -import javax.persistence.Id;  
9 -import javax.persistence.Table;  
10 -import javax.persistence.Transient; 6 +import javax.persistence.*;
11 7
12 import org.springframework.format.annotation.DateTimeFormat; 8 import org.springframework.format.annotation.DateTimeFormat;
13 9
src/main/java/com/bsth/entity/oil/Nylog.java
@@ -2,10 +2,7 @@ package com.bsth.entity.oil; @@ -2,10 +2,7 @@ package com.bsth.entity.oil;
2 2
3 import java.util.Date; 3 import java.util.Date;
4 4
5 -import javax.persistence.Entity;  
6 -import javax.persistence.GeneratedValue;  
7 -import javax.persistence.Id;  
8 -import javax.persistence.Table; 5 +import javax.persistence.*;
9 6
10 @Entity 7 @Entity
11 @Table(name = "bsth_c_nylog") 8 @Table(name = "bsth_c_nylog")
src/main/java/com/bsth/entity/oil/Ylb.java
@@ -3,11 +3,7 @@ package com.bsth.entity.oil; @@ -3,11 +3,7 @@ package com.bsth.entity.oil;
3 import java.text.DecimalFormat; 3 import java.text.DecimalFormat;
4 import java.util.Date; 4 import java.util.Date;
5 5
6 -import javax.persistence.Entity;  
7 -import javax.persistence.GeneratedValue;  
8 -import javax.persistence.Id;  
9 -import javax.persistence.Table;  
10 -import javax.persistence.Transient; 6 +import javax.persistence.*;
11 7
12 import org.springframework.format.annotation.DateTimeFormat; 8 import org.springframework.format.annotation.DateTimeFormat;
13 9
src/main/java/com/bsth/entity/oil/Ylxxb.java
@@ -2,11 +2,7 @@ package com.bsth.entity.oil; @@ -2,11 +2,7 @@ package com.bsth.entity.oil;
2 2
3 import java.util.Date; 3 import java.util.Date;
4 4
5 -import javax.persistence.Entity;  
6 -import javax.persistence.GeneratedValue;  
7 -import javax.persistence.Id;  
8 -import javax.persistence.Table;  
9 -import javax.persistence.Transient; 5 +import javax.persistence.*;
10 6
11 import org.springframework.format.annotation.DateTimeFormat; 7 import org.springframework.format.annotation.DateTimeFormat;
12 8
src/main/java/com/bsth/entity/oil/YlxxbUpdate.java
@@ -2,11 +2,7 @@ package com.bsth.entity.oil; @@ -2,11 +2,7 @@ package com.bsth.entity.oil;
2 2
3 import java.util.Date; 3 import java.util.Date;
4 4
5 -import javax.persistence.Entity;  
6 -import javax.persistence.GeneratedValue;  
7 -import javax.persistence.Id;  
8 -import javax.persistence.Table;  
9 -import javax.persistence.Transient; 5 +import javax.persistence.*;
10 6
11 import org.springframework.format.annotation.DateTimeFormat; 7 import org.springframework.format.annotation.DateTimeFormat;
12 8
src/main/java/com/bsth/entity/realcontrol/FrequentPhrases.java
1 package com.bsth.entity.realcontrol; 1 package com.bsth.entity.realcontrol;
2 2
3 -import javax.persistence.Entity;  
4 -import javax.persistence.GeneratedValue;  
5 -import javax.persistence.Id;  
6 -import javax.persistence.Table; 3 +import javax.persistence.*;
7 4
8 /** 5 /**
9 * 常用短语 6 * 常用短语
src/main/java/com/bsth/entity/realcontrol/StationToPark.java
1 package com.bsth.entity.realcontrol; 1 package com.bsth.entity.realcontrol;
2 2
3 -import javax.persistence.Entity;  
4 -import javax.persistence.GeneratedValue;  
5 -import javax.persistence.Id;  
6 -import javax.persistence.Table; 3 +import javax.persistence.*;
7 4
8 /** 5 /**
9 * 站 到 场 6 * 站 到 场
src/main/java/com/bsth/entity/report/RepairReport.java
@@ -2,11 +2,7 @@ package com.bsth.entity.report; @@ -2,11 +2,7 @@ package com.bsth.entity.report;
2 2
3 import java.util.Date; 3 import java.util.Date;
4 4
5 -import javax.persistence.Entity;  
6 -import javax.persistence.GeneratedValue;  
7 -import javax.persistence.Id;  
8 -import javax.persistence.Table;  
9 -import javax.persistence.Transient; 5 +import javax.persistence.*;
10 6
11 /** 7 /**
12 ** 维修上报信息 8 ** 维修上报信息
src/main/java/com/bsth/entity/sheet/CalcSheet.java
1 package com.bsth.entity.sheet; 1 package com.bsth.entity.sheet;
2 2
3 -import javax.persistence.Entity;  
4 -import javax.persistence.GeneratedValue;  
5 -import javax.persistence.Id;  
6 -import javax.persistence.Table;  
7 -import javax.persistence.Transient; 3 +import javax.persistence.*;
8 4
9 import com.bsth.data.BasicData; 5 import com.bsth.data.BasicData;
10 6
src/main/java/com/bsth/entity/sheet/Sheet.java
@@ -2,11 +2,8 @@ package com.bsth.entity.sheet; @@ -2,11 +2,8 @@ package com.bsth.entity.sheet;
2 2
3 import java.util.Date; 3 import java.util.Date;
4 4
5 -import javax.persistence.Entity;  
6 -import javax.persistence.GeneratedValue;  
7 -import javax.persistence.Id;  
8 -import javax.persistence.Table;  
9 -import javax.persistence.Transient; 5 +import javax.persistence.*;
  6 +
10 @Entity 7 @Entity
11 @Table(name = "bsth_c_sheet") 8 @Table(name = "bsth_c_sheet")
12 public class Sheet { 9 public class Sheet {
src/main/java/com/bsth/entity/sys/CompanyAuthority.java
@@ -10,7 +10,7 @@ import javax.persistence.*; @@ -10,7 +10,7 @@ import javax.persistence.*;
10 public class CompanyAuthority { 10 public class CompanyAuthority {
11 11
12 @Id 12 @Id
13 - @GeneratedValue(strategy = GenerationType.IDENTITY)(strategy = GenerationType.IDENTITY) 13 + @GeneratedValue(strategy = GenerationType.IDENTITY)
14 private Integer id; 14 private Integer id;
15 15
16 /** 公司代码 */ 16 /** 公司代码 */
src/main/java/com/bsth/entity/sys/Dictionary.java
@@ -14,7 +14,7 @@ import javax.persistence.Table; @@ -14,7 +14,7 @@ import javax.persistence.Table;
14 public class Dictionary { 14 public class Dictionary {
15 15
16 @Id 16 @Id
17 - @GeneratedValue(strategy = GenerationType.IDENTITY)(strategy = GenerationType.IDENTITY) 17 + @GeneratedValue(strategy = GenerationType.IDENTITY)
18 private Integer id; 18 private Integer id;
19 19
20 private String dCode; 20 private String dCode;
src/main/java/com/bsth/entity/sys/Interval.java
@@ -15,7 +15,7 @@ import javax.persistence.Table; @@ -15,7 +15,7 @@ import javax.persistence.Table;
15 public class Interval { 15 public class Interval {
16 16
17 @Id 17 @Id
18 - @GeneratedValue(strategy = GenerationType.IDENTITY)(strategy = GenerationType.IDENTITY) 18 + @GeneratedValue(strategy = GenerationType.IDENTITY)
19 private Integer id; 19 private Integer id;
20 20
21 /** 大间隔等级 */ 21 /** 大间隔等级 */
src/main/java/com/bsth/entity/sys/Module.java
@@ -15,7 +15,7 @@ import java.util.Set; @@ -15,7 +15,7 @@ import java.util.Set;
15 public class Module { 15 public class Module {
16 16
17 @Id 17 @Id
18 - @GeneratedValue(strategy = GenerationType.IDENTITY)(strategy = GenerationType.IDENTITY) 18 + @GeneratedValue(strategy = GenerationType.IDENTITY)
19 private Integer id; 19 private Integer id;
20 20
21 private Integer pId; 21 private Integer pId;
src/main/java/com/bsth/entity/sys/Resource.java
@@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
21 public class Resource { 21 public class Resource {
22 22
23 @Id 23 @Id
24 - @GeneratedValue(strategy = GenerationType.IDENTITY)(strategy = GenerationType.IDENTITY) 24 + @GeneratedValue(strategy = GenerationType.IDENTITY)
25 private Integer id; 25 private Integer id;
26 26
27 private String name; 27 private String name;
src/main/java/com/bsth/entity/sys/Role.java
@@ -21,7 +21,7 @@ import org.hibernate.annotations.Formula; @@ -21,7 +21,7 @@ import org.hibernate.annotations.Formula;
21 public class Role { 21 public class Role {
22 22
23 @Id 23 @Id
24 - @GeneratedValue(strategy = GenerationType.IDENTITY)(strategy = GenerationType.IDENTITY) 24 + @GeneratedValue(strategy = GenerationType.IDENTITY)
25 private Integer id; 25 private Integer id;
26 26
27 private String codeName; 27 private String codeName;
src/main/java/com/bsth/entity/sys/SysUser.java
@@ -18,7 +18,7 @@ import java.util.Set; @@ -18,7 +18,7 @@ import java.util.Set;
18 public class SysUser { 18 public class SysUser {
19 19
20 @Id 20 @Id
21 - @GeneratedValue(strategy = GenerationType.IDENTITY)(strategy = GenerationType.IDENTITY) 21 + @GeneratedValue(strategy = GenerationType.IDENTITY)
22 private Integer id; 22 private Integer id;
23 23
24 private String userName; 24 private String userName;
src/main/java/com/bsth/entity/sys/UserLine.java
@@ -25,7 +25,7 @@ import javax.persistence.*; @@ -25,7 +25,7 @@ import javax.persistence.*;
25 public class UserLine { 25 public class UserLine {
26 26
27 @Id 27 @Id
28 - @GeneratedValue(strategy = GenerationType.IDENTITY)(strategy = GenerationType.IDENTITY) 28 + @GeneratedValue(strategy = GenerationType.IDENTITY)
29 private Integer id; 29 private Integer id;
30 30
31 @ManyToOne 31 @ManyToOne
src/main/java/com/bsth/entity/traffic/SKBUploadLogger.java
@@ -28,7 +28,7 @@ public class SKBUploadLogger { @@ -28,7 +28,7 @@ public class SKBUploadLogger {
28 28
29 // ID 29 // ID
30 @Id 30 @Id
31 - @GeneratedValue(strategy = GenerationType.IDENTITY)(strategy = GenerationType.IDENTITY) 31 + @GeneratedValue(strategy = GenerationType.IDENTITY)
32 private Integer id; 32 private Integer id;
33 33
34 /** 时刻表信息 */ 34 /** 时刻表信息 */
src/main/java/com/bsth/entity/traffic/VehicleInoutStop.java
@@ -21,7 +21,7 @@ import java.util.Date; @@ -21,7 +21,7 @@ import java.util.Date;
21 public class VehicleInoutStop { 21 public class VehicleInoutStop {
22 22
23 @Id 23 @Id
24 - @GeneratedValue(strategy = GenerationType.IDENTITY)(strategy = GenerationType.IDENTITY) 24 + @GeneratedValue(strategy = GenerationType.IDENTITY)
25 private Integer id; 25 private Integer id;
26 26
27 private int line; 27 private int line;