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

src/main/java/com/elephant/framework/galaxy/aroad/module/roadcondition/controller/RoadConditionEventController.java

@@ -36,9 +36,19 @@ public class RoadConditionEventController extends BaseController {
       Page page, @RequestBody RoadConditionEvent roadConditionEvent) {
     //        log.error("接收实体：{}", roadConditionEvent);
     page.setCurrent(roadConditionEvent.getCurrent());
+    page.setSize(roadConditionEvent.getSize());
     return new R<>(roadConditionEventService.getRoadConditionEventPage(page, roadConditionEvent));
   }
-
+  /**
+   * 分页查询
+   *
+   * @param text 路况事件统计
+   * @return
+   */
+  @GetMapping("/mobilepage")
+  public R getRoadConditionEventMobilePage(@RequestParam("text") String text) {
+    return new R<>(roadConditionEventService.getRoadConditionEventMobilePage(text));
+  }
   /**
    * @description : 根据事件类型统计
    * @author : Xingyuyang

src/main/java/com/elephant/framework/galaxy/aroad/module/roadcondition/entity/RoadConditionEvent.java

@@ -65,6 +65,8 @@ public class RoadConditionEvent extends Model<RoadConditionEvent> {
   private String endReason;
 
   private Long current;
+
+  private Long size;
   /**
    * 经度
    */

src/main/java/com/elephant/framework/galaxy/aroad/module/roadcondition/mapper/RoadConditionEventMapper.java

@@ -18,6 +18,8 @@ public interface RoadConditionEventMapper extends BaseMapper<RoadConditionEvent>
   IPage<RoadConditionEvent> getRoadConditionEventPage(
       IPage<RoadConditionEvent> page, RoadConditionEvent roadConditionEvent);
 
+  List<RoadConditionEvent> getRoadConditionEventMobilePage(@Param("text") String text);
+
   List<staticByEventTypeDto> staticByEventType();
 
   List<staticByInfluenceDto> staticByInfluence();

src/main/java/com/elephant/framework/galaxy/aroad/module/roadcondition/service/RoadConditionEventService.java

@@ -16,6 +16,7 @@ import java.util.List;
  */
 public interface RoadConditionEventService extends IService<RoadConditionEvent> {
 	IPage<RoadConditionEvent> getRoadConditionEventPage(Page<RoadConditionEvent> page, RoadConditionEvent roadConditionEvent);
+	List<RoadConditionEvent> getRoadConditionEventMobilePage(String text);
 	/**
 	 *
 	 * @description : 根据事件类型查询

src/main/java/com/elephant/framework/galaxy/aroad/module/roadcondition/service/impl/RoadConditionEventServiceImpl.java

@@ -33,6 +33,10 @@ public class RoadConditionEventServiceImpl
         return baseMapper.getRoadConditionEventPage(page, roadConditionEvent);
     }
 
+    public List<RoadConditionEvent> getRoadConditionEventMobilePage(@Param("text") String text) {
+        return baseMapper.getRoadConditionEventMobilePage(text);
+    }
+
     /**
    * @description : 根据事件类型查询
    * @author : Xingyuyang

src/main/resources/mapper/roadcondition/RoadConditionEventMapper.xml

@@ -96,6 +96,34 @@
 		</where>
 	</select>
 
+	<select id="getRoadConditionEventMobilePage" resultMap="roadConditionEventMap">
+		SELECT
+		id,road_code,concat(road_code,'·',road_name) as
+		road_name,startm,endm,event_type,event_title,event_content,influence,cars_length,solution,start_time,start_unit,start_person,pre_end_time,end_time,end_unit,end_reason,longitude,latitude
+		FROM road_condition_event
+		<where>
+			<if test="text!= null">
+				road_code like CONCAT('%',#{text},'%')
+				or
+				road_name like CONCAT('%',#{text},'%')
+				or
+				event_type like CONCAT('%',#{text},'%')
+				or
+				event_title like CONCAT('%',#{text},'%')
+				or
+				event_content like CONCAT('%',#{text},'%')
+				or
+				influence like CONCAT('%',#{text},'%')
+				or
+				cars_length like CONCAT('%',#{text},'%')
+				or
+				start_unit like CONCAT('%',#{text},'%')
+				and
+			</if>
+			road_name is not null
+		</where>
+	</select>
+
 	<select id="getById" resultMap="roadConditionEventMap">
 		SELECT *
 		FROM road_condition_event