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

jinpengyong

2021-06-24 06b00a178d194d33370e44410c4f04a4164f86c7

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

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

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

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

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

}