Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-11-10 c8cc61e84189d8f986f7c4657d543408021b3da0

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

@@ -5,6 +5,8 @@

import com.moral.api.entity.Device;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.moral.api.pojo.vo.device.AppDeviceVo;
import io.lettuce.core.dynamic.annotation.Param;

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

    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);

    List<String> deviceMacs(@Param("organizationId") int organizationId);

    List<AppDeviceVo> getDevices(@Param("mac") String mac,@Param("organizationId") Integer organizationId);

}