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

cjl

2023-10-19 2a4a9ef52b0d76efb9712fd8d4268f658546f99f

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

@@ -3,7 +3,6 @@
import java.util.List;
import java.util.Map;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.moral.api.entity.Device;
import com.baomidou.mybatisplus.extension.service.IService;

@@ -42,15 +41,38 @@
    List<Map<String, Object>> selectMonitorsByOrgId(Integer orgId);

    //根据组织查询设备
    List<Map<String, Object>> selectDevicesByOrgId(Integer orgId);
    Map<String, Object> selectDevicesByOrgId(Map<String, Object> parameters);

    //根据站点查询设备
    List<Map<String, Object>> selectDevicesByMpId(Integer orgId);
    Map<String, Object> selectDevicesByMpId(Map<String, Object> parameters);

    //分页获取所有设备列表
    IPage<Device> selectDevices(Map<String, Object> parameters);
    Map<String, Object> selectDevices(Map<String, Object> parameters);

    //根据设备id查询设备组织，站点，维护人，行业，工艺，设备检测器，采购商等信息
    Map<String, Object> selectDeviceInfoById(Integer deviceId);

    //根据mac获取设备信息
    Map<String, Object> getDeviceByMac(String mac);

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

    //特殊设备数据校准
    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();

}