Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-10-19 2a4a9ef52b0d76efb9712fd8d4268f658546f99f

 screen-api/src/main/java/com/moral/api/service/DeviceService.java

@@ -19,12 +19,17 @@
    //根据站点id获取设备列表
    List<Device> getDevicesByMonitorPointId(Integer monitorPointId);

    List<Device> getDevicesByMonitorPointId(List<Integer> monitorPointId);

    //根据macs获取公有因子信息
    Map<String, Object> getSensorsByMac(Map<String,Object> params);

    //获取监测因子趋势图数据
    List<Map<String, Object>> getTrendChartData(Map<String,Object> params);

    //获取监测因子趋势图数据第二版
    List<Map<String, Object>> getTrendChartDataV2(Map<String,Object> params);

    //通过mac获取设备信息
    Device getDeviceByMac(String mac);