Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-01 af8dd6eccb0aab770246ae44db1cde4e531416c5

 src/main/java/com/moral/mapper/DeviceMapper.java

@@ -3,12 +3,16 @@
import java.util.List;

import java.util.Map;



import org.apache.ibatis.annotations.Mapper;

import org.apache.ibatis.annotations.Param;



import com.moral.common.mapper.BaseMapper;

import com.moral.entity.Device;

import com.moral.entity.DeviceExample;

import tk.mybatis.mapper.entity.Example;



@Mapper

public interface DeviceMapper extends BaseMapper<Device, DeviceExample, Integer> {

   List<Map<String, Object>> getDeviceStates(Map<String, Object> parameters);

public interface DeviceMapper extends BaseMapper<Device>{



   List<Map<String, Object>> getDeviceStatesByAccount(Map<String, Object> parameters);

    List<Device>  selectWithRelationData(Example example);

   List<Map<String, Object>> getSensorsByDevice(@Param("mac")String mac);

   List<Device> selectByOrgIdAndDevName(@Param("orgId")Integer orgId,@Param("devName")String devName);

}