增加单位与设备绑定。

common/src/main/java/com/jpsoft/smart/modules/base/dao/CompanyDeviceRelationDAO.java

@@ -1,6 +1,8 @@
 package com.jpsoft.smart.modules.base.dao;
 
 import java.util.List;
+
+import com.jpsoft.smart.modules.base.entity.DeviceInfo;
 import org.springframework.stereotype.Repository;
 import com.jpsoft.smart.modules.base.entity.CompanyDeviceRelation;
 import java.util.Map;
@@ -15,4 +17,5 @@ public interface CompanyDeviceRelationDAO {
 	int delete(String id);
 	List<CompanyDeviceRelation> list();
 	List<CompanyDeviceRelation> search(Map<String,Object> searchParams,List<Sort> sortList);
+    List<DeviceInfo> findDeviceByCompanyId(String companyId);
 }

common/src/main/java/com/jpsoft/smart/modules/base/service/CompanyDeviceRelationService.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 import com.jpsoft.smart.modules.base.entity.CompanyDeviceRelation;
 import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.base.entity.DeviceInfo;
 import com.jpsoft.smart.modules.common.dto.Sort;
 
 public interface CompanyDeviceRelationService {
@@ -14,4 +15,5 @@ public interface CompanyDeviceRelationService {
 	int delete(String id);
 	List<CompanyDeviceRelation> list();
 	Page<CompanyDeviceRelation> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
+	List<DeviceInfo> findDeviceByCompanyId(String companyId);
 }

common/src/main/java/com/jpsoft/smart/modules/base/service/impl/CompanyDeviceRelationServiceImpl.java

@@ -4,6 +4,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import javax.annotation.Resource;
+
+import com.jpsoft.smart.modules.base.entity.DeviceInfo;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import com.jpsoft.smart.modules.base.dao.CompanyDeviceRelationDAO;
@@ -67,4 +69,9 @@ public class CompanyDeviceRelationServiceImpl implements CompanyDeviceRelationSe
         
         return page;
 	}
+
+	@Override
+	public List<DeviceInfo> findDeviceByCompanyId(String companyId) {
+		return companyDeviceRelationDAO.findDeviceByCompanyId(companyId);
+	}
 }

common/src/main/resources/mapper/base/CompanyDeviceRelation.xml

@@ -89,4 +89,8 @@
             ${sort.name} ${sort.order}
         </foreach>
     </select>
+    <select id="findDeviceByCompanyId" resultMap="com.jpsoft.smart.modules.base.dao.DeviceInfoDAO.DeviceInfoMap">
+        select b.* from base_company_device_relation a,base_device_info b
+        where a.device_id=b.id_ and a.company_id=#{0} order by b.create_time asc
+    </select>
 </mapper>