站点价格编辑功能

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

@@ -100,11 +100,12 @@ id_,sort_no,route_id,name_,longitude_,latitude_,classify_,create_by,create_time,
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="StationInfoMap">
 		<![CDATA[
-			select * from bus_station_info
+			select a.* from bus_station_info a
 		]]>
 		<where>
+			a.del_flag = 0
 			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+				and a.ID_ like #{searchParams.id}
 			</if>
 			<if test="searchParams.maxLongitude != null">
 				<![CDATA[
@@ -113,16 +114,19 @@ id_,sort_no,route_id,name_,longitude_,latitude_,classify_,create_by,create_time,
 			</if>
 			<if test="searchParams.minLongitude != null">
 				<![CDATA[
-				and longitude_ >= #{searchParams.minLongitude}
+				and a.longitude_ >= #{searchParams.minLongitude}
 				]]>
 			</if>
 			<if test="searchParams.maxLatitude != null">
 				<![CDATA[
-				and latitude_ <= #{searchParams.maxLatitude}
+				and a.latitude_ <= #{searchParams.maxLatitude}
 				]]>
 			</if>
 			<if test="searchParams.minLatitude != null">
-				and latitude_ >= #{searchParams.minLatitude}
+				and a.latitude_ >= #{searchParams.minLatitude}
+			</if>
+			<if test="searchParams.routeId != null">
+				and a.route_id like #{searchParams.routeId}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -528,4 +528,26 @@ public class PriceInfoController {
 
         return msgResult;
     }
+
+
+    @ApiOperation(value="根据站点查金额")
+    @RequestMapping(value = "findPriceByStation",method = RequestMethod.POST)
+    public MessageResult<PriceInfo> list(
+            String startStationId,
+            String endStationId,
+            @RequestAttribute String subject){
+
+        MessageResult<PriceInfo> msgResult = new MessageResult<>();
+
+        PriceInfo priceInfo = priceInfoService.findByStartStationAndEndStation(startStationId,endStationId);
+        if(priceInfo == null){
+            priceInfo = new PriceInfo();
+        }
+
+        msgResult.setResult(true);
+        msgResult.setData(priceInfo);
+
+        return msgResult;
+    }
+
 }

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

@@ -12,6 +12,7 @@ import com.jpsoft.bus.modules.common.utils.OSSUtil;
 import com.jpsoft.bus.modules.common.utils.POIUtils;
 import com.jpsoft.bus.modules.common.utils.PojoUtils;
 import com.jpsoft.bus.modules.sys.entity.DataDictionary;
+import com.jpsoft.bus.modules.sys.entity.User;
 import com.jpsoft.bus.modules.sys.service.DataDictionaryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -363,4 +364,25 @@ public class StationInfoController {
 
         return msgResult;
     }
+
+    @ApiOperation(value="站点列表")
+    @RequestMapping(value = "list",method = RequestMethod.POST)
+    public MessageResult<List<StationInfo>> list(String routeId,@RequestAttribute String subject){
+
+        MessageResult<List<StationInfo>> msgResult = new MessageResult<>();
+
+
+        Map<String,Object> searchParams = new HashMap<>();
+        searchParams.put("routeId",routeId);
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("a.sort_no","asc"));
+
+        Page<StationInfo> page = stationInfoService.pageSearch(searchParams,0,1000,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(page.getResult());
+
+        return msgResult;
+    }
 }