bf2

yiming
1 parent c1ff5367
Showing 7 changed files with 317 additions and 17 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/BsthStation.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/mapper/BsthStationMapper.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/IBsthTLineService.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/impl/BsthTLineServiceImpl.java
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthStationMapper.xml
bsthLineProfiles/src/main/resources/templates/system/line/map.html
@@ -12,6 +12,7 @@ import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.system.dict.domain.DictData;
 import com.ruoyi.project.system.dict.service.IDictDataService;
+import com.ruoyi.project.system.line.domain.BsthStation;
 import com.ruoyi.project.system.line.domain.BsthTLine;
 import com.ruoyi.project.system.line.domain.BsthTLineKFK;
 import com.ruoyi.project.system.line.domain.Company;
@@ -315,12 +316,9 @@ public class BsthTLineController extends BaseController
     @GetMapping("/getStation")
     @ResponseBody
-    public JSONObject getStation(String lng,String lat,String dis)
+    public AjaxResult getStation(String lng,String lat,String dis)
     {
-        String url="https://180.167.126.126:18991/prod-api/service/interfact/getStation?lng="+lng+"&lat="+lat+"&dis="+dis;
-        String s=HttpUtil.get(url);
-        System.out.println(s);
-        return JSONObject.parseObject(s);
+        return AjaxResult.success(bsthTLineService.selectBsthStationListByLoc(lng,lat,dis));
     }
 }
+package com.ruoyi.project.system.line.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 站点信息 过程或现状的站级信息都引用此站点信息对象 bsth_t_station
+ * 
+ * @author luwu
+ * @date 2021-05-28
+ */
+public class BsthStation
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+    private String standardStationCode;
+
+    /** 站点编码 */
+    private String stationCode;
+
+    /** 站点名 */
+    private String stationName;
+
+    /** 站点地址 */
+    private String stationAddress;
+
+    /** 站亭类型 站杆/站亭 */
+    private String boardType;
+
+    /** 站点类型 港湾式/沿路占车道 */
+    private String stationType;
+
+    /** 环域(内环、内至中环) */
+    private String annular;
+
+    /** 片区(南北片) */
+    private String area;
+
+    /** 道路名称 */
+    private String roadName;
+
+    /** 经度 */
+    private Double lonBd;
+
+    /** 纬度 */
+    private Double latBd;
+
+    /** 城建x坐标 */
+    private Double lonGps;
+
+    /** 城建y坐标 */
+    private Double latGps;
+
+    /** 区属 浦东新区 */
+    private String district;
+
+    /** 经过线路 */
+    private String lineList;
+
+    /** 是否有地铁 */
+    private String hasMetro;
+
+    private String remark;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setStandardStationCode(String standardStationCode) 
+    {
+        this.standardStationCode = standardStationCode;
+    }
+
+    public String getStandardStationCode() 
+    {
+        return standardStationCode;
+    }
+    public void setStationCode(String stationCode) 
+    {
+        this.stationCode = stationCode;
+    }
+
+    public String getStationCode() 
+    {
+        return stationCode;
+    }
+    public void setStationName(String stationName) 
+    {
+        this.stationName = stationName;
+    }
+
+    public String getStationName() 
+    {
+        return stationName;
+    }
+    public void setStationAddress(String stationAddress) 
+    {
+        this.stationAddress = stationAddress;
+    }
+
+    public String getStationAddress() 
+    {
+        return stationAddress;
+    }
+
+    public String getBoardType() {
+        return boardType;
+    }
+
+    public void setBoardType(String boardType) {
+        this.boardType = boardType;
+    }
+
+    public void setStationType(String stationType)
+    {
+        this.stationType = stationType;
+    }
+
+    public String getStationType() 
+    {
+        return stationType;
+    }
+    public void setAnnular(String annular) 
+    {
+        this.annular = annular;
+    }
+
+    public String getAnnular() 
+    {
+        return annular;
+    }
+    public void setArea(String area) 
+    {
+        this.area = area;
+    }
+
+    public String getArea() 
+    {
+        return area;
+    }
+    public void setRoadName(String roadName) 
+    {
+        this.roadName = roadName;
+    }
+
+    public String getRoadName() 
+    {
+        return roadName;
+    }
+    public void setLonBd(Double lonBd) 
+    {
+        this.lonBd = lonBd;
+    }
+
+    public Double getLonBd() 
+    {
+        return lonBd;
+    }
+    public void setLatBd(Double latBd) 
+    {
+        this.latBd = latBd;
+    }
+
+    public Double getLatBd() 
+    {
+        return latBd;
+    }
+    public void setLonGps(Double lonGps) 
+    {
+        this.lonGps = lonGps;
+    }
+
+    public Double getLonGps() 
+    {
+        return lonGps;
+    }
+    public void setLatGps(Double latGps) 
+    {
+        this.latGps = latGps;
+    }
+
+    public Double getLatGps() 
+    {
+        return latGps;
+    }
+    public void setDistrict(String district) 
+    {
+        this.district = district;
+    }
+
+    public String getDistrict() 
+    {
+        return district;
+    }
+    public void setLineList(String lineList) 
+    {
+        this.lineList = lineList;
+    }
+
+    public String getLineList() 
+    {
+        return lineList;
+    }
+    public void setHasMetro(String hasMetro) 
+    {
+        this.hasMetro = hasMetro;
+    }
+
+    public String getHasMetro() 
+    {
+        return hasMetro;
+    }
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("standardStationCode", getStandardStationCode())
+            .append("stationCode", getStationCode())
+            .append("stationName", getStationName())
+            .append("stationAddress", getStationAddress())
+            .append("stationType", getStationType())
+            .append("annular", getAnnular())
+            .append("area", getArea())
+            .append("roadName", getRoadName())
+            .append("lonBd", getLonBd())
+            .append("latBd", getLatBd())
+            .append("lonGps", getLonGps())
+            .append("latGps", getLatGps())
+            .append("district", getDistrict())
+            .append("lineList", getLineList())
+            .append("hasMetro", getHasMetro())
+            .toString();
+    }
+}
+package com.ruoyi.project.system.line.mapper;
+
+
+import com.ruoyi.project.system.line.domain.BsthStation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+@Mapper
+public interface BsthStationMapper 
+{
+    List<BsthStation> selectBsthStationListByLoc(@Param("lng")String lng, @Param("lat")String lat, @Param("dis")String dis);
+}
@@ -3,10 +3,7 @@ package com.ruoyi.project.system.line.service;
 import java.util.List;
 import java.util.Map;
-import com.ruoyi.project.system.line.domain.BsthTLine;
-import com.ruoyi.project.system.line.domain.BsthTLineKFK;
-import com.ruoyi.project.system.line.domain.Company;
-import com.ruoyi.project.system.line.domain.LineHistoryReport;
+import com.ruoyi.project.system.line.domain.*;
 /**
  * 【请填写功能名称】Service接口
@@ -77,4 +74,6 @@ public interface IBsthTLineService
 	void getCarPlate();
 	void getDeptId(BsthTLine bsthTLine);
+
+	List<BsthStation> selectBsthStationListByLoc(String lng,String lat,String dis);
 }
@@ -13,9 +13,8 @@ import com.ruoyi.common.utils.security.ShiroUtils;
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
 import com.ruoyi.project.system.dict.domain.DictData;
 import com.ruoyi.project.system.dict.service.IDictDataService;
-import com.ruoyi.project.system.line.domain.BsthTLineKFK;
-import com.ruoyi.project.system.line.domain.Company;
-import com.ruoyi.project.system.line.domain.LineHistoryReport;
+import com.ruoyi.project.system.line.domain.*;
+import com.ruoyi.project.system.line.mapper.BsthStationMapper;
 import com.ruoyi.project.system.user.domain.User;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,7 +25,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.ruoyi.project.system.line.mapper.BsthTLineMapper;
-import com.ruoyi.project.system.line.domain.BsthTLine;
 import com.ruoyi.project.system.line.service.IBsthTLineService;
 import com.ruoyi.common.utils.text.Convert;
 import org.springframework.util.concurrent.ListenableFuture;
@@ -52,6 +50,9 @@ public class BsthTLineServiceImpl implements IBsthTLineService
 	@Autowired
 	IDictDataService dictDataService;
+	@Autowired
+	BsthStationMapper bsthStationMapper;
+
     /**
      * 查询【请填写功能名称】
      * 
@@ -488,4 +489,9 @@ public class BsthTLineServiceImpl implements IBsthTLineService
 		long deptId= bsthTLineMapper.getDeptId(company);
 		bsthTLine.setDeptId(deptId);
 	}
+
+	@Override
+	public List<BsthStation> selectBsthStationListByLoc(String lng, String lat, String dis) {
+		return bsthStationMapper.selectBsthStationListByLoc(lng,lat,dis);
+	}
 }
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.system.line.mapper.BsthStationMapper">
+
+
+	<resultMap type="com.ruoyi.project.system.line.domain.BsthStation" id="BsthStationResult">
+		<result property="id"    column="id"    />
+		<result property="standardStationCode"    column="standard_station_code"    />
+		<result property="stationCode"    column="station_code"    />
+		<result property="stationName"    column="station_name"    />
+		<result property="stationAddress"    column="station_address"    />
+		<result property="stationType"    column="station_type"    />
+		<result property="boardType"    column="board_type"    />
+		<result property="annular"    column="annular"    />
+		<result property="area"    column="area"    />
+		<result property="roadName"    column="road_name"    />
+		<result property="lonBd"    column="lon_bd"    />
+		<result property="latBd"    column="lat_bd"    />
+		<result property="lonGps"    column="lon_gps"    />
+		<result property="latGps"    column="lat_gps"    />
+		<result property="district"    column="district"    />
+		<result property="lineList"    column="line_list"    />
+		<result property="hasMetro"    column="has_metro"    />
+		<result property="remark"    column="remark"    />
+	</resultMap>
+
+	<select id="selectBsthStationListByLoc" resultMap="BsthStationResult">
+		select id, standard_station_code, station_code, station_name, station_address, station_type, board_type, annular, area, road_name, lon_bd, lat_bd, lon_gps, lat_gps, district, line_list, has_metro, remark from bsth_t_station
+		where sqrt(
+		(((${lng}-lon_bd)*PI()*12656*COS(((${lat}+lat_bd)/2)*PI()/180)/180)
+		*
+		((${lng}-lon_bd)*PI()*12656*COS (((${lat}+lat_bd)/2)*PI()/180)/180))
+		+
+		(((${lat}-lat_bd)*PI()*12656/180)*((${lat}-lat_bd)*PI()*12656/180))
+		) &lt; ${dis}
+	</select>
+
+
+</mapper>
 \ No newline at end of file
@@ -84,7 +84,7 @@ body, html, #container {
 			</div>
 			<div class="row">
 				<h4></h4>
-				<label class="col-sm-3"><h4 class="lf">范围</h4></label>
+				<label class="col-sm-3"><h4 class="lf">范围(米)</h4></label>
 				<div class="col-sm-9">
 					<input id="distance" class="form-control" type="text" placeholder="单位米">
 				</div>
@@ -147,7 +147,7 @@ body, html, #container {
 		<form id="area" style="display: none">
 			<div class="row">
 				<h4></h4>
-				<label class="col-sm-3"><h4 class="lf">范围</h4></label>
+				<label class="col-sm-3"><h4 class="lf">范围(米)</h4></label>
 				<div class="col-sm-9">
 					<input id="distance2" class="form-control" type="text" placeholder="单位米">
 				</div>
@@ -250,7 +250,7 @@ body, html, #container {
 			$.get("../line/getStation?lng="
 					+lng + "&lat=" + lat + "&dis="
 					+ distance / 1000, function(data) {
-				if (data.code == "200") {
+				if (data.code == "0") {
 					var bus=new Array();
 					for ( var i in data.data) {
 						(function(){
@@ -314,7 +314,7 @@ body, html, #container {
 			$.get("../line/getStation?lng="
 					+lng + "&lat=" + lat + "&dis="
 					+ distance / 1000, function(data) {
-				if (data.code == "200") {
+				if (data.code == "0") {
 					var bus=new Array();
 					var c=0;
 					for ( var i in data.data) {