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

cjl

2023-09-03 b3a56423e65c33c2c2cc905cb5a0b6af6f1601e7

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

@@ -56,9 +56,23 @@
    Map<String, Object> getDeviceByMac(String mac);

    //设备数据校准
    Map<String, Object> adjustDeviceData(Map<String, Object> deviceData, Map<String, Object> deviceInfo);
    Map<String, Object> adjustDeviceData(Map<String, Object> deviceData,String code);

    //判断并缓存设备状态
    Map<String, Object> judgeDeviceState(Map<String, Object> data, Map<String, Object> deviceInfo);
    //特殊设备数据校准
    Map<String, Object> adjustSpecialDeviceData(Map<String, Object> deviceData);

    //判断并修改设备状态
    void judgeDeviceState(Map<String, Object> data);

    /**
      *@Description: 通过组织id获取站点和设备
      *@Param: [orgId]
      *@return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>> 
      *@Author: lizijie
      *@Date: 2022/1/17 10:30
     **/
    List<Map<String,Object>> selectMonitorPiontAndDeviceByOrgId(int orgId);

    void setRedisDevice();

}