修改同步人员接口

attendance-performance-manager-ui/admin/vue.config.js

@@ -8,9 +8,9 @@ module.exports = {
 		hot: true,//自动保存
 		proxy: {
 			'/attendance': {
-				target: 'http://192.168.0.98:11039',
+				//target: 'http://192.168.0.98:11039',
 				//   target: 'http://112.19.80.237:11039',
-				//   target: 'http://localhost:17500',
+				   target: 'http://localhost:17500',
 				changeOrigin: true,
 				secure: false,
 				cookieDomainRewrite: 'localhost',

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/TestReq.java

@@ -11,4 +11,8 @@ public class TestReq {
     private Date createTimeStart;
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTimeEnd;
+
+
+    private Long deviceId;
+
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java

@@ -99,12 +99,9 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
                     log.error("同步钉钉usreId失败");
                 }
             } else {
-                //todo 设备直连
-               // deptService.syncDeptByDevice(null);
+                log.info("设备直连同步人员信息");
                 staffService.syncPersonsByDevices(null);
             }
-
-
         } catch (Exception e) {
             log.error("同步人事异常", e);
         }

attendance-performance-manager/src/main/java/com/mortals/xhx/hikdoor/Acs/AcsMain.java

@@ -92,7 +92,7 @@ public class AcsMain {
 
 
         /**登录*/
-        login_V40("192.168.0.111","admin","asd12345",(short)8000);
+        login_V40("10.102.221.201","admin","10.102.221.201",(short)8000);
 
 
         /**远程控门*/

attendance-performance-manager/src/main/java/com/mortals/xhx/module/door/service/impl/DoorServiceImpl.java

@@ -53,13 +53,9 @@ public class DoorServiceImpl extends AbstractCRUDServiceImpl<DoorDao, DoorEntity
 
     @Override
     public Rest<Void> syncDoorDeviceEvents(DoorEntity doorEntity, HikDoorEventReq hikDoorEventReq) {
-
-
         Rest<List<EventInfo>> listRest = hikDoorService.searchDoorEventsList(hikDoorEventReq, doorEntity);
-
         if (listRest.getCode() == YesNoEnum.YES.getValue()) {
             List<EventInfo> list = listRest.getData();
-
             List<AttendanceRecordHikEntity> attRecords = list.stream().map(item -> {
                 AttendanceRecordHikEntity recordHikEntity = new AttendanceRecordHikEntity();
                 recordHikEntity.initAttrValue();

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

@@ -33,4 +33,21 @@ public interface IHikStaffService {
 
 
 
+    /**
+     * 获取人员人脸信息
+     *
+     * @param personReq
+     * @return
+     */
+    Rest<UserSearchInfo> getPersonPicByDevices(StaffReq personReq, DoorEntity doorEntity);
+
+
+    /**
+     * 下发图片到指定设备
+     *
+     * @param personReq
+     * @return
+     */
+    Rest<UserSearchInfo> downPersonPicToDevice(StaffReq personReq, DoorEntity doorEntity);
+
 }

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

@@ -202,4 +202,14 @@ public class HikStaffServiceImpl extends AbstractHikService implements IHikStaff
         }
     }
 
+    @Override
+    public Rest<UserSearchInfo> getPersonPicByDevices(StaffReq personReq, DoorEntity doorEntity) {
+        return null;
+    }
+
+    @Override
+    public Rest<UserSearchInfo> downPersonPicToDevice(StaffReq personReq, DoorEntity doorEntity) {
+        return null;
+    }
+
 }

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

@@ -352,10 +352,6 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
                 //设置初始密码
                 entity.setLoginPwd("123456");
             }
-
-            //生成用户id,不与门户服务用户相同
-//            Long userId = idgeneratorService.getLongId(USER_KEY);
-//            entity.setId(userId);
             userEntity.setLoginName(StrUtil.cleanBlank(entity.getLoginName()));
             userEntity.setRealName(entity.getName());
             userEntity.setUserType(UserType.WORK_PERSON.getValue());
@@ -537,7 +533,6 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
                                 staffCollect.remove(userInfoItem.getEmployeeNo());
                             }
                             StaffEntity staffEntity = this.getExtCache(StrUtil.padPre(userInfoItem.getEmployeeNo(), 8, "0"));
-                            //DeptEntity deptEntity = deptService.selectOne(new DeptQuery().deptCode(userInfoItem.getBelongGroup()));
                             //设置到默认部门
                             //判断本地数据是否为空
                             if (ObjectUtils.isEmpty(staffEntity)) {

attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http

@@ -146,3 +146,8 @@ Content-Type: application/json
   "windowNum": "123123"
 }
 
+###设备直连更新人员
+GET {{baseUrl}}/test/updatePersonsByDevices
+Content-Type: application/json
+
+{}
\ No newline at end of file