Merge remote-tracking branch 'origin/V1' into V1

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

@@ -15,5 +15,6 @@ public interface PersonDeviceRelationDAO {
 	int delete(String id);
 	List<PersonDeviceRelation> list();
 	List<PersonDeviceRelation> findByPersonId(String personId);
+    List<PersonDeviceRelation> findByDeviceId(String eviceId);
 	List<PersonDeviceRelation> search(Map<String, Object> searchParams, List<Sort> sortList);
 }

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

@@ -14,5 +14,6 @@ public interface PersonDeviceRelationService {
 	int delete(String id);
 	List<PersonDeviceRelation> list();
 	List<PersonDeviceRelation> findByPersonId(String personId);
+	List<PersonDeviceRelation> findByDeviceId(String deviceId);
 	Page<PersonDeviceRelation> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize,boolean count, List<Sort> sortList);
 }

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

@@ -63,6 +63,13 @@ public class PersonDeviceRelationServiceImpl implements PersonDeviceRelationServ
 	public List<PersonDeviceRelation> findByPersonId(String personId){
 		return personDeviceRelationDAO.findByPersonId(personId);
 	}
+
+	@Override
+	public List<PersonDeviceRelation> findByDeviceId(String deviceId){
+		return personDeviceRelationDAO.findByDeviceId(deviceId);
+	}
+
+
 		
 	@Override
 	public Page<PersonDeviceRelation> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {

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

@@ -82,6 +82,9 @@ id_,device_id,person_id,del_flag,create_by,create_time,update_by,update_time		fr
 	<select id="findByPersonId" parameterType="string" resultMap="PersonDeviceRelationMap">
 		select * from base_person_device_relation where person_id=#{personId} and del_flag=false
 	</select>
+	<select id="findByDeviceId" parameterType="string" resultMap="PersonDeviceRelationMap">
+		select * from base_person_device_relation where device_id=#{deviceId} and del_flag=false
+	</select>
 	<select id="search" parameterType="hashmap" resultMap="PersonDeviceRelationMap">
 		<![CDATA[
 			select * from base_person_device_relation

web/src/main/java/com/jpsoft/smart/modules/base/controller/PersonDeviceRelationController.java

@@ -238,4 +238,27 @@ public class PersonDeviceRelationController {
 
         return msgResult;
     }
+
+
+
+    @ApiOperation(value="根据设备ID查询人员列表")
+    @RequestMapping(value = "listByDeviceId",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "deviceId",value = "设备ID",paramType = "query")
+    })
+    public MessageResult<List<PersonDeviceRelation>> listByDeviceId(String deviceId){
+
+        MessageResult<List<PersonDeviceRelation>> msgResult = new MessageResult<>();
+
+        List<PersonDeviceRelation> personDeviceRelationList = personDeviceRelationService.findByDeviceId(deviceId);
+
+        msgResult.setResult(true);
+        msgResult.setData(personDeviceRelationList);
+
+        return msgResult;
+    }
+
+
+
+
 }