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

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

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

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

@@ -13,5 +13,6 @@ public interface PersonDeviceRelationService {
 	int update(PersonDeviceRelation model);
 	int delete(String id);
 	List<PersonDeviceRelation> list();
+	List<PersonDeviceRelation> findByPersonId(String personId);
 	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

@@ -58,6 +58,11 @@ public class PersonDeviceRelationServiceImpl implements PersonDeviceRelationServ
 		// TODO Auto-generated method stub
 		return personDeviceRelationDAO.list();
 	}
+
+	@Override
+	public List<PersonDeviceRelation> findByPersonId(String personId){
+		return personDeviceRelationDAO.findByPersonId(personId);
+	}
 		
 	@Override
 	public Page<PersonDeviceRelation> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {

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

@@ -110,16 +110,17 @@
 id_, header_,device_no,alias_name,address_,is_online,unlock_password,code_address,ip_address,port_,type_,del_flag,create_by,create_time,update_by,update_time		from base_device_info where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
-		select count(*) from base_device_info where id_=#{0}
+		select count(*) from base_device_info where id_=#{0} and  del_flag=false
 	</select>
 	<select id="list" resultMap="DeviceInfoMap">
-		select * from base_device_info
+		select * from base_device_info where del_flag=false
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="DeviceInfoMap">
 		<![CDATA[
 			select * from base_device_info
 		]]>
 		<where>
+			and del_flag=false
 			<if test="searchParams.aliasName != null">
 				and alias_name like #{searchParams.aliasName}
 			</if>

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

@@ -74,10 +74,13 @@
 id_,device_id,person_id,del_flag,create_by,create_time,update_by,update_time		from base_person_device_relation where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
-		select count(*) from base_person_device_relation where id_=#{0}
+		select count(*) from base_person_device_relation where id_=#{0} and del_flag=false
 	</select>
 	<select id="list" resultMap="PersonDeviceRelationMap">
-		select * from base_person_device_relation
+		select * from base_person_device_relation where del_flag=false
+	</select>
+	<select id="findByPersonId" parameterType="string" resultMap="PersonDeviceRelationMap">
+		select * from base_person_device_relation where person_id=#{personId} and del_flag=false
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="PersonDeviceRelationMap">
 		<![CDATA[

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

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