Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-04 28b17e7a9b0bd3a8ed545aff4f077fe981db85d2

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

@@ -19,7 +19,7 @@


   List<Map<String, Object>> getDeviceVersionIdByMonitorPoint(Integer monitorPointId);



   List<Device> selectByOrgIdAndDevName(@Param("orgId")Integer orgId,@Param("devState") String state,@Param("name")String name);

   List<Device> selectByOrgIdAndDevName(@Param("orgId")Integer orgId, @Param("orgIds")List<Integer> orgIds,@Param("devState") String state,@Param("name")String name);



   /**

    *

@@ -27,7 +27,7 @@
    * @param mpId

    * @return 返回未删除结果

    */

   List<Device> selectByOrgIdAndMpId(@Param("orgId")Integer orgId,@Param("mpId")Integer mpId);

   List<Device> selectByOrgIdAndMpId(@Param("orgId")Integer orgId,@Param("orgIds")List<Integer> orgIds,@Param("mpId")Integer mpId);

   List<Device> selectByMap(Map<String, Object> params);

   Device selectWithOrgIdsByMac(String mac);

   List<Integer> getDeviceVersionIdByAreaCode(Map<String, Object> parameters);