增加站点入口显示。

common/pom.xml

@@ -246,7 +246,7 @@
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
-            <version>2.6</version>
+            <version>2.8.1</version>
         </dependency>
         <!--gps-->
         <dependency>

common/src/main/java/com/jpsoft/bus/modules/bus/dao/StationSubInfoDAO.java

@@ -18,4 +18,6 @@ public interface StationSubInfoDAO {
 	List<StationSubInfo> search(Map<String,Object> searchParams,List<Sort> sortList);
 
     StationSubInfo findByStationIdStartEnd(String stationId, String startStationId, String endStationId);
+
+    List<StationSubInfo> findByStationId(String stationId);
 }

common/src/main/java/com/jpsoft/bus/modules/bus/dto/StationInfoDTO.java

@@ -1,9 +1,12 @@
 package com.jpsoft.bus.modules.bus.dto;
 
+import com.jpsoft.bus.modules.bus.entity.StationSubInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.NotBlank;
 
+import java.util.List;
+
 @Data
 public class StationInfoDTO {
     /**
@@ -44,6 +47,10 @@ public class StationInfoDTO {
 
     @ApiModelProperty(value = "是否删除")
     private Boolean delFlag;
+
     @ApiModelProperty(value = "半径(米)")
     private Integer radius;
+
+    @ApiModelProperty(value = "站点入口")
+    private List<StationSubInfo> stationSubInfoList;
 }

common/src/main/java/com/jpsoft/bus/modules/bus/service/StationSubInfoService.java

@@ -16,4 +16,6 @@ public interface StationSubInfoService {
 	Page<StationSubInfo> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
 
     StationSubInfo findByStationIdStartEnd(String currentStationId, String startStationId, String endStationId);
+
+    List<StationSubInfo> findByStationId(String stationId);
 }

common/src/main/java/com/jpsoft/bus/modules/bus/service/impl/StationSubInfoServiceImpl.java

@@ -73,4 +73,9 @@ public class StationSubInfoServiceImpl implements StationSubInfoService {
 	public StationSubInfo findByStationIdStartEnd(String currentStationId, String startStationId, String endStationId) {
 		return stationSubInfoDAO.findByStationIdStartEnd(currentStationId,startStationId,endStationId);
 	}
+
+	@Override
+	public List<StationSubInfo> findByStationId(String stationId) {
+		return stationSubInfoDAO.findByStationId(stationId);
+	}
 }

common/src/main/resources/mapper/bus/StationSubInfo.xml

@@ -143,4 +143,11 @@
 		limit 1
 		]]>
     </select>
+    <select id="findByStationId" resultMap="StationSubInfoMap">
+        <![CDATA[
+            select * from bus_station_sub_info
+            where del_flag = 0
+            and station_id = #{stationId}
+		]]>
+    </select>
 </mapper>

pom.xml

@@ -21,7 +21,7 @@
     <description>车信达</description>
     <properties>
         <java.version>1.8</java.version>
-        <lombok.version>1.16.12</lombok.version>
+        <lombok.version>1.18.12</lombok.version>
     </properties>
 
 
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
+            <version>1.18.12</version>
         </dependency>
         <dependency>
             <groupId>cn.hutool</groupId>

web/pom.xml

@@ -122,11 +122,6 @@
             </exclusions>
         </dependency>
         <!--支付相关 end-->
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>2.6</version>
-        </dependency>
     </dependencies>
 
     <build>

web/src/main/java/com/jpsoft/bus/modules/bus/controller/RouteInfoController.java

@@ -5,14 +5,12 @@ import com.jpsoft.bus.config.OSSConfig;
 import com.jpsoft.bus.modules.bus.dto.RouteInfoDTO;
 import com.jpsoft.bus.modules.bus.dto.RouteMapPathDTO;
 import com.jpsoft.bus.modules.bus.dto.StationInfoDTO;
-import com.jpsoft.bus.modules.bus.entity.CompanyInfo;
-import com.jpsoft.bus.modules.bus.entity.StationInfo;
-import com.jpsoft.bus.modules.bus.entity.VehicleInfo;
+import com.jpsoft.bus.modules.bus.entity.*;
 import com.jpsoft.bus.modules.bus.service.CompanyInfoService;
 import com.jpsoft.bus.modules.bus.service.StationInfoService;
+import com.jpsoft.bus.modules.bus.service.StationSubInfoService;
 import com.jpsoft.bus.modules.common.dto.MessageResult;
 import com.jpsoft.bus.modules.common.dto.Sort;
-import com.jpsoft.bus.modules.bus.entity.RouteInfo;
 import com.jpsoft.bus.modules.bus.service.RouteInfoService;
 import com.jpsoft.bus.modules.common.utils.OSSUtil;
 import com.jpsoft.bus.modules.common.utils.POIUtils;
@@ -68,6 +66,9 @@ public class RouteInfoController {
     @Autowired
     private UserService userService;
 
+    @Autowired
+    private StationSubInfoService stationSubInfoService;
+
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
     public MessageResult<RouteInfoDTO> create(){
@@ -184,6 +185,9 @@ public class RouteInfoController {
                     stationInfoDTO.setSortNo(stationInfo.getSortNo());
                     stationInfoDTO.setDelFlag(stationInfo.getDelFlag());
 
+                    List<StationSubInfo> stationSubInfoList = stationSubInfoService.findByStationId(stationInfo.getId());
+                    stationInfoDTO.setStationSubInfoList(stationSubInfoList);
+
                     stationInfoDTOList.add(stationInfoDTO);
                 }
 

web/src/main/resources/application-dev.yml

@@ -7,14 +7,14 @@ spring:
   datasource:
 
     #开发环境
-     url: jdbc:log4jdbc:mysql://192.168.33.20:3306/smart-bus?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-     username: root
-     password: jpsoft2016
+#     url: jdbc:log4jdbc:mysql://192.168.33.20:3306/smart-bus?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#     username: root
+#     password: jpsoft2016
 
     #测试环境
-#     url: jdbc:log4jdbc:mysql://47.92.161.104:3336/smart-bus?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-#     username: root
-#     password: jpsoft8121234
+    url: jdbc:log4jdbc:mysql://47.92.161.104:3336/smart-bus?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    username: root
+    password: jpsoft8121234
 
     #正式环境
 #     url: jdbc:log4jdbc:mysql://122.189.98.152:3336/jp_housekeeper?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
@@ -28,7 +28,7 @@ spring:
     restart:
       enabled: true
   rabbitmq:
-    host: 192.168.33.20
+    host: 127.0.0.1
     virtual-host: tomatozq
 
 logger: