From 0f9e3f7bdb40ef295ecb401e3c545bfe4d24d2ba Mon Sep 17 00:00:00 2001 From: shilan910 <910323478@qq.com> Date: Sun, 14 Aug 2016 23:36:52 +0800 Subject: [PATCH] zqh --- src/main/java/com/busasst/dao/DriverDao.java | 16 ++++ src/main/java/com/busasst/dao/RouteDao.java | 1 + .../java/com/busasst/dao/SchedualDao.java | 40 +++++++- .../java/com/busasst/entity/DriverEntity.java | 93 +++++++++++++++++++ .../java/com/busasst/entity/RouteEntity.java | 31 +++++-- src/main/webapp/assets/js/schedual-mng.js | 7 -- .../com/busassistant/dao/SchedualDaoTest.java | 48 ++++++++++ 7 files changed, 220 insertions(+), 16 deletions(-) create mode 100644 src/main/java/com/busasst/dao/DriverDao.java create mode 100644 src/main/java/com/busasst/entity/DriverEntity.java create mode 100644 src/test/java/com/busassistant/dao/SchedualDaoTest.java diff --git a/src/main/java/com/busasst/dao/DriverDao.java b/src/main/java/com/busasst/dao/DriverDao.java new file mode 100644 index 0000000..7086aa0 --- /dev/null +++ b/src/main/java/com/busasst/dao/DriverDao.java @@ -0,0 +1,16 @@ +package com.busasst.dao; + +import com.busasst.entity.DriverEntity; +import org.springframework.stereotype.Repository; + +/** + * Created by sl on 16-8-14. + */ +@Repository("driverDao") +public class DriverDao extends BaseDao{ + + public DriverEntity getById(int id){ + return get(DriverEntity.class,id); + } + +} diff --git a/src/main/java/com/busasst/dao/RouteDao.java b/src/main/java/com/busasst/dao/RouteDao.java index 604f35b..2bfe038 100644 --- a/src/main/java/com/busasst/dao/RouteDao.java +++ b/src/main/java/com/busasst/dao/RouteDao.java @@ -12,6 +12,7 @@ */ @Repository("routeDao") public class RouteDao extends BaseDao { + public RouteEntity getById(int id) { return get(RouteEntity.class, id); } diff --git a/src/main/java/com/busasst/dao/SchedualDao.java b/src/main/java/com/busasst/dao/SchedualDao.java index 544c47b..368c345 100644 --- a/src/main/java/com/busasst/dao/SchedualDao.java +++ b/src/main/java/com/busasst/dao/SchedualDao.java @@ -1,9 +1,15 @@ package com.busasst.dao; import com.busasst.bean.SchedualBean; +import com.busasst.entity.BusEntity; +import com.busasst.entity.DriverEntity; +import com.busasst.entity.RouteEntity; +import com.busasst.entity.SchedualEntity; import org.hibernate.Query; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; +import java.util.ArrayList; import java.util.List; /** @@ -12,11 +18,43 @@ @Repository("schedualDao") public class SchedualDao extends BaseDao{ + @Autowired + private CarDao carDao; + + @Autowired + private RouteDao routeDao; + + @Autowired + private DriverDao driverDao; + public List getDetaile(String date){ + List schedualBeans = new ArrayList<>(); String hql = "from SchedualEntity as schedual where schedual.date='"+date+"'"; Query query = query(hql); - return query.list(); + List schedualEntities = query.list(); + + for(SchedualEntity schedual : schedualEntities){ + System.out.println("schedual.getRouId(): "+schedual.getRouId()); + System.out.println("schedual.getDriverId(): "+schedual.getDriverId()); + System.out.println("schedual.getBusId(): "+schedual.getBusId()); + + RouteEntity route = routeDao.getById(schedual.getRouId()); +// RouteEntity route = routeDao.getById(1); + + DriverEntity driver = driverDao.getById(schedual.getDriverId()); + BusEntity bus = carDao.getById(schedual.getBusId()); + + System.out.println(bus.getNumber()); + System.out.println(schedual.getTime()+" "+date+" "+route.getStartStation()); + + SchedualBean schedualBean = new SchedualBean(schedual.getTime(),date,route.getStartStation(), + driver.getName(),bus.getNumber(),route.getName(),bus.getSeatnum()); + + schedualBeans.add(schedualBean); + } + + return schedualBeans; } diff --git a/src/main/java/com/busasst/entity/DriverEntity.java b/src/main/java/com/busasst/entity/DriverEntity.java new file mode 100644 index 0000000..3765b63 --- /dev/null +++ b/src/main/java/com/busasst/entity/DriverEntity.java @@ -0,0 +1,93 @@ +package com.busasst.entity; + +import javax.persistence.*; + +/** + * Created by sl on 16-8-14. + */ +@Entity +@Table(name = "driver", schema = "", catalog = "db_bus") +public class DriverEntity { + private int driverId; + private String name; + private String driverLicense; + private String sex; + private Integer age; + + @Id + @Column(name = "driver_id", nullable = false, insertable = true, updatable = true) + public int getDriverId() { + return driverId; + } + + public void setDriverId(int driverId) { + this.driverId = driverId; + } + + @Basic + @Column(name = "name", nullable = true, insertable = true, updatable = true, length = 255) + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Basic + @Column(name = "driver_license", nullable = true, insertable = true, updatable = true, length = 255) + public String getDriverLicense() { + return driverLicense; + } + + public void setDriverLicense(String driverLicense) { + this.driverLicense = driverLicense; + } + + @Basic + @Column(name = "sex", nullable = true, insertable = true, updatable = true, length = 255) + public String getSex() { + return sex; + } + + public void setSex(String sex) { + this.sex = sex; + } + + @Basic + @Column(name = "age", nullable = true, insertable = true, updatable = true) + public Integer getAge() { + return age; + } + + public void setAge(Integer age) { + this.age = age; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + DriverEntity that = (DriverEntity) o; + + if (driverId != that.driverId) return false; + if (name != null ? !name.equals(that.name) : that.name != null) return false; + if (driverLicense != null ? !driverLicense.equals(that.driverLicense) : that.driverLicense != null) + return false; + if (sex != null ? !sex.equals(that.sex) : that.sex != null) return false; + if (age != null ? !age.equals(that.age) : that.age != null) return false; + + return true; + } + + @Override + public int hashCode() { + int result = driverId; + result = 31 * result + (name != null ? name.hashCode() : 0); + result = 31 * result + (driverLicense != null ? driverLicense.hashCode() : 0); + result = 31 * result + (sex != null ? sex.hashCode() : 0); + result = 31 * result + (age != null ? age.hashCode() : 0); + return result; + } +} diff --git a/src/main/java/com/busasst/entity/RouteEntity.java b/src/main/java/com/busasst/entity/RouteEntity.java index 0673640..6860cbc 100644 --- a/src/main/java/com/busasst/entity/RouteEntity.java +++ b/src/main/java/com/busasst/entity/RouteEntity.java @@ -3,7 +3,7 @@ import javax.persistence.*; /** - * Created by tsj on 16-7-5. + * Created by sl on 16-8-14. */ @Entity @Table(name = "route", schema = "", catalog = "db_bus") @@ -14,14 +14,17 @@ public class RouteEntity { private Integer stationSum; private Double riderate; private String distance; + private String startStation; - public RouteEntity(int rouId, String name, Integer workerSum, Integer stationSum, Double riderate, String distance) { + public RouteEntity(int rouId, String name, Integer workerSum, Integer stationSum, + Double riderate, String distance, String startStation) { this.rouId = rouId; this.name = name; this.workerSum = workerSum; this.stationSum = stationSum; this.riderate = riderate; this.distance = distance; + this.startStation = startStation; } public RouteEntity(){ @@ -29,7 +32,7 @@ public RouteEntity(){ } @Id - @Column(name = "rou_id") + @Column(name = "rou_id", nullable = false, insertable = true, updatable = true) public int getRouId() { return rouId; } @@ -39,7 +42,7 @@ public void setRouId(int rouId) { } @Basic - @Column(name = "name") + @Column(name = "name", nullable = true, insertable = true, updatable = true, length = 100) public String getName() { return name; } @@ -49,7 +52,7 @@ public void setName(String name) { } @Basic - @Column(name = "worker_sum") + @Column(name = "worker_sum", nullable = true, insertable = true, updatable = true) public Integer getWorkerSum() { return workerSum; } @@ -59,7 +62,7 @@ public void setWorkerSum(Integer workerSum) { } @Basic - @Column(name = "station_sum") + @Column(name = "station_sum", nullable = true, insertable = true, updatable = true) public Integer getStationSum() { return stationSum; } @@ -69,7 +72,7 @@ public void setStationSum(Integer stationSum) { } @Basic - @Column(name = "riderate") + @Column(name = "riderate", nullable = true, insertable = true, updatable = true, precision = 0) public Double getRiderate() { return riderate; } @@ -79,7 +82,7 @@ public void setRiderate(Double riderate) { } @Basic - @Column(name = "distance") + @Column(name = "distance", nullable = true, insertable = true, updatable = true, length = 100) public String getDistance() { return distance; } @@ -88,6 +91,16 @@ public void setDistance(String distance) { this.distance = distance; } + @Basic + @Column(name = "start_station", nullable = true, insertable = true, updatable = true, length = 255) + public String getStartStation() { + return startStation; + } + + public void setStartStation(String startStation) { + this.startStation = startStation; + } + @Override public boolean equals(Object o) { if (this == o) return true; @@ -101,6 +114,7 @@ public boolean equals(Object o) { if (stationSum != null ? !stationSum.equals(that.stationSum) : that.stationSum != null) return false; if (riderate != null ? !riderate.equals(that.riderate) : that.riderate != null) return false; if (distance != null ? !distance.equals(that.distance) : that.distance != null) return false; + if (startStation != null ? !startStation.equals(that.startStation) : that.startStation != null) return false; return true; } @@ -113,6 +127,7 @@ public int hashCode() { result = 31 * result + (stationSum != null ? stationSum.hashCode() : 0); result = 31 * result + (riderate != null ? riderate.hashCode() : 0); result = 31 * result + (distance != null ? distance.hashCode() : 0); + result = 31 * result + (startStation != null ? startStation.hashCode() : 0); return result; } } diff --git a/src/main/webapp/assets/js/schedual-mng.js b/src/main/webapp/assets/js/schedual-mng.js index acf794b..609868f 100644 --- a/src/main/webapp/assets/js/schedual-mng.js +++ b/src/main/webapp/assets/js/schedual-mng.js @@ -135,13 +135,6 @@ function my_table(e, f, callback) { /*e参数格式为y/m/d,必填传入now则 } -//zqh start -function getData(yearmonth,day){ - // $.getJS -} - -//zqh end - ;(function($){ ///这样写的意义是思路比较清晰 var Schedual=function(){ diff --git a/src/test/java/com/busassistant/dao/SchedualDaoTest.java b/src/test/java/com/busassistant/dao/SchedualDaoTest.java new file mode 100644 index 0000000..6b921d6 --- /dev/null +++ b/src/test/java/com/busassistant/dao/SchedualDaoTest.java @@ -0,0 +1,48 @@ +package com.busassistant.dao; + +/** + * Created by sl on 16-8-14. + */ + +import com.busasst.bean.SchedualBean; +import com.busasst.dao.RouteDao; +import com.busasst.dao.SchedualDao; +import javafx.scene.control.Alert; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.ContextHierarchy; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.web.WebAppConfiguration; + +import java.util.List; + +@RunWith(SpringJUnit4ClassRunner.class) +@WebAppConfiguration(value = "src/main/webapp") +@ContextHierarchy({ + @ContextConfiguration(name = "parent", locations = "classpath*:conf/spring.xml"), + @ContextConfiguration(name = "child", locations = "classpath*:conf/springmvc.xml") +}) +public class SchedualDaoTest { + + @Autowired + private SchedualDao schedualDao; + + @Autowired + private RouteDao routeDao; + + @Test + public void testGetDetaile(){ + List list = schedualDao.getDetaile("2014-08-1"); + Assert.assertNotNull(list); + } + + + @Test + public void testRouteById(){ + Assert.assertNotNull(routeDao.getById(1)); + } + +}