git-svn-id: https://192.168.57.71/svn/qt@68 12fe181a-e57f-b044-8676-16dc139aa63e

jdc/jdcweb/trunk/src/main/java/com/jsjty/jdc/web/camera/dao/CameraGisDao.java

@@ -9,9 +9,9 @@ import com.xtframe.sec.common.SecRepository;
 
 public interface CameraGisDao extends SecRepository<CameraGisEntity, String> {
 
-    @Query(value = "select c.*,g.x,g.y from t_jdc_camera c  join t_jdc_camera_gis g on c.CAMERAID=g.CAMERAID", nativeQuery = true)
+    @Query(value = "select c.*,g.lng x,g.lat y from t_jdc_camera c  join hw_route_camera g on c.CAMERAID=g.CAMERA_ID", nativeQuery = true)
     public List<CameraGisEntity> findAllCameraLocation();
     
-    @Query(value = "select c.*,g.x,g.y from t_jdc_camera c  join t_jdc_camera_gis g on c.CAMERAID=g.CAMERAID where g.type=?1", nativeQuery = true)
-    public List<CameraGisEntity> findCameraByType(String type);
+    @Query(value = "select c.*,g.lng x,g.lat y from t_jdc_camera c  join hw_route_camera g on c.CAMERAID=g.CAMERA_ID", nativeQuery = true)
+    public List<CameraGisEntity> findCameraByType();
 }

jdc/jdcweb/trunk/src/main/java/com/jsjty/jdc/web/camera/dao/HwRouteCameraDao.java

@@ -0,0 +1,14 @@
+package com.jsjty.jdc.web.camera.dao;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Query;
+
+import com.jsjty.jdc.web.camera.entity.HwRouteCameraEntity;
+import com.xtframe.sec.common.SecRepository;
+
+public interface HwRouteCameraDao extends SecRepository<HwRouteCameraEntity, String> {
+
+    @Query(value = "select * from hw_route_camera", nativeQuery = true)
+    public List<HwRouteCameraEntity> findAllCameraLocation();
+}

jdc/jdcweb/trunk/src/main/java/com/jsjty/jdc/web/camera/entity/HwRouteCameraEntity.java

@@ -0,0 +1,146 @@
+package com.jsjty.jdc.web.camera.entity;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Type;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.utils.BooleanSerializer;
+
+/**
+ * 视频摄像头信息表<br>
+ * 长天智远
+ * 
+ * @author 袁晓冬
+ *
+ */
+@Entity
+@Table(name = "HW_ROUTE_CAMERA")
+public class HwRouteCameraEntity extends BaseEntity<String> {
+
+    /** serialVersionUID */
+    private static final long serialVersionUID = 2217208302852039119L;
+    /** 摄像机ID */
+    private String cameraId;
+    /** 路段ID */
+    private String routeId;
+    /** 桩号 */
+    private String position;
+    /** 截屏URL */
+    private String url;
+    /** 所处点位置 */
+    private String pile;
+    /** 标准经度 */
+    private String lng;
+    /** 标准纬度 */
+    private String lat;
+    /** 百度经度 */
+    private String bLng;
+    /** 百度纬度 */
+    private String bLat;
+    /** 高德经度 */
+    private String gLng;
+    /** 高德纬度 */
+    private String gLat;
+    /** 始发地 */
+    private String directiona;
+    /** 目的地 */
+    private String directionb;
+    @Id
+	public String getCameraId() {
+		return cameraId;
+	}
+	public void setCameraId(String cameraId) {
+		this.cameraId = cameraId;
+	}
+	public String getRouteId() {
+		return routeId;
+	}
+	public void setRouteId(String routeId) {
+		this.routeId = routeId;
+	}
+	public String getPosition() {
+		return position;
+	}
+	public void setPosition(String position) {
+		this.position = position;
+	}
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	public String getPile() {
+		return pile;
+	}
+	public void setPile(String pile) {
+		this.pile = pile;
+	}
+	public String getLng() {
+		return lng;
+	}
+	public void setLng(String lng) {
+		this.lng = lng;
+	}
+	public String getLat() {
+		return lat;
+	}
+	public void setLat(String lat) {
+		this.lat = lat;
+	}
+	public String getbLng() {
+		return bLng;
+	}
+	public void setbLng(String bLng) {
+		this.bLng = bLng;
+	}
+	public String getbLat() {
+		return bLat;
+	}
+	public void setbLat(String bLat) {
+		this.bLat = bLat;
+	}
+	public String getgLng() {
+		return gLng;
+	}
+	public void setgLng(String gLng) {
+		this.gLng = gLng;
+	}
+	public String getgLat() {
+		return gLat;
+	}
+	public void setgLat(String gLat) {
+		this.gLat = gLat;
+	}
+	@Column(name = "DIRECTION_A")
+	public String getDirectiona() {
+		return directiona;
+	}
+	public void setDirectiona(String directiona) {
+		this.directiona = directiona;
+	}
+	@Column(name = "DIRECTION_B")
+	public String getDirectionb() {
+		return directionb;
+	}
+	public void setDirectionb(String directionb) {
+		this.directionb = directionb;
+	}
+	@Override
+	public String toString() {
+		return "HwRouteCameraEntity [cameraId=" + cameraId + ", routeId="
+				+ routeId + ", position=" + position + ", url=" + url
+				+ ", pile=" + pile + ", lng=" + lng + ", lat=" + lat
+				+ ", bLng=" + bLng + ", bLat=" + bLat + ", gLng=" + gLng
+				+ ", gLat=" + gLat + ", directiona=" + directiona
+				+ ", directionb=" + directionb + "]";
+	}
+
+}

jdc/jdcweb/trunk/src/main/java/com/jsjty/jdc/web/camera/service/impl/CameraServiceImpl.java

@@ -149,7 +149,7 @@ public class CameraServiceImpl implements CameraService {
 
     @Override
     public List<CameraGisEntity> findCameraByType(String type) {
-        return gisdao.findCameraByType(type);
+        return gisdao.findCameraByType();
     }
 
 }