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

cjl

2023-08-30 2e0bf4423c235802791012e1fb0817d2c9156b2a

 screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java

@@ -20,6 +20,16 @@
    /*监测因子趋势图数据*/
    List<Map<String, Object>> getTrendChartData(Map<String, Object> params);

    List<Device> deviceList(@Param("organizationId") int organizationId,@Param("regionCode")  int regionCode,@Param("region")  String region);
    List<Map<String, Object>> deviceList(@Param("organizationId") int organizationId,
                            @Param("regionCode")  int regionCode,
                            @Param("region")  String region,
                            @Param("type")  String type,
                            @Param("sensorCode")  String sensorCode,
                            @Param("times")  String times,
                            @Param("endHourlyTime") String endHourlyTime);

    List<Integer> deviceIdList(@Param("organizationId") int organizationId);

    List<Integer> deviceOrgIdList(@Param("organizationId") int organizationId);

}