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

zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java

@@ -66,6 +66,12 @@ public class DCPerceivedEventsWarningController extends BaseController {
     public AjaxResult getWarningList(@RequestBody DcWarning dcWarning){
         return  AjaxResult.success(perceivedEventsWarningService.selectWarningList(dcWarning));
     }
+    //首页感知事件列表分页
+    @PostMapping("/warningListPage")
+    public TableDataInfo getWarningListPage(@RequestBody DcWarning dcWarning){
+        startPage();
+        return  getDataTable(perceivedEventsWarningService.selectWarningList(dcWarning));
+    }
     //查询感知数量按照路段数量进行排名
     @PostMapping("/sectionPerceivedList")
     public AjaxResult getSectionPerceivedEventsList(){

zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml

@@ -194,17 +194,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY d.stake_mark ASC;
     </select>
 
-    <select id="selectlistVisibility"  parameterType="com.zc.business.domain.DcMeteorologicalDetectorData" resultMap="DcMeteorologicalDetectorDataResult">
+    <select id="selectlistVisibility" parameterType="com.zc.business.domain.DcMeteorologicalDetectorData" resultMap="DcMeteorologicalDetectorDataResult">
-        select  d.iot_device_id, d.stake_mark, d.direction, d.device_name, d.device_state, d.stake_mark_range,
+        SELECT
-                m.create_time,
+        d.iot_device_id,
-                m.rainfall, m.visibility_type, m.visibility, m.atmospheric_pressure,
+        d.stake_mark,
-                m.temperature, m.humidity, m.wind_direction, m.wind_speed,
+        d.direction,
-                m.precipitation_type, m.wet_slippery_coefficient,
+        d.device_name,
-                m.remote_road_surface_temperature, m.remote_road_surface_status,
+        d.device_state,
-                m.water_film_ice_snow_value
+        d.stake_mark_range,
-        from dc_meteorological_detector_data AS m
+        m.create_time,
-                 LEFT JOIN dc_device AS d
+        m.rainfall,
-                           ON d.iot_device_id =m.iot_device_id
+        m.visibility_type,
-        WHERE m.visibility_type !=4
+        m.visibility,
+        m.atmospheric_pressure,
+        m.temperature,
+        m.humidity,
+        m.wind_direction,
+        m.wind_speed,
+        m.precipitation_type,
+        m.wet_slippery_coefficient,
+        m.remote_road_surface_temperature,
+        m.remote_road_surface_status,
+        m.water_film_ice_snow_value
+        FROM
+        dc_meteorological_detector_data AS m
+        LEFT JOIN
+        dc_device AS d ON d.iot_device_id = m.iot_device_id
+        <where>
+            m.visibility_type != 4
+            <if test="visibilityType != null and visibilityType != ''">AND m.visibility_type = #{visibilityType}</if>
+            AND DATE(m.create_time) = CURDATE()
+        </where>
     </select>
 </mapper>