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

# Conflicts:
#	web/src/main/java/com/jpsoft/smart/modules/business/controller/WorkAttendanceController.java

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

@@ -37,6 +37,11 @@ public class PersonDeviceRelation {
 
 	@ApiModelProperty(value = "人员信息")
 	private PersonInfo personInfo;
+	/**
+	 *是否删除
+	 */
+	@ApiModelProperty(value = "是否删除")
+	private Boolean isWrite;
 	/**
 	 *是否删除
 	 */

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

@@ -279,8 +279,20 @@
                 a.name_ like #{name}
             </foreach>
         </if>
-        <if test="searchParams.jobNumber!=null">
-            and a.position3_ like #{searchParams.jobNumber}
+        <if test="searchParams.position1 != null">
+            and a.position1_ like #{searchParams.position1}
+        </if>
+        <if test="searchParams.position2 != null">
+            and a.position2_ like #{searchParams.position2}
+        </if>
+        <if test="searchParams.position3 != null">
+            and a.position3_ like #{searchParams.position3}
+        </if>
+        <if test="searchParams.position4 != null">
+            and a.position4_ like #{searchParams.position4}
+        </if>
+        <if test="searchParams.position5 != null">
+            and a.position5_ like #{searchParams.position5}
         </if>
         <foreach item="sort" collection="sortList" open="order by" separator=",">
             a.${sort.name} ${sort.order}

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

@@ -1,5 +1,6 @@
 package com.jpsoft.smart.modules.base.controller;
 
+import com.alipay.api.domain.Person;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.util.StringUtil;
 import com.jpsoft.smart.config.OSSConfig;
@@ -576,7 +577,6 @@ public class PersonDeviceRelationController {
         MessageResult<Map> msgResult = new MessageResult<>();
 
         Map<String,Object> searchParams = new HashMap<>();
-
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("create_time","desc"));
 
@@ -589,6 +589,24 @@ public class PersonDeviceRelationController {
         }
 
         Page<PersonDeviceRelation> page = personDeviceRelationService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+        for(PersonDeviceRelation pdr : page.getResult()){
+            DeviceInfo  di = pdr.getDeviceInfo();
+            PersonInfo personInfo = pdr.getPersonInfo();
+            String faceDbId = "";
+            Boolean isWrite = false;
+            try {
+                //查找人脸ID
+                faceDbId = lapiService.getFaceDbId(di,personInfo.getCompanyName());
+                //查询人员是否成功写入设备
+                isWrite = lapiService.isSuccessAddPerson(personInfo,di,faceDbId);
+
+            }catch (Exception e){
+                isWrite = false;
+            }
+
+            pdr.setIsWrite(isWrite);
+        }
+
 
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));
@@ -686,10 +704,14 @@ public class PersonDeviceRelationController {
     @ApiOperation(value="人员查询是否绑定设备")
     @RequestMapping(value = "isUnbindDeviceList",method = RequestMethod.POST)
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "personId",value = "人员ID",required = true ,paramType = "query")
+            @ApiImplicitParam(name = "personId",value = "人员ID",required = true ,paramType = "query"),
+            @ApiImplicitParam(name = "deviceNo",value = "设备编号",required = true ,paramType = "query"),
+            @ApiImplicitParam(name = "deviceName",value = "设备名称",required = true ,paramType = "query")
     })
     public MessageResult<Map> isUnbindDeviceList(
             Long personId,
+            @RequestParam(value="deviceNo",defaultValue="") String deviceNo,
+            @RequestParam(value="deviceName",defaultValue="") String deviceName,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,@RequestAttribute String subject){
 
@@ -722,6 +744,12 @@ public class PersonDeviceRelationController {
 
         //searchParams.put("companyId",user.getCompanyId());
 
+        if(StringUtils.isNotEmpty(deviceNo)){
+            searchParams.put("deviceNo","%" + deviceNo + "%");
+        }
+        if(StringUtils.isNotEmpty(deviceName)){
+            searchParams.put("aliasName","%" + deviceName + "%");
+        }
         Page<DeviceInfo> page = deviceInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 
         for (DeviceInfo deviceInfo:page) {

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

@@ -501,19 +501,19 @@ public class PersonInfoController {
         }
 
         if (StringUtils.isNotEmpty(position1)) {
-            searchParams.put("position1",position1);
+            searchParams.put("position1","%" + position1 + "%");
         }
         if (StringUtils.isNotEmpty(position2)) {
-            searchParams.put("position2",position2);
+            searchParams.put("position2","%" + position2 + "%");
         }
         if (StringUtils.isNotEmpty(position3)) {
-            searchParams.put("position3",position3);
+            searchParams.put("position3","%" + position3 + "%");
         }
         if (StringUtils.isNotEmpty(position4)) {
-            searchParams.put("position4",position4);
+            searchParams.put("position4","%" + position4 + "%");
         }
         if (StringUtils.isNotEmpty(position5)) {
-            searchParams.put("position5",position5);
+            searchParams.put("position5","%" + position5 + "%");
         }
 
         if(faceBound != null){
@@ -1065,19 +1065,19 @@ public class PersonInfoController {
 //                searchParams.put("companyId",user.getCompanyId());
 //            }
             if (StringUtils.isNotEmpty(position1)) {
-                searchParams.put("position1",position1);
+                searchParams.put("position1","%" + position1 + "%");
             }
             if (StringUtils.isNotEmpty(position2)) {
-                searchParams.put("position2",position2);
+                searchParams.put("position2","%" + position2 + "%");
             }
             if (StringUtils.isNotEmpty(position3)) {
-                searchParams.put("position3",position3);
+                searchParams.put("position3","%" + position3 + "%");
             }
             if (StringUtils.isNotEmpty(position4)) {
-                searchParams.put("position4",position4);
+                searchParams.put("position4","%" + position4 + "%");
             }
             if (StringUtils.isNotEmpty(position5)) {
-                searchParams.put("position5",position5);
+                searchParams.put("position5","%" + position5 + "%");
             }
 
             Page<PersonInfo> page = personInfoService.pageSearch(searchParams,1,10000,false,sortList);