diff --git a/zc-business/src/main/java/com/zc/business/controller/DcMeteorologicalDetectorController.java b/zc-business/src/main/java/com/zc/business/controller/DcMeteorologicalDetectorController.java index 4eaaf8d2..cd526d05 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcMeteorologicalDetectorController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcMeteorologicalDetectorController.java @@ -32,6 +32,13 @@ public class DcMeteorologicalDetectorController extends BaseController { List> list = dcMeteorologicalDetectorDataService.selectStatistics(deviceName); return getDataTable(list); } + @ApiOperation("根据设备名称查询详细信息列表") + @GetMapping("/device/{deviceName}") + public TableDataInfo deviceNameList(@PathVariable("deviceName") String deviceName) + { + List list = dcMeteorologicalDetectorDataService.selectDeviceNameList(deviceName); + return getDataTable(list); + } @ApiOperation("统计气象设备当天最新信息列表") @GetMapping("/listLatest") public TableDataInfo listAll(DcMeteorologicalDetectorData dcMeteorologicalDetectorData) diff --git a/zc-business/src/main/java/com/zc/business/domain/DcMeteorologicalDetectorData.java b/zc-business/src/main/java/com/zc/business/domain/DcMeteorologicalDetectorData.java index a3608d70..1aea8102 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcMeteorologicalDetectorData.java +++ b/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, diff --git a/zc-business/src/main/java/com/zc/business/mapper/DcMeteorologicalDetectorDataMapper.java b/zc-business/src/main/java/com/zc/business/mapper/DcMeteorologicalDetectorDataMapper.java index 50cbebc2..cd75db0a 100644 --- a/zc-business/src/main/java/com/zc/business/mapper/DcMeteorologicalDetectorDataMapper.java +++ b/zc-business/src/main/java/com/zc/business/mapper/DcMeteorologicalDetectorDataMapper.java @@ -67,4 +67,11 @@ public interface DcMeteorologicalDetectorDataMapper List selectlistAll(DcMeteorologicalDetectorData dcMeteorologicalDetectorData); List selectlistVisibility(DcMeteorologicalDetectorData dcMeteorologicalDetectorData); + + /** + * 根据设备名称查询详细信息列表 + * @param deviceName + * @return + */ + List selectDeviceNameList(String deviceName); } diff --git a/zc-business/src/main/java/com/zc/business/service/IDcMeteorologicalDetectorDataService.java b/zc-business/src/main/java/com/zc/business/service/IDcMeteorologicalDetectorDataService.java index ca7cb92a..a01e5986 100644 --- a/zc-business/src/main/java/com/zc/business/service/IDcMeteorologicalDetectorDataService.java +++ b/zc-business/src/main/java/com/zc/business/service/IDcMeteorologicalDetectorDataService.java @@ -67,4 +67,11 @@ public interface IDcMeteorologicalDetectorDataService List selectlistAll(DcMeteorologicalDetectorData dcMeteorologicalDetectorData); List selectlistVisibility(DcMeteorologicalDetectorData dcMeteorologicalDetectorData); + + /** + * 根据设备名称查询详细信息列表 + * @param deviceName + * @return + */ + List selectDeviceNameList(String deviceName); } diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcMeteorologicalDetectorDataServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcMeteorologicalDetectorDataServiceImpl.java index 887d86a2..51cdff13 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcMeteorologicalDetectorDataServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcMeteorologicalDetectorDataServiceImpl.java @@ -115,4 +115,14 @@ public class DcMeteorologicalDetectorDataServiceImpl implements IDcMeteorologica public List selectlistVisibility(DcMeteorologicalDetectorData dcMeteorologicalDetectorData) { return dcMeteorologicalDetectorDataMapper.selectlistVisibility(dcMeteorologicalDetectorData); } + + /** + * 根据设备名称查询详细信息列表 + * @param deviceName + * @return + */ + @Override + public List selectDeviceNameList(String deviceName) { + return dcMeteorologicalDetectorDataMapper.selectDeviceNameList(deviceName); + } } diff --git a/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml b/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml index 7250028c..94f1781a 100644 --- a/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml @@ -26,6 +26,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + @@ -193,6 +198,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.device_type = 3 ORDER BY d.stake_mark ASC; +