Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/controller/TrafficRoadsectionController.java

 package com.elephant.framework.galaxy.aroad.module.traffic.controller;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.elephant.framework.galaxy.aroad.response.R;
 import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
 import com.elephant.framework.galaxy.aroad.module.traffic.entity.TrafficRoadsection;
 import com.elephant.framework.galaxy.aroad.module.traffic.service.TrafficRoadsectionService;
+import com.elephant.framework.galaxy.aroad.response.R;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
-import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
 
 
 /**
@@ -32,7 +31,7 @@ public class TrafficRoadsectionController extends BaseController  {
    */
   @GetMapping("/page")
   public R getTrafficRoadsectionPage(Page page, TrafficRoadsection trafficRoadsection) {
-    return  new R<>(trafficRoadsectionService.page(page,Wrappers.query(trafficRoadsection)));
+    return  new R<>(trafficRoadsectionService.getTrafficRoadsectionPage(page,trafficRoadsection));
   }
 
 

src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/controller/TrafficRouteController.java

 package com.elephant.framework.galaxy.aroad.module.traffic.controller;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.elephant.framework.galaxy.aroad.response.R;
 import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
 import com.elephant.framework.galaxy.aroad.module.traffic.entity.TrafficRoute;
 import com.elephant.framework.galaxy.aroad.module.traffic.service.TrafficRouteService;
+import com.elephant.framework.galaxy.aroad.response.R;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
-import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
 
 
 /**
@@ -32,7 +31,7 @@ public class TrafficRouteController extends BaseController  {
    */
   @GetMapping("/page")
   public R getTrafficRoutePage(Page page, TrafficRoute trafficRoute) {
-    return  new R<>(trafficRouteService.page(page,Wrappers.query(trafficRoute)));
+    return  new R<>(trafficRouteService.getTrafficRoutePage(page,trafficRoute));
   }
 
 

src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/controller/TrafficSpotController.java

 package com.elephant.framework.galaxy.aroad.module.traffic.controller;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.elephant.framework.galaxy.aroad.response.R;
 import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
 import com.elephant.framework.galaxy.aroad.module.traffic.entity.TrafficSpot;
 import com.elephant.framework.galaxy.aroad.module.traffic.service.TrafficSpotService;
+import com.elephant.framework.galaxy.aroad.response.R;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
-import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
 
 
 /**
@@ -32,7 +31,7 @@ public class TrafficSpotController extends BaseController  {
    */
   @GetMapping("/page")
   public R getTrafficSpotPage(Page page, TrafficSpot trafficSpot) {
-    return  new R<>(trafficSpotService.page(page,Wrappers.query(trafficSpot)));
+    return  new R<>(trafficSpotService.getTrafficSpotPage(page,trafficSpot));
   }
 
 

src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/mapper/TrafficRoadsectionMapper.java

 package com.elephant.framework.galaxy.aroad.module.traffic.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.elephant.framework.galaxy.aroad.module.traffic.entity.TrafficRoadsection;
 
 /**
@@ -10,5 +12,6 @@ import com.elephant.framework.galaxy.aroad.module.traffic.entity.TrafficRoadsect
  * @date 2019-04-30 10:48:34
  */
 public interface TrafficRoadsectionMapper extends BaseMapper<TrafficRoadsection> {
+	IPage<TrafficRoadsection> getTrafficRoadsectionPage(Page<TrafficRoadsection> page, TrafficRoadsection trafficRoadsection);
 
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/mapper/TrafficRouteMapper.java

 package com.elephant.framework.galaxy.aroad.module.traffic.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.elephant.framework.galaxy.aroad.module.traffic.entity.TrafficRoute;
 
 /**
@@ -10,5 +12,6 @@ import com.elephant.framework.galaxy.aroad.module.traffic.entity.TrafficRoute;
  * @date 2019-04-30 10:44:18
  */
 public interface TrafficRouteMapper extends BaseMapper<TrafficRoute> {
+	IPage<TrafficRoute> getTrafficRoutePage(Page<TrafficRoute> page, TrafficRoute trafficRoute);
 
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/mapper/TrafficSpotMapper.java

 package com.elephant.framework.galaxy.aroad.module.traffic.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.elephant.framework.galaxy.aroad.module.traffic.entity.TrafficSpot;
 
 /**
@@ -10,5 +12,6 @@ import com.elephant.framework.galaxy.aroad.module.traffic.entity.TrafficSpot;
  * @date 2019-04-29 14:38:10
  */
 public interface TrafficSpotMapper extends BaseMapper<TrafficSpot> {
+	IPage<TrafficSpot> getTrafficSpotPage(Page<TrafficSpot> page, TrafficSpot trafficSpot);
 
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/service/TrafficRoadsectionService.java

 package com.elephant.framework.galaxy.aroad.module.traffic.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.elephant.framework.galaxy.aroad.module.traffic.entity.TrafficRoadsection;
 
@@ -10,5 +12,6 @@ import com.elephant.framework.galaxy.aroad.module.traffic.entity.TrafficRoadsect
  * @date 2019-04-30 10:48:34
  */
 public interface TrafficRoadsectionService extends IService<TrafficRoadsection> {
+	IPage<TrafficRoadsection> getTrafficRoadsectionPage(Page<TrafficRoadsection> page, TrafficRoadsection trafficRoadsection);
 
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/service/TrafficRouteService.java

 package com.elephant.framework.galaxy.aroad.module.traffic.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.elephant.framework.galaxy.aroad.module.traffic.entity.TrafficRoute;
 
@@ -10,5 +12,6 @@ import com.elephant.framework.galaxy.aroad.module.traffic.entity.TrafficRoute;
  * @date 2019-04-30 10:44:18
  */
 public interface TrafficRouteService extends IService<TrafficRoute> {
+	IPage<TrafficRoute> getTrafficRoutePage(Page<TrafficRoute> page, TrafficRoute trafficRoute);
 
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/service/TrafficSpotService.java

 package com.elephant.framework.galaxy.aroad.module.traffic.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.elephant.framework.galaxy.aroad.module.traffic.entity.TrafficSpot;
 
@@ -11,4 +13,5 @@ import com.elephant.framework.galaxy.aroad.module.traffic.entity.TrafficSpot;
  */
 public interface TrafficSpotService extends IService<TrafficSpot> {
 
+	IPage<TrafficSpot> getTrafficSpotPage(Page<TrafficSpot> page, TrafficSpot trafficSpot);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/service/impl/TrafficRoadsectionServiceImpl.java

 package com.elephant.framework.galaxy.aroad.module.traffic.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.elephant.framework.galaxy.aroad.module.traffic.entity.TrafficRoadsection;
 import com.elephant.framework.galaxy.aroad.module.traffic.mapper.TrafficRoadsectionMapper;
@@ -14,5 +16,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TrafficRoadsectionServiceImpl extends ServiceImpl<TrafficRoadsectionMapper, TrafficRoadsection> implements TrafficRoadsectionService {
-
+	public IPage<TrafficRoadsection> getTrafficRoadsectionPage(Page<TrafficRoadsection> page, TrafficRoadsection trafficRoadsection){
+		return baseMapper.getTrafficRoadsectionPage(page, trafficRoadsection);
+	}
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/service/impl/TrafficRouteServiceImpl.java

 package com.elephant.framework.galaxy.aroad.module.traffic.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.elephant.framework.galaxy.aroad.module.traffic.entity.TrafficRoute;
 import com.elephant.framework.galaxy.aroad.module.traffic.mapper.TrafficRouteMapper;
@@ -14,5 +16,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TrafficRouteServiceImpl extends ServiceImpl<TrafficRouteMapper, TrafficRoute> implements TrafficRouteService {
-
+	public IPage<TrafficRoute> getTrafficRoutePage(Page<TrafficRoute> page, TrafficRoute trafficRoute){
+		return baseMapper.getTrafficRoutePage(page, trafficRoute);
+	}
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/service/impl/TrafficSpotServiceImpl.java

 package com.elephant.framework.galaxy.aroad.module.traffic.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.elephant.framework.galaxy.aroad.module.traffic.entity.TrafficSpot;
 import com.elephant.framework.galaxy.aroad.module.traffic.mapper.TrafficSpotMapper;
@@ -15,4 +17,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class TrafficSpotServiceImpl extends ServiceImpl<TrafficSpotMapper, TrafficSpot> implements TrafficSpotService {
 
+	public IPage<TrafficSpot> getTrafficSpotPage(Page<TrafficSpot> page,  TrafficSpot trafficSpot){
+		return baseMapper.getTrafficSpotPage(page, trafficSpot);
+	}
 }

src/main/resources/mapper/traffic/TrafficRoadsectionMapper.xml

@@ -26,4 +26,15 @@
         <result property="jdcCurrentAmount" column="JDC_current_amount"/>
         <result property="jdcNaturalAmount" column="JDC_natural_amount"/>
   </resultMap>
+
+      <select id="getTrafficRoadsectionPage" resultMap="trafficRoadsectionMap">
+            select * from traffic_roadsection
+            <where>
+                  <if test="trafficRoadsection.spotName != null">
+                        spot_name like CONCAT('%',#{trafficRoadsection.spotName},'%')
+                        or
+                        spot_code like CONCAT('%',#{trafficRoadsection.spotName},'%')
+                  </if>
+            </where>
+      </select>
 </mapper>

src/main/resources/mapper/traffic/TrafficRouteMapper.xml

@@ -27,4 +27,16 @@
 		<result property="adaptAmount" column="adapt_amount"/>
 		<result property="crowd" column="crowd"/>
 	</resultMap>
+
+	<select id="getTrafficRoutePage" resultMap="trafficRouteMap"
+	        parameterType="com.elephant.framework.galaxy.aroad.module.traffic.entity.TrafficRoute">
+		select * from traffic_route
+		<where>
+			<if test="trafficRoute.roadName != null">
+				road_name like CONCAT('%',#{trafficRoute.roadName},'%')
+				or
+				road_code like CONCAT('%',#{trafficRoute.roadName},'%')
+			</if>
+		</where>
+	</select>
 </mapper>

src/main/resources/mapper/traffic/TrafficSpotMapper.xml

@@ -26,4 +26,15 @@
 		<result property="landscape" column="landscape"/>
 		<result property="stopMonth" column="stop_month"></result>
 	</resultMap>
+
+	<select id="getTrafficSpotPage" resultMap="trafficSpotMap">
+		select * from traffic_spot
+		<where>
+			<if test="trafficSpot.roadName != null">
+				road_name like CONCAT('%',#{trafficSpot.roadName},'%')
+				or
+				road_code like CONCAT('%',#{trafficSpot.roadName},'%')
+			</if>
+		</where>
+	</select>
 </mapper>