Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 5b7b770

Browse files
add log4j config files and modify several java files.time:2019年04月25日 19:41:00
1 parent eb02173 commit 5b7b770

21 files changed

Lines changed: 2324 additions & 533 deletions

‎.idea/workspace.xml‎

Lines changed: 421 additions & 373 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/java/cn/tedu/note/dao/SingleVehicleWorkDurationMapper.java‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import cn.tedu.note.entity.GoodsPlanLineEntity;
44
import cn.tedu.note.entity.SingleVehicleWorkDurationEntity;
55
import cn.tedu.note.entity.TransferPlanLineEntity;
6+
import cn.tedu.note.entity.VehiclePlanLineEntity;
7+
import org.apache.ibatis.annotations.MapKey;
68
import org.springframework.stereotype.Repository;
79
import org.springframework.transaction.annotation.Propagation;
810
import org.springframework.transaction.annotation.Transactional;
@@ -22,7 +24,8 @@ public interface SingleVehicleWorkDurationMapper {
2224
* 返回单车工作时长统计基础数据Map集合
2325
* @return
2426
*/
25-
List<Map<String,Object>> getSingleVehicleWorkDurationMap();
27+
@MapKey("cph")
28+
Map<String,SingleVehicleWorkDurationEntity> getSingleVehicleWorkDurationMap();
2629

2730
/**
2831
* 返回单车工作时长统计基础数据Map集合
@@ -50,4 +53,17 @@ public interface SingleVehicleWorkDurationMapper {
5053
*/
5154
List<GoodsPlanLineEntity> getGoodsPlanLineList();
5255

56+
/**
57+
* 返回当前时间前一天每个车辆送货线路数据list集合
58+
* @return
59+
*/
60+
@MapKey("cph")
61+
Map<String,VehiclePlanLineEntity> getDeliverGoodsPlanLineMap();
62+
63+
/**
64+
* 返回当前时间前一天每个车辆提货线路数据list集合
65+
* @return
66+
*/
67+
@MapKey("cph")
68+
Map<String,VehiclePlanLineEntity> getPickupGoodsPlanLineMap();
5369
}

‎src/main/java/cn/tedu/note/entity/SingleVehicleWorkDurationEntity.java‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,17 @@ public class SingleVehicleWorkDurationEntity {
8282
*/
8383
private Double pjdw;
8484

85+
/**
86+
* 取件体积
87+
*/
88+
private Double qjtj;
89+
90+
/**
91+
* 派件体积
92+
*/
93+
private Double pjtj;
94+
95+
8596
/**
8697
* 取件件数
8798
*/
@@ -104,7 +115,7 @@ public class SingleVehicleWorkDurationEntity {
104115

105116
public SingleVehicleWorkDurationEntity(){}
106117

107-
public SingleVehicleWorkDurationEntity(String id, String syb, String dq, String sfdrdc, String cph, String cx, Integer szylc, Integer xzylc, Integer qjghlc, Integer pjghlc, Double xzydw, Double szydw, Double qjdw, Double pjdw, Integer qjjs, Integer pjjs, Date tjrq, Date record_date) {
118+
public SingleVehicleWorkDurationEntity(String id, String syb, String dq, String sfdrdc, String cph, String cx, Integer szylc, Integer xzylc, Integer qjghlc, Integer pjghlc, Double xzydw, Double szydw, Double qjdw, Double pjdw, Doubleqjtj, Doublepjtj, Integer qjjs, Integer pjjs, Date tjrq, Date record_date) {
108119
this.id = id;
109120
this.syb = syb;
110121
this.dq = dq;
@@ -119,6 +130,8 @@ public SingleVehicleWorkDurationEntity(String id, String syb, String dq, String
119130
this.szydw = szydw;
120131
this.qjdw = qjdw;
121132
this.pjdw = pjdw;
133+
this.qjtj = qjtj;
134+
this.pjtj = pjtj;
122135
this.qjjs = qjjs;
123136
this.pjjs = pjjs;
124137
this.tjrq = tjrq;
@@ -237,6 +250,22 @@ public void setPjdw(Double pjdw) {
237250
this.pjdw = pjdw;
238251
}
239252

253+
public Double getQjtj() {
254+
return qjtj;
255+
}
256+
257+
public void setQjtj(Double qjtj) {
258+
this.qjtj = qjtj;
259+
}
260+
261+
public Double getPjtj() {
262+
return pjtj;
263+
}
264+
265+
public void setPjtj(Double pjtj) {
266+
this.pjtj = pjtj;
267+
}
268+
240269
public Integer getQjjs() {
241270
return qjjs;
242271
}
@@ -292,6 +321,8 @@ public boolean equals(Object o) {
292321
.append(getSzydw(), entity.getSzydw())
293322
.append(getQjdw(), entity.getQjdw())
294323
.append(getPjdw(), entity.getPjdw())
324+
.append(getQjtj(), entity.getQjtj())
325+
.append(getPjtj(), entity.getPjtj())
295326
.append(getQjjs(), entity.getQjjs())
296327
.append(getPjjs(), entity.getPjjs())
297328
.append(getTjrq(), entity.getTjrq())
@@ -316,6 +347,8 @@ public int hashCode() {
316347
.append(getSzydw())
317348
.append(getQjdw())
318349
.append(getPjdw())
350+
.append(getQjtj())
351+
.append(getPjtj())
319352
.append(getQjjs())
320353
.append(getPjjs())
321354
.append(getTjrq())
@@ -340,6 +373,8 @@ public String toString() {
340373
", szydw=" + szydw +
341374
", qjdw=" + qjdw +
342375
", pjdw=" + pjdw +
376+
", qjtj=" + qjtj +
377+
", pjtj=" + pjtj +
343378
", qjjs=" + qjjs +
344379
", pjjs=" + pjjs +
345380
", tjrq=" + tjrq +

‎src/main/java/cn/tedu/note/entity/TransferPlanLineEntity.java‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@ public class TransferPlanLineEntity {
5959
*/
6060
private Double zydw;
6161

62+
/**
63+
* 上下转移体积
64+
*/
65+
private Double zytj;
66+
6267
/**
6368
* 发车类型
6469
*/
@@ -67,7 +72,7 @@ public class TransferPlanLineEntity {
6772
public TransferPlanLineEntity() {
6873
}
6974

70-
public TransferPlanLineEntity(String cph, String line, String startCity, String startAddress, String startGeoCode, String endCity, String endGeoCode, String endAddress, Integer plannedDistance, Double zydw, String type) {
75+
public TransferPlanLineEntity(String cph, String line, String startCity, String startAddress, String startGeoCode, String endCity, String endGeoCode, String endAddress, Integer plannedDistance, Double zydw, Doublezytj, String type) {
7176
this.cph = cph;
7277
this.line = line;
7378
this.startCity = startCity;
@@ -78,6 +83,7 @@ public TransferPlanLineEntity(String cph, String line, String startCity, String
7883
this.endAddress = endAddress;
7984
this.plannedDistance = plannedDistance;
8085
this.zydw = zydw;
86+
this.zytj = zytj;
8187
this.type = type;
8288
}
8389

@@ -161,6 +167,14 @@ public void setZydw(Double zydw) {
161167
this.zydw = zydw;
162168
}
163169

170+
public Double getZytj() {
171+
return zytj;
172+
}
173+
174+
public void setZytj(Double zytj) {
175+
this.zytj = zytj;
176+
}
177+
164178
public String getType() {
165179
return type;
166180
}
@@ -188,6 +202,7 @@ public boolean equals(Object o) {
188202
.append(getEndAddress(), that.getEndAddress())
189203
.append(getPlannedDistance(), that.getPlannedDistance())
190204
.append(getZydw(), that.getZydw())
205+
.append(getZytj(), that.getZytj())
191206
.append(getType(), that.getType())
192207
.isEquals();
193208
}
@@ -205,6 +220,7 @@ public int hashCode() {
205220
.append(getEndAddress())
206221
.append(getPlannedDistance())
207222
.append(getZydw())
223+
.append(getZytj())
208224
.append(getType())
209225
.toHashCode();
210226
}
@@ -222,6 +238,7 @@ public String toString() {
222238
", endAddress='" + endAddress + '\'' +
223239
", plannedDistance=" + plannedDistance +
224240
", zydw=" + zydw +
241+
", zytj=" + zytj +
225242
", type='" + type + '\'' +
226243
'}';
227244
}
Lines changed: 196 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,196 @@
1+
package cn.tedu.note.entity;
2+
3+
import org.apache.commons.lang3.builder.EqualsBuilder;
4+
import org.apache.commons.lang3.builder.HashCodeBuilder;
5+
6+
import java.io.Serializable;
7+
8+
/**
9+
* @author liuwenlin
10+
* @version v1.0
11+
* @date 2019年4月23日 16:07
12+
*/
13+
public class VehicleOrderEntity implements Serializable {
14+
/**
15+
* 提送货车牌号
16+
*/
17+
private String cph;
18+
19+
/**
20+
* 运单编号
21+
*/
22+
private String ydbh;
23+
24+
/**
25+
* 运单所在城市
26+
*/
27+
private String city;
28+
29+
/**
30+
* 运单地址
31+
*/
32+
private String address;
33+
34+
/**
35+
* 地理编码
36+
*/
37+
private String geocode;
38+
39+
/**
40+
* 运单件数
41+
*/
42+
private Integer countOfOrder;
43+
44+
/**
45+
* 运单吨位
46+
*/
47+
private Double ton;
48+
49+
/**
50+
* 运单体积
51+
*/
52+
private Double tj;
53+
54+
/**
55+
* 运单提货顺序
56+
*/
57+
private Integer goodsSequence;
58+
59+
public VehicleOrderEntity() {
60+
}
61+
62+
public VehicleOrderEntity(String cph, String ydbh, String city, String address, String geocode, Integer countOfOrder, Double ton, Double tj, Integer goodsSequence) {
63+
this.cph = cph;
64+
this.ydbh = ydbh;
65+
this.city = city;
66+
this.address = address;
67+
this.geocode = geocode;
68+
this.countOfOrder = countOfOrder;
69+
this.ton = ton;
70+
this.tj = tj;
71+
this.goodsSequence = goodsSequence;
72+
}
73+
74+
public String getCph() {
75+
return cph;
76+
}
77+
78+
public void setCph(String cph) {
79+
this.cph = cph;
80+
}
81+
82+
public String getYdbh() {
83+
return ydbh;
84+
}
85+
86+
public void setYdbh(String ydbh) {
87+
this.ydbh = ydbh;
88+
}
89+
90+
public String getCity() {
91+
return city;
92+
}
93+
94+
public void setCity(String city) {
95+
this.city = city;
96+
}
97+
98+
public String getAddress() {
99+
return address;
100+
}
101+
102+
public void setAddress(String address) {
103+
this.address = address;
104+
}
105+
106+
public String getGeocode() {
107+
return geocode;
108+
}
109+
110+
public void setGeocode(String geocode) {
111+
this.geocode = geocode;
112+
}
113+
114+
public Integer getCountOfOrder() {
115+
return countOfOrder;
116+
}
117+
118+
public void setCountOfOrder(Integer countOfOrder) {
119+
this.countOfOrder = countOfOrder;
120+
}
121+
122+
public Double getTon() {
123+
return ton;
124+
}
125+
126+
public void setTon(Double ton) {
127+
this.ton = ton;
128+
}
129+
130+
public Double getTj() {
131+
return tj;
132+
}
133+
134+
public void setTj(Double tj) {
135+
this.tj = tj;
136+
}
137+
138+
public Integer getGoodsSequence() {
139+
return goodsSequence;
140+
}
141+
142+
public void setGoodsSequence(Integer goodsSequence) {
143+
this.goodsSequence = goodsSequence;
144+
}
145+
146+
@Override
147+
public boolean equals(Object o) {
148+
if (this == o) return true;
149+
150+
if (o == null || getClass() != o.getClass()) return false;
151+
152+
VehicleOrderEntity that = (VehicleOrderEntity) o;
153+
154+
return new EqualsBuilder()
155+
.append(getCph(), that.getCph())
156+
.append(getYdbh(), that.getYdbh())
157+
.append(getCity(), that.getCity())
158+
.append(getAddress(), that.getAddress())
159+
.append(getGeocode(), that.getGeocode())
160+
.append(getCountOfOrder(), that.getCountOfOrder())
161+
.append(getTon(), that.getTon())
162+
.append(getTj(), that.getTj())
163+
.append(getGoodsSequence(), that.getGoodsSequence())
164+
.isEquals();
165+
}
166+
167+
@Override
168+
public int hashCode() {
169+
return new HashCodeBuilder(17, 37)
170+
.append(getCph())
171+
.append(getYdbh())
172+
.append(getCity())
173+
.append(getAddress())
174+
.append(getGeocode())
175+
.append(getCountOfOrder())
176+
.append(getTon())
177+
.append(getTj())
178+
.append(getGoodsSequence())
179+
.toHashCode();
180+
}
181+
182+
@Override
183+
public String toString() {
184+
return "VehicleOrderEntity{" +
185+
"cph='" + cph + '\'' +
186+
", ydbh='" + ydbh + '\'' +
187+
", city='" + city + '\'' +
188+
", address='" + address + '\'' +
189+
", geocode='" + geocode + '\'' +
190+
", countOfOrder=" + countOfOrder +
191+
", ton=" + ton +
192+
", tj=" + tj +
193+
", goodsSequence=" + goodsSequence +
194+
'}';
195+
}
196+
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /