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

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

@@ -39,4 +39,12 @@ public class DcMeteorologicalDetectorController  extends BaseController {
         List<DcMeteorologicalDetectorData> list = dcMeteorologicalDetectorDataService.selectlistAll(dcMeteorologicalDetectorData);
         return getDataTable(list);
     }
+        @ApiOperation("能见度异常信息")
+    @GetMapping("/listVisibility")
+    public TableDataInfo listVisibility(DcMeteorologicalDetectorData dcMeteorologicalDetectorData)
+    {
+        List<DcMeteorologicalDetectorData> list = dcMeteorologicalDetectorDataService.selectlistVisibility(dcMeteorologicalDetectorData);
+        return getDataTable(list);
+    }
+
 }

zc-business/src/main/java/com/zc/business/domain/DcMeteorologicalDetectorData.java

@@ -121,6 +121,10 @@ public class DcMeteorologicalDetectorData extends BaseEntity
     @ApiModelProperty("状态")
     @TableField(exist = false)
     private String deviceState;
+    @ApiModelProperty("桩号范围")
+    @TableField(exist = false)
+    private String stakeMarkRange;
+
 // "rainfall": 0,
 //    "visibility": "05.000",
 //    "remoteRoadSurfaceTemperature": 11.5,

zc-business/src/main/java/com/zc/business/mapper/DcMeteorologicalDetectorDataMapper.java

@@ -65,4 +65,6 @@ public interface DcMeteorologicalDetectorDataMapper
     List<Map<String, String>> selectStatistics(String deviceName);
 
     List<DcMeteorologicalDetectorData> selectlistAll(DcMeteorologicalDetectorData dcMeteorologicalDetectorData);
+
+    List<DcMeteorologicalDetectorData> selectlistVisibility(DcMeteorologicalDetectorData dcMeteorologicalDetectorData);
 }

zc-business/src/main/java/com/zc/business/service/IDcMeteorologicalDetectorDataService.java

@@ -65,4 +65,6 @@ public interface IDcMeteorologicalDetectorDataService
     List<Map<String,String>> selectStatistics(String deviceName);
 
     List<DcMeteorologicalDetectorData> selectlistAll(DcMeteorologicalDetectorData dcMeteorologicalDetectorData);
+
+    List<DcMeteorologicalDetectorData> selectlistVisibility(DcMeteorologicalDetectorData dcMeteorologicalDetectorData);
 }

zc-business/src/main/java/com/zc/business/service/impl/DcMeteorologicalDetectorDataServiceImpl.java

@@ -110,4 +110,9 @@ public class DcMeteorologicalDetectorDataServiceImpl implements IDcMeteorologica
     public List<DcMeteorologicalDetectorData> selectlistAll(DcMeteorologicalDetectorData dcMeteorologicalDetectorData) {
         return dcMeteorologicalDetectorDataMapper.selectlistAll(dcMeteorologicalDetectorData);
     }
+
+    @Override
+    public List<DcMeteorologicalDetectorData> selectlistVisibility(DcMeteorologicalDetectorData dcMeteorologicalDetectorData) {
+        return dcMeteorologicalDetectorDataMapper.selectlistVisibility(dcMeteorologicalDetectorData);
+    }
 }

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

@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="stakeMark"    column="stake_mark"    />
         <result property="direction"    column="direction"    />
         <result property="deviceState"    column="device_state"    />
+        <result property="stakeMarkRange"    column="stake_mark_range"    />
     </resultMap>
     <resultMap type="map" id="countMap">
         <result property="timeSlot"    column="time_slot"    />
@@ -192,4 +193,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             d.device_type = 3
         ORDER BY d.stake_mark ASC;
     </select>
+
+    <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,
+                m.create_time,
+                m.rainfall, m.visibility_type, 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
+    </select>
 </mapper>