搜索站点调整

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

@@ -0,0 +1,15 @@
+package com.jpsoft.bus.modules.bus.dto;
+
+import lombok.Data;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2021-4-26 9:03
+ */
+@Data
+public class RouteStationDTO {
+
+    private String id;
+
+    private String name;
+}

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

@@ -101,9 +101,11 @@ id_,sort_no,route_id,name_,longitude_,latitude_,classify_,create_by,create_time,
 	<select id="search" parameterType="hashmap" resultMap="StationInfoMap">
 		<![CDATA[
 			select a.* from bus_station_info a
+			left join bus_route_info b on a.route_id = b.id_
 		]]>
 		<where>
 			a.del_flag = 0
+			and b.del_flag = 0
 			<if test="searchParams.id != null">
 				and a.ID_ like #{searchParams.id}
 			</if>
@@ -128,6 +130,9 @@ id_,sort_no,route_id,name_,longitude_,latitude_,classify_,create_by,create_time,
 			<if test="searchParams.routeId != null">
 				and a.route_id like #{searchParams.routeId}
 			</if>
+			<if test="searchParams.name !=null ">
+				and a.name_ like #{searchParams.name}
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 	        ${sort.name} ${sort.order}

web/src/main/java/com/jpsoft/bus/modules/mobile/controller/PassengerApiController.java

@@ -862,9 +862,9 @@ public class PassengerApiController {
 
                             //距离详情
                             String distanceStr = null;
-                            if (dis>=1000){
-                                distanceStr = dis/1000 + "公里";
-                            }else {
+                            if (dis >= 1000) {
+                                distanceStr = dis / 1000 + "公里";
+                            } else {
                                 distanceStr = dis + "米";
                             }
 
@@ -878,7 +878,7 @@ public class PassengerApiController {
                                 if (personStationIndex > stationIndex) {
 
                                     int diff = personStationIndex - stationIndex;
-                                    des = diff + "站 " +distanceStr;
+                                    des = diff + "站 " + distanceStr;
 
                                 }
                             }
@@ -930,7 +930,7 @@ public class PassengerApiController {
     public MessageResult<NearbyStationDTO> nearbyStationInfo(String id, String longitude, String latitude) {
         MessageResult<NearbyStationDTO> messageResult = new MessageResult<>();
 
-     //   List<NearbyStationDTO> nearbyStationDTOList = new ArrayList<>();
+        //   List<NearbyStationDTO> nearbyStationDTOList = new ArrayList<>();
         try {
 
 
@@ -1013,9 +1013,9 @@ public class PassengerApiController {
 
                     //距离详情
                     String distanceStr = null;
-                    if (dis>=1000){
-                        distanceStr = dis/1000 + "公里";
-                    }else {
+                    if (dis >= 1000) {
+                        distanceStr = dis / 1000 + "公里";
+                    } else {
                         distanceStr = dis + "米";
                     }
 
@@ -1135,13 +1135,55 @@ public class PassengerApiController {
 
         try {
 
+            List<RouteStationDTO> list = new ArrayList<>();
+            Map<String, Object> pageMap = new HashMap<>();
             Map<String, Object> searchParams = new HashMap<>();
             searchParams.put("name", "%" + name + "%");
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("create_time", "desc"));
             Page<RouteInfo> page = routeInfoService.pageSearch(searchParams, pageIndex, pageSize, true, sortList);
+            List<RouteInfo> routeInfoList = page.getResult();
+            if (routeInfoList.size() > 0) {
+                pageMap.put("recordsTotal", page.getTotal());
+                pageMap.put("recordsFiltered", page.getTotal());
+                pageMap.put("totalPage", page.getPages());
+                pageMap.put("pageNumber", page.getPageNum());
+                pageMap.put("pageSize", page.getPageSize());
+
+                for (RouteInfo routeInfo : routeInfoList){
+                    RouteStationDTO routeStationDTO = new RouteStationDTO();
+                    routeStationDTO.setId(routeInfo.getId());
+                    routeStationDTO.setName(routeInfo.getName());
+                    list.add(routeStationDTO);
+                }
 
-            messageResult.setData(PojoUtils.pageWrapper(page));
+            } else {
+                Page<StationInfo> page1 = stationInfoService.pageSearch(searchParams, pageIndex, pageSize, true, sortList);
+                List<StationInfo> stationInfoList = page1.getResult();
+
+                pageMap.put("recordsTotal", page1.getTotal());
+                pageMap.put("recordsFiltered", page1.getTotal());
+                pageMap.put("totalPage", page1.getPages());
+                pageMap.put("pageNumber", page1.getPageNum());
+                pageMap.put("pageSize", page1.getPageSize());
+                if (stationInfoList.size() > 0) {
+                    for (StationInfo stationInfo : stationInfoList) {
+                        RouteStationDTO routeStationDTO = new RouteStationDTO();
+                        routeStationDTO.setId(stationInfo.getRouteId());
+                        routeStationDTO.setName(stationInfo.getName());
+                        list.add(routeStationDTO);
+                    }
+                }
+            }
+
+
+
+
+
+            pageMap.put("data", list);
+
+
+            messageResult.setData(pageMap);
             messageResult.setCode(200);
             messageResult.setResult(true);
 
@@ -1435,7 +1477,7 @@ public class PassengerApiController {
 
             //购票类型
             String ticketTypeName = "成人票";
-            if ("1".equals(orderInfo.getTicketType())){
+            if ("1".equals(orderInfo.getTicketType())) {
                 ticketTypeName = "儿童票";
             }
 
@@ -1448,7 +1490,7 @@ public class PassengerApiController {
             passengerRecordDetailDTO.setTicketDes(ticketTypeName + " " + orderInfo.getTotalFee().subtract(orderInfo.getGoodsTicket()) + "元");
             passengerRecordDetailDTO.setGoodsTicket(orderInfo.getGoodsTicket() + "元");
             passengerRecordDetailDTO.setTotalFee(orderInfo.getTotalFee());
-            passengerRecordDetailDTO.setPayTime(DateUtil.format(orderInfo.getPayTime(),"yyyy-MM-dd HH:mm:ss"));
+            passengerRecordDetailDTO.setPayTime(DateUtil.format(orderInfo.getPayTime(), "yyyy-MM-dd HH:mm:ss"));
             passengerRecordDetailDTO.setTicketStatus(passengerInfo.getStatus());
             passengerRecordDetailDTO.setTicketStatusName(passengerRecordDetailDTO.getTicketStatusName(passengerRecordDetailDTO.getTicketStatus()));
             passengerRecordDetailDTO.setShiftInfo(shiftInfo);
@@ -1469,7 +1511,6 @@ public class PassengerApiController {
     }
 
 
-
     @PostMapping("problemFeedback")
     @ApiOperation(value = "问题反馈")
     @ApiImplicitParams({
@@ -1690,12 +1731,12 @@ public class PassengerApiController {
             @ApiImplicitParam(name = "shiftId", value = "班次id", paramType = "form"),
             @ApiImplicitParam(name = "openId", value = "openId", paramType = "form")
     })
-    public MessageResult<List<StationRemind>> passengerShiftRemindList(String shiftId,String openId) {
+    public MessageResult<List<StationRemind>> passengerShiftRemindList(String shiftId, String openId) {
         MessageResult<List<StationRemind>> messageResult = new MessageResult<>();
 
         try {
 
-            List<StationRemind> stationRemindList = stationRemindService.findByOpenIdAndVehicleShiftId(openId,shiftId);
+            List<StationRemind> stationRemindList = stationRemindService.findByOpenIdAndVehicleShiftId(openId, shiftId);
 
             messageResult.setData(stationRemindList);
             messageResult.setResult(true);
@@ -1710,7 +1751,6 @@ public class PassengerApiController {
     }
 
 
-
     @PostMapping("passengerRemindList")
     @ApiOperation(value = "乘客提醒列表")
     @ApiImplicitParams({