根据设备名称查询气象详细信息列表

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

@@ -32,6 +32,13 @@ public class DcMeteorologicalDetectorController  extends BaseController {
         List<Map<String,String>> list = dcMeteorologicalDetectorDataService.selectStatistics(deviceName);
         return getDataTable(list);
     }
+    @ApiOperation("根据设备名称查询详细信息列表")
+    @GetMapping("/device/{deviceName}")
+    public TableDataInfo deviceNameList(@PathVariable("deviceName") String deviceName)
+    {
+        List<DcMeteorologicalDetectorData>  list = dcMeteorologicalDetectorDataService.selectDeviceNameList(deviceName);
+        return getDataTable(list);
+    }
     @ApiOperation("统计气象设备当天最新信息列表")
     @GetMapping("/listLatest")
     public TableDataInfo listAll(DcMeteorologicalDetectorData dcMeteorologicalDetectorData)

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

@@ -125,6 +125,16 @@ public class DcMeteorologicalDetectorData extends BaseEntity
     @TableField(exist = false)
     private String stakeMarkRange;
 
+    @ApiModelProperty("安装位置")
+    @TableField(exist = false)
+    private String installationSite;
+    @ApiModelProperty("其他配置")//USRegal
+    @TableField(exist = false)
+    private String otherConfig;
+    @ApiModelProperty("所属网段")//USRegal
+    @TableField(exist = false)
+    private String networkSegment;
+
 // "rainfall": 0,
 //    "visibility": "05.000",
 //    "remoteRoadSurfaceTemperature": 11.5,

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

@@ -67,4 +67,11 @@ public interface DcMeteorologicalDetectorDataMapper
     List<DcMeteorologicalDetectorData> selectlistAll(DcMeteorologicalDetectorData dcMeteorologicalDetectorData);
 
     List<DcMeteorologicalDetectorData> selectlistVisibility(DcMeteorologicalDetectorData dcMeteorologicalDetectorData);
+
+    /**
+     * 根据设备名称查询详细信息列表
+     * @param deviceName
+     * @return
+     */
+    List<DcMeteorologicalDetectorData> selectDeviceNameList(String deviceName);
 }

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

@@ -67,4 +67,11 @@ public interface IDcMeteorologicalDetectorDataService
     List<DcMeteorologicalDetectorData> selectlistAll(DcMeteorologicalDetectorData dcMeteorologicalDetectorData);
 
     List<DcMeteorologicalDetectorData> selectlistVisibility(DcMeteorologicalDetectorData dcMeteorologicalDetectorData);
+
+    /**
+     * 根据设备名称查询详细信息列表
+     * @param deviceName
+     * @return
+     */
+    List<DcMeteorologicalDetectorData>  selectDeviceNameList(String deviceName);
 }

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

@@ -115,4 +115,14 @@ public class DcMeteorologicalDetectorDataServiceImpl implements IDcMeteorologica
     public List<DcMeteorologicalDetectorData> selectlistVisibility(DcMeteorologicalDetectorData dcMeteorologicalDetectorData) {
         return dcMeteorologicalDetectorDataMapper.selectlistVisibility(dcMeteorologicalDetectorData);
     }
+
+    /**
+     * 根据设备名称查询详细信息列表
+     * @param deviceName
+     * @return
+     */
+    @Override
+    public List<DcMeteorologicalDetectorData>  selectDeviceNameList(String deviceName) {
+        return dcMeteorologicalDetectorDataMapper.selectDeviceNameList(deviceName);
+    }
 }

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

@@ -26,6 +26,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="direction"    column="direction"    />
         <result property="deviceState"    column="device_state"    />
         <result property="stakeMarkRange"    column="stake_mark_range"    />
+        <result property="remark"    column="remark"    />
+        <result property="otherConfig"    column="other_config"    />
+        <result property="installationSite"    column="installation_site"    />
+        <result property="installationSite"    column="installation_site"    />
+        <result property="networkSegment"    column="network_segment"    />
     </resultMap>
     <resultMap type="map" id="countMap">
         <result property="timeSlot"    column="time_slot"    />
@@ -193,6 +198,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             d.device_type = 3
         ORDER BY d.stake_mark ASC;
     </select>
+    <select id="selectDeviceNameList" 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.network_segment,d.installation_site,d.other_config,d.remark,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_device d
+                LEFT JOIN
+            dc_meteorological_detector_data m
+            ON
+                d.iot_device_id = m.iot_device_id
+                    AND m.create_time = (
+                    SELECT MAX(create_time)
+                    FROM dc_meteorological_detector_data m2
+                    WHERE m2.iot_device_id = d.iot_device_id
+                )
+        WHERE
+            d.device_type = 3 AND d.device_name = #{deviceName}
+        ORDER BY d.stake_mark ASC;
+    </select>
 
     <select id="selectlistVisibility" parameterType="com.zc.business.domain.DcMeteorologicalDetectorData" resultMap="DcMeteorologicalDetectorDataResult">
         SELECT