潘钊 / bsth_control · Commits

Commit 57ed9773ae092c0bc298950e0a70634f80ab96b9

Authored by 王通
2 parents 7a36acc0 3fb94562
build: skipped

Merge branch 'minhang' of http://192.168.168.201:8888/panzhaov5/bsth_control into minhang

Inline Side-by-side
Showing 2 changed files with 286 additions and 239 deletions
src/main/java/com/bsth/entity/Line.java
  View file @57ed977
... ... @@ -116,6 +116,12 @@ public class Line implements Serializable {
116 116 /** 普通车辆数量 老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 int length(11) */
117 117 private Integer ordCarNumber;
118 118  
  119 + /** 权证车辆数量 报表需要的字段值 */
  120 + private Integer warrantCar;
  121 +
  122 + /** 权证配车启用日期 报表需要的字段值 */
  123 + private Integer warrantDate;
  124 +
119 125 /** 停车场编码 老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 int length(11) */
120 126 private String carParkCode;
121 127  
... ... @@ -139,6 +145,22 @@ public class Line implements Serializable {
139 145 @Column(name = "update_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
140 146 private Date updateDate;
141 147  
  148 + public Integer getWarrantCar() {
  149 + return warrantCar;
  150 + }
  151 +
  152 + public void setWarrantCar(Integer warrantCar) {
  153 + this.warrantCar = warrantCar;
  154 + }
  155 +
  156 + public Integer getWarrantDate() {
  157 + return warrantDate;
  158 + }
  159 +
  160 + public void setWarrantDate(Integer warrantDate) {
  161 + this.warrantDate = warrantDate;
  162 + }
  163 +
142 164 public Integer getLinePlayType() {
143 165 return linePlayType;
144 166 }
... ...
src/main/java/com/bsth/entity/directive/D60.java
  View file @57ed977
... ... @@ -17,251 +17,276 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
17 17  
18 18  
19 19 /**
20   - *
21   - * @ClassName: D60
22   - * @Description: TODO(调度指令)
23 20 * @author PanZhao
24   - * @date 2016年6月7日 上午10:21:59
25   - *
  21 + * @ClassName: D60
  22 + * @Description: TODO(调度指令)
  23 + * @date 2016年6月7日 上午10:21:59
26 24 */
27 25 @Entity
28 26 @Table(name = "bsth_v_directive_60")
29 27 @NamedEntityGraphs({
30   - @NamedEntityGraph(name = "directive60_sch", attributeNodes = {
31   - @NamedAttributeNode("sch")
32   - })
  28 + @NamedEntityGraph(name = "directive60_sch", attributeNodes = {
  29 + @NamedAttributeNode("sch")
  30 + })
33 31 })
34   -public class D60 extends Directive{
  32 +public class D60 extends Directive {
35 33  
36   - @Id
  34 + @Id
37 35 @GeneratedValue
38   - private Integer id;
39   -
40   - /**
41   - * 数据
42   - */
43   - private D60Data data;
44   -
45   - /**
46   - * 唯一标识
47   - */
48   - @Transient
49   - private Integer msgId;
50   -
51   - /**
52   - * 46上行
53   - */
54   - private Short reply46 = -1;
55   -
56   - /**
57   - * 47上行
58   - */
59   - private Short reply47 = -1;
60   -
61   - /**
62   - * 是否是调度指令
63   - * 目前调度指令和消息短语都是短语下发，所以从协议上无法区分
64   - */
65   - private boolean isDispatch;
66   -
67   - /**
68   - * 相关联的班次
69   - */
70   - @JsonIgnore
71   - @ManyToOne(fetch = FetchType.LAZY)
72   - private ScheduleRealInfo sch;
73   -
74   - @Embeddable
75   - public static class D60Data {
76   - // 公司代码
77   - private short companyCode;
78   -
79   - // 设备号
80   - @Transient
81   - private String deviceId;
82   -
83   - // 时间戳
84   - @Transient
85   - private Long timestamp;
86   -
87   - // 保留 默认0
88   - private short instructType = 0;
89   -
90   - /*
91   - * 调度指令 调度指令。
92   - * 0X00表示信息短语
93   - * 0X01表示取消上次指令+调度指令(闹钟有效)
94   - * 0x02表示为调度指令(闹钟有效)
95   - * 0x03表示运营状态指令(闹钟无效)
96   - * 0x04表示其他指令
97   - */
98   - private Short dispatchInstruct;
99   -
100   - // 唯一标识
101   - private int msgId;
102   -
103   - // 闹钟
104   - private Long alarmTime;
105   -
106   - // 多个运营状态字节
107   - private Long serviceState;
108   -
109   - // 消息文本
110   - private String txtContent;
111   -
112   - public short getCompanyCode() {
113   - return companyCode;
114   - }
115   -
116   - public void setCompanyCode(short companyCode) {
117   - this.companyCode = companyCode;
118   - }
119   -
120   - public String getDeviceId() {
121   - return deviceId;
122   - }
123   -
124   - public void setDeviceId(String deviceId) {
125   - this.deviceId = deviceId;
126   - }
127   -
128   - public Long getTimestamp() {
129   - return timestamp;
130   - }
131   -
132   - public void setTimestamp(Long timestamp) {
133   - this.timestamp = timestamp;
134   - }
135   -
136   - public short getInstructType() {
137   - return instructType;
138   - }
139   -
140   - public void setInstructType(short instructType) {
141   - this.instructType = instructType;
142   - }
143   -
144   - public Short getDispatchInstruct() {
145   - return dispatchInstruct;
146   - }
147   -
148   - public void setDispatchInstruct(Short dispatchInstruct) {
149   - this.dispatchInstruct = dispatchInstruct;
150   - }
151   -
152   - public int getMsgId() {
153   - return msgId;
154   - }
155   -
156   - public void setMsgId(int msgId) {
157   - this.msgId = msgId;
158   - }
159   -
160   - public Long getAlarmTime() {
161   - return alarmTime;
162   - }
163   -
164   - public void setAlarmTime(Long alarmTime) {
165   - this.alarmTime = alarmTime;
166   - }
167   -
168   - public Long getServiceState() {
169   - return serviceState;
170   - }
171   -
172   - public void setServiceState(Long serviceState) {
173   - this.serviceState = serviceState;
174   - }
175   -
176   - public String getTxtContent() {
177   - return txtContent;
178   - }
179   -
180   - public void setTxtContent(String txtContent) {
181   - this.txtContent = txtContent;
182   - }
183   - }
184   -
185   - public Integer getId() {
186   - return id;
187   - }
188   -
189   - public void setId(Integer id) {
190   - this.id = id;
191   - }
192   -
193   - public short getOperCode() {
194   - return operCode;
195   - }
196   -
197   - public void setOperCode(short operCode) {
198   - this.operCode = operCode;
199   - }
200   -
201   - public D60Data getData() {
202   - return data;
203   - }
204   -
205   - public void setData(D60Data data) {
206   - this.data = data;
207   - }
208   -
209   - public Integer getMsgId() {
210   - if(this.msgId != null)
211   - return this.msgId;
212   - else
213   - return this.getData().getMsgId();
214   - }
215   -
216   - public void setMsgId(Integer msgId) {
217   - this.msgId = msgId;
218   - }
219   -
220   - @Override
221   - public void setTimestamp(Long timestamp) {
222   - if(this.data != null)
223   - this.data.setTimestamp(timestamp);
224   -
225   - this.timestamp = timestamp;
226   - }
227   -
228   - @Override
229   - public void setDeviceId(String deviceId) {
230   - if(this.data != null)
231   - this.data.setDeviceId(deviceId);
232   -
233   - this.deviceId = deviceId;
234   - }
235   -
236   - public Short getReply46() {
237   - return reply46;
238   - }
239   -
240   - public void setReply46(Short reply46) {
241   - this.reply46 = reply46;
242   - }
243   -
244   - public Short getReply47() {
245   - return reply47;
246   - }
247   -
248   - public void setReply47(Short reply47) {
249   - this.reply47 = reply47;
250   - }
251   -
252   - public boolean isDispatch() {
253   - return isDispatch;
254   - }
255   -
256   - public void setDispatch(boolean isDispatch) {
257   - this.isDispatch = isDispatch;
258   - }
259   -
260   - public ScheduleRealInfo getSch() {
261   - return sch;
262   - }
263   -
264   - public void setSch(ScheduleRealInfo sch) {
265   - this.sch = sch;
266   - }
  36 + private Integer id;
  37 +
  38 + /**
  39 + * 数据
  40 + */
  41 + private D60Data data;
  42 +
  43 + /**
  44 + * 唯一标识
  45 + */
  46 + @Transient
  47 + private Integer msgId;
  48 +
  49 + /**
  50 + * 46上行
  51 + */
  52 + private Short reply46 = -1;
  53 + /**
  54 + * 46收到时间
  55 + */
  56 + private Long reply46Time;
  57 +
  58 + /**
  59 + * 47上行
  60 + */
  61 + private Short reply47 = -1;
  62 +
  63 + /**
  64 + * 47收到时间
  65 + */
  66 + private Long reply47Time;
  67 +
  68 + /**
  69 + * 是否是调度指令
  70 + * 目前调度指令和消息短语都是短语下发，所以从协议上无法区分
  71 + */
  72 + private boolean isDispatch;
  73 +
  74 + /**
  75 + * 相关联的班次
  76 + */
  77 + @JsonIgnore
  78 + @ManyToOne(fetch = FetchType.LAZY)
  79 + private ScheduleRealInfo sch;
  80 +
  81 + public Long getReply46Time() {
  82 + return reply46Time;
  83 + }
  84 +
  85 + public void setReply46Time(Long reply46Time) {
  86 + this.reply46Time = reply46Time;
  87 + }
  88 +
  89 + public Long getReply47Time() {
  90 + return reply47Time;
  91 + }
  92 +
  93 + public void setReply47Time(Long reply47Time) {
  94 + this.reply47Time = reply47Time;
  95 + }
  96 +
  97 + @Embeddable
  98 + public static class D60Data {
  99 + // 公司代码
  100 + private short companyCode;
  101 +
  102 + // 设备号
  103 + @Transient
  104 + private String deviceId;
  105 +
  106 + // 时间戳
  107 + @Transient
  108 + private Long timestamp;
  109 +
  110 + // 保留 默认0
  111 + private short instructType = 0;
  112 +
  113 + /*
  114 + * 调度指令 调度指令。
  115 + * 0X00表示信息短语
  116 + * 0X01表示取消上次指令+调度指令(闹钟有效)
  117 + * 0x02表示为调度指令(闹钟有效)
  118 + * 0x03表示运营状态指令(闹钟无效)
  119 + * 0x04表示其他指令
  120 + */
  121 + private Short dispatchInstruct;
  122 +
  123 + // 唯一标识
  124 + private int msgId;
  125 +
  126 + // 闹钟
  127 + private Long alarmTime;
  128 +
  129 + // 多个运营状态字节
  130 + private Long serviceState;
  131 +
  132 + // 消息文本
  133 + private String txtContent;
  134 +
  135 + public short getCompanyCode() {
  136 + return companyCode;
  137 + }
  138 +
  139 + public void setCompanyCode(short companyCode) {
  140 + this.companyCode = companyCode;
  141 + }
  142 +
  143 + public String getDeviceId() {
  144 + return deviceId;
  145 + }
  146 +
  147 + public void setDeviceId(String deviceId) {
  148 + this.deviceId = deviceId;
  149 + }
  150 +
  151 + public Long getTimestamp() {
  152 + return timestamp;
  153 + }
  154 +
  155 + public void setTimestamp(Long timestamp) {
  156 + this.timestamp = timestamp;
  157 + }
  158 +
  159 + public short getInstructType() {
  160 + return instructType;
  161 + }
  162 +
  163 + public void setInstructType(short instructType) {
  164 + this.instructType = instructType;
  165 + }
  166 +
  167 + public Short getDispatchInstruct() {
  168 + return dispatchInstruct;
  169 + }
  170 +
  171 + public void setDispatchInstruct(Short dispatchInstruct) {
  172 + this.dispatchInstruct = dispatchInstruct;
  173 + }
  174 +
  175 + public int getMsgId() {
  176 + return msgId;
  177 + }
  178 +
  179 + public void setMsgId(int msgId) {
  180 + this.msgId = msgId;
  181 + }
  182 +
  183 + public Long getAlarmTime() {
  184 + return alarmTime;
  185 + }
  186 +
  187 + public void setAlarmTime(Long alarmTime) {
  188 + this.alarmTime = alarmTime;
  189 + }
  190 +
  191 + public Long getServiceState() {
  192 + return serviceState;
  193 + }
  194 +
  195 + public void setServiceState(Long serviceState) {
  196 + this.serviceState = serviceState;
  197 + }
  198 +
  199 + public String getTxtContent() {
  200 + return txtContent;
  201 + }
  202 +
  203 + public void setTxtContent(String txtContent) {
  204 + this.txtContent = txtContent;
  205 + }
  206 + }
  207 +
  208 + public Integer getId() {
  209 + return id;
  210 + }
  211 +
  212 + public void setId(Integer id) {
  213 + this.id = id;
  214 + }
  215 +
  216 + public short getOperCode() {
  217 + return operCode;
  218 + }
  219 +
  220 + public void setOperCode(short operCode) {
  221 + this.operCode = operCode;
  222 + }
  223 +
  224 + public D60Data getData() {
  225 + return data;
  226 + }
  227 +
  228 + public void setData(D60Data data) {
  229 + this.data = data;
  230 + }
  231 +
  232 + public Integer getMsgId() {
  233 + if (this.msgId != null)
  234 + return this.msgId;
  235 + else
  236 + return this.getData().getMsgId();
  237 + }
  238 +
  239 + public void setMsgId(Integer msgId) {
  240 + this.msgId = msgId;
  241 + }
  242 +
  243 + @Override
  244 + public void setTimestamp(Long timestamp) {
  245 + if (this.data != null)
  246 + this.data.setTimestamp(timestamp);
  247 +
  248 + this.timestamp = timestamp;
  249 + }
  250 +
  251 + @Override
  252 + public void setDeviceId(String deviceId) {
  253 + if (this.data != null)
  254 + this.data.setDeviceId(deviceId);
  255 +
  256 + this.deviceId = deviceId;
  257 + }
  258 +
  259 + public Short getReply46() {
  260 + return reply46;
  261 + }
  262 +
  263 + public void setReply46(Short reply46) {
  264 + this.reply46 = reply46;
  265 + }
  266 +
  267 + public Short getReply47() {
  268 + return reply47;
  269 + }
  270 +
  271 + public void setReply47(Short reply47) {
  272 + this.reply47 = reply47;
  273 + }
  274 +
  275 + public boolean isDispatch() {
  276 + return isDispatch;
  277 + }
  278 +
  279 + public void setDispatch(boolean isDispatch) {
  280 + this.isDispatch = isDispatch;
  281 + }
  282 +
  283 + public ScheduleRealInfo getSch() {
  284 + return sch;
  285 + }
  286 +
  287 + public void setSch(ScheduleRealInfo sch) {
  288 + this.sch = sch;
  289 + }
  290 +
  291 +
267 292 }
... ...