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

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

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

common/src/main/java/com/jpsoft/smart/modules/base/entity/PersonDeviceRelation.java

@@ -33,7 +33,7 @@ public class PersonDeviceRelation {
 	 *人员ID
 	 */
         @ApiModelProperty(value = "人员ID")
-	private String personId;
+	private Long personId;
 
 	@ApiModelProperty(value = "人员信息")
 	private PersonInfo personInfo;

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

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

@@ -60,7 +60,7 @@ public class PersonDeviceRelationServiceImpl implements PersonDeviceRelationServ
 	}
 
 	@Override
-	public List<PersonDeviceRelation> findByPersonId(String personId){
+	public List<PersonDeviceRelation> findByPersonId(Long personId){
 		return personDeviceRelationDAO.findByPersonId(personId);
 	}
 
@@ -70,7 +70,7 @@ public class PersonDeviceRelationServiceImpl implements PersonDeviceRelationServ
 	}
 
 	@Override
-	public PersonDeviceRelation findByDeviceIdAndPersonId(String deviceId,String personId){
+	public PersonDeviceRelation findByDeviceIdAndPersonId(String deviceId,Long personId){
 		return personDeviceRelationDAO.findByDeviceIdAndPersonId(deviceId,personId);
 	}
 

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

@@ -30,7 +30,7 @@
 		(
 #{id,jdbcType=VARCHAR}
 ,#{deviceId,jdbcType=VARCHAR}
-,#{personId,jdbcType=VARCHAR}
+,#{personId,jdbcType=BIGINT}
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{createBy,jdbcType=VARCHAR}
 ,#{createTime,jdbcType= TIMESTAMP }
@@ -49,7 +49,7 @@
 		device_id=#{deviceId,jdbcType=VARCHAR},
 		</if>
 				<if test="personId!=null">
-		person_id=#{personId,jdbcType=VARCHAR},
+		person_id=#{personId,jdbcType=BIGINT},
 		</if>
 				<if test="delFlag!=null">
 		del_flag=#{delFlag,jdbcType= NUMERIC },
@@ -79,13 +79,13 @@ id_,device_id,person_id,del_flag,create_by,create_time,update_by,update_time		fr
 	<select id="list" resultMap="PersonDeviceRelationMap">
 		select * from base_person_device_relation where del_flag=false
 	</select>
-	<select id="findByPersonId" parameterType="string" resultMap="PersonDeviceRelationMap">
+	<select id="findByPersonId" parameterType="long" 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="findByDeviceIdAndPersonId" parameterType="string" resultMap="PersonDeviceRelationMap">
+	<select id="findByDeviceIdAndPersonId"  resultMap="PersonDeviceRelationMap">
 		select * from base_person_device_relation where device_id=#{deviceId} and person_id=#{personId} and del_flag=false
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="PersonDeviceRelationMap">

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

@@ -9,6 +9,7 @@ import com.jpsoft.smart.modules.common.dto.MessageResult;
 import com.jpsoft.smart.modules.sys.entity.User;
 import com.jpsoft.smart.modules.base.entity.PersonDeviceRelation;
 import com.jpsoft.smart.modules.base.service.PersonDeviceRelationService;
+import com.jpsoft.smart.modules.sys.service.DataDictionaryService;
 import com.jpsoft.smart.modules.sys.service.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -39,6 +40,9 @@ public class PersonDeviceRelationController {
     @Autowired
     private UserService userService;
 
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
+
     
     @ApiOperation(value="添加设备和人员绑定")
     @PostMapping("add")
@@ -237,7 +241,7 @@ public class PersonDeviceRelationController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "personId",value = "人员ID",paramType = "query")
     })
-    public MessageResult<List<PersonDeviceRelation>> listByPersonId(String personId){
+    public MessageResult<List<PersonDeviceRelation>> listByPersonId(Long personId){
 
         MessageResult<List<PersonDeviceRelation>> msgResult = new MessageResult<>();
 
@@ -274,7 +278,7 @@ public class PersonDeviceRelationController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "personId",value = "人员ID",paramType = "query")
     })
-    public MessageResult<Integer> unbindDevice(String personId,@RequestAttribute String subject){
+    public MessageResult<Integer> unbindDevice(Long personId,@RequestAttribute String subject){
         MessageResult<Integer> msgResult = new MessageResult<>();
 
         try{
@@ -313,7 +317,7 @@ public class PersonDeviceRelationController {
             @ApiImplicitParam(name = "personId",value = "人员ID",required = true ,paramType = "query")
     })
     public MessageResult<Map> isUnbindDeviceList(
-            String personId,
+            Long personId,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,@RequestAttribute String subject){
 
@@ -338,6 +342,8 @@ public class PersonDeviceRelationController {
             else{
                 deviceInfo.setIsBindPerson(true);
             }
+            String typeN = dataDictionaryService.findParentId("ddf2ecbe-84a6-4f0d-a84f-2fc6917f5856",deviceInfo.getType());
+            deviceInfo.setTypeN(typeN);
         }
 
         msgResult.setResult(true);