同步人员方法添加

attendance-performance-manager/src/main/java/com/mortals/xhx/module/hik/staff/model/req/org/OrgListReq.java

-package com.mortals.xhx.module.hik.staff.model.req.org;
-
-import lombok.Data;
-
-@Data
-public class OrgListReq{
-	private String orgName;
-	private String orgIndexCodes;
-	private int pageNo;
-	private int pageSize;
-}
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/hik/staff/model/req/person/PersonReq.java → attendance-performance-manager/src/main/java/com/mortals/xhx/module/hik/staff/model/req/staff/StaffReq.java

-package com.mortals.xhx.module.hik.staff.model.req.person;
+package com.mortals.xhx.module.hik.staff.model.req.staff;
 
 import com.mortals.xhx.module.hik.BaseReq;
 import lombok.Data;
@@ -7,7 +7,7 @@ import java.io.Serializable;
 
 
 @Data
-public class PersonReq extends BaseReq implements Serializable {
+public class StaffReq extends BaseReq implements Serializable {
 
     /**
      * 当前页

attendance-performance-manager/src/main/java/com/mortals/xhx/module/hik/staff/model/rsp/org/OrgDataInfo.java

-package com.mortals.xhx.module.hik.staff.model.rsp.org;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class OrgDataInfo {
-    private List<OrgInfo> list;
-    private Integer total;
-    private Integer totalPage;
-    private Integer pageNo;
-}

attendance-performance-manager/src/main/java/com/mortals/xhx/module/hik/staff/model/rsp/org/OrgInfo.java

-package com.mortals.xhx.module.hik.staff.model.rsp.org;
-
-import lombok.Data;
-
-@Data
-public class OrgInfo {
-	private String orgName;
-	private String orgNo;
-	private String orgPath;
-	private String parentOrgIndexCode;
-	private String orgIndexCode;
-	private String updateTime;
-	private String parentOrgName;
-}
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/hik/staff/model/rsp/person/PersonDataInfo.java

-package com.mortals.xhx.module.hik.staff.model.rsp.person;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class PersonDataInfo {
-    private List<PersonInfo> list;
-    private Integer total;
-    private Integer totalPage;
-    private Integer pageNo;
-}

attendance-performance-manager/src/main/java/com/mortals/xhx/module/hik/staff/model/rsp/person/PersonInfo.java

-package com.mortals.xhx.module.hik.staff.model.rsp.person;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class PersonInfo{
-	private String personId;
-	private String personName;
-	private int gender;
-	private String orgPath;
-	private String orgIndexCode;
-	private String orgName;
-	private int certificateType;
-	private String certificateNo;
-	@JSONField(format = "yyyy-MM-dd'T'HH:mm:ssXXX")
-	private Date updateTime;
-	private String phoneNo;
-	private PersonPhoto personPhoto;
-	private String jobNo;
-}
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/hik/staff/model/rsp/person/PersonPhoto.java

-package com.mortals.xhx.module.hik.staff.model.rsp.person;
-
-import lombok.Data;
-
-@Data
-public class PersonPhoto{
-	private String personPhotoIndexCode;
-	private String picUri;
-	private String personId;
-	private String serverIndexCode;
-}
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/hik/staff/service/IHikStaffService.java

@@ -3,7 +3,7 @@ package com.mortals.xhx.module.hik.staff.service;
 
 import com.mortals.framework.common.Rest;
 import com.mortals.xhx.module.door.model.DoorEntity;
-import com.mortals.xhx.module.hik.staff.model.req.person.PersonReq;
+import com.mortals.xhx.module.hik.staff.model.req.staff.StaffReq;
 import com.mortals.xhx.module.hik.staff.model.rsp.person.PersonDataInfo;
 import com.mortals.xhx.module.hik.staff.model.rsp.staff.search.UserSearchInfo;
 
@@ -21,7 +21,7 @@ public interface IHikStaffService {
      * @param personReq
      * @return
      */
-    Rest<UserSearchInfo> getPersonList(PersonReq personReq, DoorEntity doorEntity);
+    Rest<UserSearchInfo> getPersonList(StaffReq personReq, DoorEntity doorEntity);
 
 
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/hik/staff/service/impl/HikStaffServiceImpl.java

@@ -3,16 +3,12 @@ package com.mortals.xhx.module.hik.staff.service.impl;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
-import com.hikvision.artemis.sdk.ArtemisHttpUtil;
-import com.hikvision.artemis.sdk.config.ArtemisConfig;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
-import com.mortals.xhx.hikdoor.Acs.AcsMain;
 import com.mortals.xhx.hikdoor.NetSDKDemo.HCNetSDK;
 import com.mortals.xhx.module.door.model.DoorEntity;
 import com.mortals.xhx.module.hik.AbstractHikService;
-import com.mortals.xhx.module.hik.HikApiRest;
-import com.mortals.xhx.module.hik.staff.model.req.person.PersonReq;
+import com.mortals.xhx.module.hik.staff.model.req.staff.StaffReq;
 import com.mortals.xhx.module.hik.staff.model.rsp.person.PersonDataInfo;
 import com.mortals.xhx.module.hik.staff.model.rsp.staff.search.UserSearchInfo;
 import com.mortals.xhx.module.hik.staff.service.IHikStaffService;
@@ -22,8 +18,6 @@ import org.json.JSONObject;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * 海康人员接口类
@@ -37,7 +31,7 @@ public class HikStaffServiceImpl extends AbstractHikService implements IHikStaff
 
     //查询所有人员
     @Override
-    public Rest<UserSearchInfo> getPersonList(PersonReq personReq, DoorEntity doorEntity) {
+    public Rest<UserSearchInfo> getPersonList(StaffReq personReq, DoorEntity doorEntity) {
         //todo 新的链接设备
         HCNetSDK hCNetSDK = createSDKInstance();
         initLoadSdk(hCNetSDK);