整理

nidapeng

2024-03-25 755b60c531999e9d3c0a94759a2a5e92f5e4ad4e

整理

 server/admin_timer/src/main/java/com/doumee/task/ScheduleSendTaskTool.java

@@ -27,7 +27,7 @@
     * å®šæ—¶åŒæ­¥å†…部人员授权到海康系统
     * @throws Exception
     */
    @Scheduled(fixedDelay= 30*1000)
    @Scheduled(fixedRate= 30*1000)
    public void syncEmpowerData()  {
        if(endId ==null){
            endId =0;

 server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskDetailTool.java

@@ -27,7 +27,7 @@
     * å®šæ—¶æŸ¥è¯¢äººå‘˜å®žé™…下发权限结果，是否已经下载成功
     * @throws Exception
     */
    @Scheduled(fixedDelay= 30*1000)
    @Scheduled(fixedRate= 30*1000)
    public void syncEmpowerDetailData()  {
        if(endId ==null){
            endId =0;

 server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskFailRetrylTool.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
package com.doumee.task;


import com.doumee.service.business.impl.hksync.HkSyncEmpowerServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

/**
 * å®šæ—¶ä»»åŠ¡
 * @author jiangping
 * @date 2021-10-10 14:40:35
 * https://www.bejson.com/othertools/cron/  cron è¡¨è¾¾å¼ç”Ÿæˆåœ°å€
 */
@Component
@EnableScheduling
public class ScheduleTaskFailRetrylTool {

    public static Integer endId = 0;
    @Autowired
    private HkSyncEmpowerServiceImpl hkSyncEmpowerService;

    /**
     * å®šæ—¶å¯¹ä¸‹å‘失败的授权进行重试（10分钟）
     * @throws Exception
     */
    @Scheduled(fixedRate= 60*1000 *10)
    public void syncEmpowerDetailData()  {
        hkSyncEmpowerService.syncEmpowerFailData(endId);
    }
}

 server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskProgressTool.java

@@ -26,7 +26,7 @@
     * å®šæ—¶æŸ¥è¯¢äººå‘˜ä¸‹å‘海康结果（任务是否已下载结束）
     * @throws Exception
     */
    @Scheduled(fixedDelay=20*1000)
    @Scheduled(fixedRate=20*1000)
    public void syncEmpowerResultData()  {
       hkSyncEmpowerService.syncEmpowerResultData(endId);
    }

 server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java

@@ -89,6 +89,12 @@
    }


    @ApiOperation("同步人脸信息")
    @PostMapping("/updateFace")
    public ApiResponse updateFace(@RequestBody Member member) {
        memberService.updateFace(member);
        return ApiResponse.success(null);
    }
    @ApiOperation("根据ID修改")
    @PostMapping("/updateById")
    @RequiresPermissions("business:member:update")

 server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java

@@ -26,8 +26,8 @@
 * @date 2021-10-10 14:40:35
 * https://www.bejson.com/othertools/cron/  cron è¡¨è¾¾å¼ç”Ÿæˆåœ°å€
 */
@Component
@EnableScheduling
//@Component
//@EnableScheduling
public class ScheduleTool {

    @Autowired
@@ -64,7 +64,7 @@
     * æ¯åˆ†é’Ÿæ‹‰å–一次今日的访客预约数据
     * @throws Exception
     */
    @Scheduled(fixedDelay= 30*1000)
    @Scheduled(fixedRate= 30*1000)
    public void syncVistAppointData() throws Exception {
        if(Constants.DEALING_FROM_HK_VISIT){
            return ;
@@ -83,7 +83,7 @@
     * æ¯10分钟拉取一次最新访客登记状态（预约成功和已登记）
     * @throws Exception
     */
    @Scheduled(fixedDelay= 10*60*1000)
    @Scheduled(fixedRate= 10*60*1000)
    public void syncVisitOuttimeStatus() throws Exception {
        hkSyncVisitService.getOutTimeVisitRecord();
    }
@@ -91,7 +91,7 @@
     * ä¸‹è½½æµ·åº·ç³»ç»Ÿå›¾ç‰‡æ•°æ®
     * @throws Exception
     */
    @Scheduled(fixedDelay= 60*1000)
    @Scheduled(fixedRate= 60*1000)
    public void downloadHkImg() throws Exception {
        if(dataSyncConfig.getNeedDealImg()!=null && dataSyncConfig.getNeedDealImg()){
            hkSyncImgService.downHKImgs(0);
@@ -101,7 +101,7 @@
     * å®šæ—¶åŒæ­¥ç»„织信息到海康系统
     * @throws Exception
     */
    @Scheduled(fixedDelay= 60*1000)
    @Scheduled(fixedRate= 60*1000)
    public void syncOrgData() {
        if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp){
            //如果是ERP系统同步下发
@@ -112,7 +112,7 @@
     * å®šæ—¶åŒæ­¥ç”¨æˆ·ä¿¡æ¯åˆ°æµ·åº·ç³»ç»Ÿ
     * @throws Exception
     */
    @Scheduled(fixedDelay= 60*1000)
    @Scheduled(fixedRate= 60*1000)
    public void syncUserData()  {
        if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp) {
            //如果是ERP系统同步下发
@@ -123,7 +123,7 @@
     * å®šæ—¶åŒæ­¥ç”³è¯·é€šè¿‡çš„访客数据到海康系统
     * @throws Exception
     */
    @Scheduled(fixedDelay= 60*1000)
    @Scheduled(fixedRate= 60*1000)
    public void syncVisitData()  {
        hkSyncVisitService.syncVisitData();
    }
@@ -131,7 +131,7 @@
     * å®šæ—¶åŒæ­¥å†…部人员授权到海康系统
     * @throws Exception
     *//*
    @Scheduled(fixedDelay= 3*1000)
    @Scheduled(fixedRate= 3*1000)
    public void syncEmpowerData()  {
        hkSyncEmpowerService.syncEmpowerData();
    }
@@ -139,7 +139,7 @@
     * å®šæ—¶æŸ¥è¯¢äººå‘˜ä¸‹å‘海康结果（任务是否已下载结束）
     * @throws Exception
     *//*
    @Scheduled(fixedDelay= 60*1000)
    @Scheduled(fixedRate= 60*1000)
    public void syncEmpowerResultData()  {
        hkSyncEmpowerService.syncEmpowerResultData();
    }
@@ -147,7 +147,7 @@
     * å®šæ—¶æŸ¥è¯¢äººå‘˜å®žé™…下发权限结果，是否已经下载成功
     * @throws Exception
     *//*
    @Scheduled(fixedDelay= 60*1000)
    @Scheduled(fixedRate= 60*1000)
    public void syncEmpowerDetailData()  {
        hkSyncEmpowerService.syncEmpowerDetailData();
    }*/
@@ -155,7 +155,7 @@
     * å®šæ—¶åŒæ­¥è½¦è¾†åŒ…期到海康系统
     * @throws Exception
     */
    @Scheduled(fixedDelay= 60*1000)
    @Scheduled(fixedRate= 60*1000)
    public void syncParkBookData()  {
        hkSyncParkService.syncParkBookData();
    }
@@ -164,7 +164,7 @@
    /**
     * å®šæ—¶å†»ç»“内部人员
     */
    @Scheduled(fixedDelay= 60*1000)
    @Scheduled(fixedRate= 60*1000)
    public void memberFreeze()  {
        memberService.memberFreeze();
    }

 server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/ApproveNoticeRequest.java

@@ -5,6 +5,9 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;
import java.util.List;

/**
 * åˆ†ç±»ä¿¡æ¯è¡¨
 * @author æ±Ÿè¹„蹄
@@ -19,4 +22,10 @@
    private Integer status;
    @ApiModelProperty(value = "审核时间 yyyy-MM-dd HH:mm:ss" )
    private String approveDate ;
    @ApiModelProperty(value = "审核后允许进场时间 æ ¼å¼ï¼šyyyy-MM-dd HH:mm:ss,为空表示保持申请数据" )
    private Date startTime ;
    @ApiModelProperty(value = "审批后允许离开时间 æ ¼å¼ï¼šyyyy-MM-dd HH:mm:ss,为空表示保持申请数据"  )
    private Date endTime ;
    @ApiModelProperty(value = "审批后允许访客门禁组编码,多个请使用英文逗号,隔开，如1,2,为空表示保持申请数据"  )
    private String doors;
}

 server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/ApproveAddRequest.java

@@ -29,10 +29,11 @@
    private String startTime ;
    @ApiModelProperty(value = "申请离开时间" )
    private String endTime ;
    @ApiModelProperty(value = "车牌号集合" )
    private List<String> carNo ;
    @ApiModelProperty(value = "门禁组编码集合" )
    private List<Integer> roleIds ;
    @ApiModelProperty(value = "车牌号集合" )
    private List<String> carNo ;

    @ApiModelProperty(value = "门禁组名称集合" )
    private List<String> roleNames ;
    @ApiModelProperty(value = "被访问人所属组织Id(ERP端ID)" )

 server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java

@@ -79,6 +79,7 @@
        String visitingRecords= "/api/visitor/v2/visiting/records";//查询访客来访记录v2
        String vehicleList= "/api/resource/v2/vehicle/advance/vehicleList";//查询车辆列表v2
        String vehicleTimeRangeList= "/api/resource/v1/vehicle/timeRange";//增量获取车辆数据
        String facePictureCheck= "/api/frs/v1/face/picture/check";//人脸评分
    }

    /**

 server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java

@@ -695,5 +695,16 @@
        saveInterfaceLog(body,result,path);
        return  result;
    }
    /**
     *    åœè½¦åœºè¿‡è½¦è®°å½•æŸ¥è¯¢
     * @param body
     * @return
     */
    public static String facePictureCheck(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.facePictureCheck);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
    }

}

 server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FacePictureCheckRequest.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
package com.doumee.core.haikang.model.param.request;

import lombok.Data;

@Data
public class FacePictureCheckRequest {

   private String  facePicBinaryData;//    string    False    äººè„¸å›¾ç‰‡çš„二进制数据经过 Base64 ç¼–码后的字符串，该参数与 f acePicUrl è‡³å°‘有一个存在，都存在时优先使用此参数
   private String facePicUrl    ;//string    False    äººè„¸å›¾ç‰‡url ï¼Œè¦æ±‚ URL å¯ä»¥é€šè¿‡ GET æ–¹å¼ç›´æŽ¥ä¸‹è½½ï¼Œè¯¥ å‚数与 facePicBinaryData è‡³å°‘有一个存在

}

 server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FacePictureCheckResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,29 @@
package com.doumee.core.haikang.model.param.respose;

import lombok.Data;

import java.util.List;

@Data
public class FacePictureCheckResponse {

   private Integer  total;//    number    False    æ€»æ¡æ•°

   private Boolean checkResult;//    boolean    False    äººè„¸å›¾ç‰‡æ£€æµ‹ç»“果，true-评分合格false-评分不           åˆæ ¼
   /**
    * 0x1f902300-人脸检测错误（图片格式不符合要求、检测不到人脸等情况时）
    * 0x1f902301-人脸检测超时
    * 0x1f902303-图片两眼间距过小
    * 0x1f902304-图片彩色置信度过低
    * 0x1f902305-图片人脸角度过大
    * 0x1f902306-图片清晰度过低
    * 0x1f902307-图片过曝或过暗（灰阶值不符合要求）
    * 0x1f902308-图片遮挡严重
    * 0x1f902309-图片分数过低
    */
   private String statusCode    ;//string    False    è¯„分失败详细错误码，
   private String statusMessage;//    string    False    è¯„分失败详情描述
   private String faceScore    ;//number    False    äººè„¸è¯„分，范围：  1-100
   private String facePicAnalysisResult    ;//object    False    è¯„分成功后的人脸 ä¿¡æ¯ï¼Œç”¨äºŽäººè„¸è£å‰ª

}

 server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java

@@ -945,6 +945,24 @@
        }
        return  null;
    }
    /**
     *增量车辆查询（分页）
     * @return
     */
    public  static  BaseResponse<BaseListPageResponse<VehicleTimeRangeInfoResponse>>   facePictureCheck(TimeRangeListRequest param){
        log.info("【海康增量人员查询】================开始===="+JSONObject.toJSONString(param));
        try {
            String res = HKTools.facePictureCheck(JSONObject.toJSONString(param));
            TypeReference typeReference =
                    new TypeReference< BaseResponse<BaseListPageResponse<VehicleTimeRangeInfoResponse>> >(){};
            BaseResponse<BaseListPageResponse<VehicleTimeRangeInfoResponse>>   result = JSONObject.parseObject(res, typeReference.getType());
            logResult(result,"海康增量人员查询");
            return  result;
        }catch (Exception e){
            log.error("【海康增量人员查询】================失败====：\n"+ e.getMessage());
        }
        return  null;
    }
    private static void logResult(BaseResponse res,String name) {
        if(StringUtils.equals(res.getCode(),HKConstants.RESPONSE_SUCCEE)){
            log.info("【"+name+"】================成功====\n"+res);

 server/dmvisit_service/src/main/java/com/doumee/dao/business/join/EmpowerJoinMapper.java

@@ -4,10 +4,12 @@
import com.doumee.dao.business.model.Empower;
import com.github.yulichang.base.mapper.MPJJoinMapper;

import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/30 15:33
 */
public interface EmpowerJoinMapper extends MPJJoinMapper<Empower> {

    void insertBatchSomeColumn(List<Empower> list);
}

 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java

@@ -63,6 +63,8 @@
    private Integer sendUserId;
    @ApiModelProperty(value = "下发次数", example = "1")
    private Integer tryNum;
    @ApiModelProperty(value = "失败重试 0需要 1不需要", example = "1")
    private Integer failFlag;

    @ApiModelProperty(value = "取消人员", example = "1")
    private Integer cancelUserId;
@@ -164,5 +166,8 @@
    @ApiModelProperty(value = "人员是否删除 0否 1是")
    @TableField(exist = false)
    private Integer memberDeleted;
    @ApiModelProperty(value = "临时字段")
    @TableField(exist = false)
    private Integer tempCouunt;

}

 server/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/ErpVisitDTO.java

@@ -83,6 +83,4 @@

    @ApiModelProperty(value = "随访人员信息")
    List<ErpWithVisitDTO> erpWithVisitDTOList;


}

 server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java

@@ -70,6 +70,7 @@
     * @param member å®žä½“对象
     */
    void updateById(Member member);
    void updateFace(Member member);


    /**

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -189,19 +189,8 @@
        if(member==null || member.getIsdeleted().equals(Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"员工信息已删除");
        }
        List<MemberCard> cards = HkSyncOrgUserToHKServiceImpl.getNormalCardList(member,memberCardMapper);
        HkSyncOrgUserToHKServiceImpl.dealMemberRoleEmpowerDo(cards,member,deviceRoleMapper,empowerMapper,deviceMapper);

    /*    LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        Member member = memberMapper.selectById(id);
        if(member.getIsdeleted().equals(Constants.ONE)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"员工信息已删除");
        }
        if(!member.getType().equals(Constants.memberType.internal)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非内部人员无法进行该操作");
        }
        List<MemberRole> roleList = memberRoleMapper.selectList(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
*/
//        List<MemberCard> cards = HkSyncOrgUserToHKServiceImpl.getNormalCardList(member,memberCardMapper);
        HkSyncOrgUserToHKServiceImpl.dealMemberRoleEmpowerDo(null,member,deviceRoleMapper,empowerMapper,deviceMapper);
    }


@@ -287,6 +276,27 @@
    public void updateById(Member member) {
        memberMapper.updateById(member);
    }
    @Override
    public void updateFace(Member member) {
        QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
        wrapper.lambda().ne(Member::getRemark,"人脸已同步最新");
        List<Member> list =memberMapper.selectList(wrapper);
       if(list!=null){
           String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
                   +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
           for(Member m : list){
             String faceId=  HkSyncOrgUserToHKServiceImpl.dealMemberFace(m,path);
             if(StringUtils.isNotBlank(faceId)){
                 Member update = new Member();
                 update.setId(m.getId());
                 update.setFaceId(faceId);
                 update.setRemark("人脸已同步最新");
                 update.setFaceStatus(Constants.ZERO);
                 memberMapper.updateById(update);
             }
           }
       }
    }

    @Override
    public void updateStatusById(Member member) {

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java

@@ -36,6 +36,7 @@
import com.doumee.dao.business.model.*;
import com.doumee.service.business.ext.ERPSyncService;
import com.doumee.service.business.InterfaceLogService;
import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.Synchronized;
import org.apache.commons.collections.CollectionUtils;
@@ -305,22 +306,22 @@
            dealUserChangeList(list,addList,updateList,delList,allList,param);
            if(addList.size()>0){
                memberMapper.insertBatchSomeColumn(addList);
                for (Member member:addList) {
               /* for (Member member:addList) {
                    dealRoleEmpower(member );
                }
                }*/
            }
            if(updateList.size()>0){
                for(Member c : updateList){
                     dealRoleEmpower(c );
//                     dealRoleEmpower(c );
                    c.setHkStatus(Constants.ZERO);
                    c.setRemark("待同步安防平台");
                    memberMapper.updateById(c);
                }
            }
            if(delList.size()>0){
                for (Member member:delList) {
               /* for (Member member:delList) {
                    dealRoleEmpower(member );
                }
                }*/
                delIds = delList.stream().map(m->m.getId()).collect(Collectors.toList());
                memberMapper.update(null,new UpdateWrapper<Member>().lambda()
                        .set(Member::getHkStatus,Constants.ZERO)
@@ -839,7 +840,7 @@
                    member.setErpStatus(Constants.ONE);
                    member.setErpDate(new Date());
                    member.setErpId(param.getId());
                    member.setFsStatus(Constants.ZERO);
                    member.setFaceStatus(Constants.ZERO);
                    member.setCompanyId(company.getId());
                    member.setType(Constants.memberType.internal);
                    member.setCanVisit(Constants.ONE);
@@ -853,6 +854,7 @@
                    memberMapper.insert(member);
                }else{
                    Integer id = member.getId();
                    String faceImg = member.getFaceImg();
                    BeanUtils.copyProperties(param,member);
                    member.setId(id);
                    member.setCompanyId(company.getId());
@@ -863,15 +865,20 @@
                    member.setEditDate(new Date());
                    member.setErpDate(new Date());
                    member.setHkStatus(Constants.ZERO);
                    if(StringUtils.isNotBlank(param.getFaceImg())
                            && !StringUtils.equals(param.getFaceImg(),faceImg)){
                        //只有人脸发生变化，才进行重新同步
                        member.setFaceStatus(Constants.ZERO);
                    member.setRemark("待同步安防平台");
                    }
                    member.setStartTime(param.getValidStartTime());
                    member.setEndTime(param.getValidEndTime());
                    memberMapper.updateById(member);
                }
                //2024å¹´3月7日17:49:33 å–消此业务处理人员门禁权限
//                getRoleIdByParam(param.getRoleIds(),member);
                //添加人员卡片数据
                dealMemberCard(member,param);
                //添加人员卡片数据(已开启虚拟卡功能，系统不需要给虚拟卡)
//                dealMemberCard(member,param);
            }
    }

@@ -988,14 +995,18 @@
            if(param.getRoleIds()!=null && param.getRoleIds().length>0 && StringUtils.isBlank(member.getRoleId())){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，未查询到有效门禁组数据");
            }
            memberMapper.update(null,new UpdateWrapper<Member>().lambda()
            //重新授权
            HkSyncOrgUserToHKServiceImpl.dealMemberRoleEmpowerDo(null,member,deviceRoleMapper,empowerMapper,deviceMapper);


       /* memberMapper.update(null,new UpdateWrapper<Member>().lambda()
                    .eq(Member::getId,member.getId())
                    .set(Member::getRoleId,member.getRoleId())
                    .set(Member::getRemark,"待同步安防平台")
                    .set(Member::getStartTime,param.getValidStartTime())
                    .set(Member::getEndTime,param.getValidEndTime())
                    .set(Member::getEditDate,new Date())
                    .set(Member::getHkStatus,Constants.ZERO ));
                    .set(Member::getHkStatus,Constants.ZERO ));*/
    }


@@ -1048,34 +1059,49 @@
                }
            }
    }
    private void isValidDoors(String doors) {
        if(StringUtils.isNotBlank(doors)){
            String[] dIds = doors.split(",");
            List<DeviceRole> roles = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
                    .eq(DeviceRole::getIsdeleted,Constants.ZERO)
                    .eq(DeviceRole::getType,Constants.DeviceRoleType.fk)
                    .in(DeviceRole::getId, Arrays.asList(dIds)));
            if(roles == null || roles.size()==0 || roles.size() != dIds.length){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，请选择有效的访客门禁组！");
            }
        }

    }

    @Override
    public void approveApply(ApproveNoticeRequest param){
        try{
            if(!Objects.isNull(param)
                ){

            }
            if(Objects.isNull(param)
                    ||Objects.isNull(param.getId())
                    ||Objects.isNull(param.getStatus())){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
            }
            if(!(param.getStatus()==Constants.ZERO||param.getStatus()==Constants.ONE)){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"状态码错误");
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"审批结果参数不正确");
            }
            if(visitsMapper.selectCount(new QueryWrapper<Visits>().lambda().eq(Visits::getErpId,param.getId())
                    .ne(Visits::getStatus,Constants.VisitStatus.submitCheck))>Constants.ZERO){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"数据状态码错误");
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"该申请当前状态不支持该操作");
            }
            isValidDoors(param.getDoors());
            List<Visits> visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda().eq(Visits::getErpId,param.getId()));
            if(CollectionUtils.isNotEmpty(visitsList)){
                visitsList.forEach(i->{
                    i.setEndCheckInfo("申请时间："+DateUtil.getPlusTime2(i.getStarttime())+"-"
                            +DateUtil.getPlusTime2(i.getEndtime())
                            +" ç”³è¯·é—¨ç¦ï¼š"+i.getDoors());
                    i.setStatus(!param.getStatus().equals(Constants.ZERO)?Constants.VisitStatus.pass:Constants.VisitStatus.noPass);
                    i.setEndCheckDate(DateUtil.StringToDate(param.getApproveDate(),"yyyy-MM-dd HH:mm:ss"));
                    i.setHkStatus(Constants.ZERO);
                    i.setRemark("待同步安防平台");
                    i.setStarttime( param.getStartTime());
                    i.setEndtime(param.getEndTime());
                    i.setDoors(param.getDoors());
                    visitsMapper.updateById(i);
                    if(Objects.isNull(i.getParentId())){
                        wxPlatNotice.sendVisitAuditTemplateNotice(i,

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java

@@ -132,12 +132,14 @@
                                            .eq(Empower::getId, c.getId())
                                            .set(Empower::getRemark, "删除权限下发失败")
                                            .set(Empower::getSendInfo, "删除权限下发失败")
                                            .set(Empower::getTryNum,Constants.formatIntegerNum(c.getTryNum())+1)
                                            .set(Empower::getSendStatus, Constants.EmpowerStatus.fail));
                                }else{
                                    empowerMapper.update(null, new UpdateWrapper<Empower>()
                                            .lambda()
                                            .eq(Empower::getId, c.getId())
                                            .set(Empower::getRemark, "下发失败")
                                            .set(Empower::getTryNum,Constants.formatIntegerNum(c.getTryNum())+1)
                                            .set(Empower::getSendInfo, "下发失败")
                                            .set(Empower::getSendStatus, Constants.EmpowerStatus.fail));
                                }
@@ -321,28 +323,40 @@
        List<Empower> allList =getAllFailDealList( endId);
        if(allList!=null && allList.size()>0){
            Date date = new Date();
            List<Integer> retryIds = new ArrayList<>();
            List<Integer> noIds = new ArrayList<>();
            for(Empower empower:allList){
                if(Constants.equalsObject(empower.getIsdeleted(),Constants.ONE)){
                    //如果是删除的权限下发，查询是否伺候有下发成功的数据，如果有，则不处理
                    Empower param = empowerMapper.selectOne(new QueryWrapper<Empower>().lambda()
                            .eq(Empower::getMemberId,empower.getMemberId())
                            .eq(Empower::getDeviceId,empower.getDeviceId() )
                            .gt(Empower::getId,empower.getId())
                            .last("limit 1"));
                    if(empower ==null || Constants.equalsInteger(empower.getIsdeleted(),Constants.ONE)){
//                        addIds.add(did);
                if(empower.getId().equals(392479)){
                    System.out.println("============================");
                }
//                int flag= empowerMapper.selectCount(new QueryWrapper<Empower>().lambda()
//                        .eq(Empower::getMemberId,empower.getMemberId())
//                        .eq(Empower::getDeviceId,empower.getDeviceId() )
//                        .gt(Empower::getId,empower.getId())
//                        .last("limit 1"));
                    if(empower.getTempCouunt() ==0){
                        //如果之后时间内又重新下发记录，则跳过不做处理
                        retryIds.add(empower.getId());
                    }else{
                        noIds.add(empower.getId());
                    }
                }
                //更新重新下发次数

             if(retryIds.size()>0){
                empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
                        .eq(Empower::getEditDate,date)
                        .setSql("try_num = ifnull(tyr_num,0) +1" )
                        .set(Empower::getCreateDate,date)
                        .set(Empower::getSendStatus,Constants.EmpowerStatus.wait)
                        .set(Empower::getSendDate,null)
                        .set(Empower::getEditDate,date)
                        .set(Empower::getRemark,"下发失败，待重新下发~")
                        .set(Empower::getRemark,"下发失败，待重新下发~")
                        .eq(Empower::getId,empower.getId()));
                        .set(Empower::getSendInfo,"下发失败，待重新下发~")
                        .in(Empower::getId,retryIds));
            }
            if(noIds.size()>0){
                empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
                        .set(Empower::getEditDate,date)
                        .set(Empower::getFailFlag,Constants.ONE)
                        .in(Empower::getId,noIds));
            }
            return allList.get(allList.size()-1).getId();
        }
@@ -633,20 +647,12 @@
    }
    private List<Empower> getAllFailDealList(int endId   ) {
        MPJLambdaWrapper<Empower> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(Empower.class);
        queryWrapper.selectAs(Device::getChannelNo,Empower::getDeviceChannelNo);
        queryWrapper.selectAs(Member::getHkStatus,Empower::getMemberHkStatus);
        queryWrapper.selectAs(Member::getIsdeleted,Empower::getMemberDeleted);
        queryWrapper.selectAs(Member::getHkId,Empower::getMemberHkId);
        queryWrapper.selectAs(Device::getHkId,Empower::getDeviceIndexCode);
        queryWrapper.selectAs(Device::getResourceType,Empower::getDeviceType);
        queryWrapper.leftJoin(Device.class,Device::getId,Empower::getDeviceId);
        queryWrapper.leftJoin(Member.class,Member::getId,Empower::getMemberId);
        queryWrapper.select(Empower::getId,Empower::getMemberId,Empower::getDeviceId,Empower::getIsdeleted);
        queryWrapper.select(" (select count(1) from empower ee  where ee.member_id=t.MEMBER_ID and ee.device_id =t.DEVICE_ID   and ee.id>t.id) as tempCouunt");
        queryWrapper.eq(Empower::getSendStatus,Constants.EmpowerStatus.fail);
        queryWrapper.gt(Empower::getId,endId);
        queryWrapper.orderByAsc(Empower::getId );
//      queryWrapper.orderByAsc(Empower::getCreateDate );
        queryWrapper.last("limit 100");//每次限制下发100个
        queryWrapper.ne( Empower::getFailFlag,Constants.ONE);
        List<Empower> list = empowerMapper.selectJoinList(Empower.class,queryWrapper);
        return list;
    }

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java

@@ -365,7 +365,7 @@
        dealMemberRoleEmpowerDo(cards,member,deviceRoleMapper,empowerMapper,deviceMapper);
    }

    public static void dealMemberRoleEmpowerDo(List<MemberCard> cards,Member member , DeviceRoleMapper deviceRoleMapper, EmpowerMapper empowerMapper, DeviceMapper deviceMapper) {
    public static void dealMemberRoleEmpowerDo(List<MemberCard> cards1,Member member , DeviceRoleMapper deviceRoleMapper, EmpowerMapper empowerMapper, DeviceMapper deviceMapper) {
        List<Integer> doorIds = getRoleIdByParam(member,deviceRoleMapper);
        if(doorIds==null || doorIds.size() == 0){
            //如果权限清空，则清空人员授权的权限数据
@@ -376,7 +376,8 @@
                    .set(Empower::getSendStatus,Constants.ZERO));
            return;
        }
        if((cards == null || cards.size() == 0) && StringUtils.isBlank(member.getFaceId())){
//        if((cards == null || cards.size() == 0) && StringUtils.isBlank(member.getFaceId())){
        if( StringUtils.isBlank(member.getFaceId())){
            //如果没有卡 ä¹Ÿæ²¡æœ‰äººè„¸
            return;
        }
@@ -593,15 +594,19 @@
            //处理新增数据
            BaseResponse result =  HKService.editUser(addHkModel);
            if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) ){
                if(StringUtils.isNotBlank(c.getFaceImg())){
                if(StringUtils.isNotBlank(c.getFaceImg()) && Constants.equalsInteger(c.getFaceStatus(),Constants.ZERO)){
                    //如果有人脸照片，处理人脸照片同步
                    String faceid = dealMemberFace(c,path);
                    if(StringUtils.isBlank(faceid)){
                        noticeErpFail(c,Constants.ZERO,"人脸信息更新失败，请检查人脸照片是否合法！");
                        c.setHkStatus(Constants.TWO);
                        c.setFaceStatus(Constants.TWO);
                        c.setRemark("人脸信息更新失败，请检查人脸照片是否合法！！"+result.getMsg());
                    }else{
                        c.setFaceId(faceid);
                        c.setFaceStatus(Constants.ONE);
                        //如果人脸跟你，重新下发权限数据
                         dealMemberRoleEmpower(c);
                    }
                }
            }else{
@@ -609,8 +614,7 @@
                c.setHkStatus(Constants.TWO);
                c.setRemark("人员信息同步安防平台更新失败，请修正后重试！！"+(result!=null?result.getCode()+result.getMsg():""));
            }
            //重新下发权限数据
            dealMemberRoleEmpower(c);

        }
        c.setHkDate(date);
        memberMapper.updateById(c);
@@ -651,7 +655,7 @@
            c.setHkId(addHkModel.getPersonId());
            c.setHkDate(new Date());
            memberMapper.updateById(c);
            dealMemberRoleEmpower(c);
//            dealMemberRoleEmpower(c);
            return  true;
        }else{
            noticeErpFail(c,Constants.ZERO,"人员信息同步安防平台失败，请修正后重试！"+result.getCode()+result.getMsg());
@@ -669,7 +673,7 @@
     * @param path
     * @return
     */
    private String dealMemberFace(Member c,String path) {
    public static String dealMemberFace(Member c,String path) {
        if(StringUtils.isBlank(c.getFaceId())){
            BaseResponse<FaceAddOrEditesponse> response = HKService.addFace(getFaceAddModel(c,path));
            if(response !=null && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)&& response.getData()!=null ){
@@ -774,7 +778,7 @@
        }
        return  model;
    }
    private FaceAddRequest getFaceAddModel(Member c,String path) {
    public static FaceAddRequest getFaceAddModel(Member c,String path) {
        FaceAddRequest model = new FaceAddRequest();
        model.setPersonId(c.getHkId());
        if(StringUtils.isNotBlank(c.getFaceImg())){
@@ -787,7 +791,7 @@
        }
        return  model;
    }
    private FaceEditRequest getFaceUpdateModel(Member c,String path) {
    public static FaceEditRequest getFaceUpdateModel(Member c,String path) {
        FaceEditRequest model = new FaceEditRequest();
        model.setFaceId(c.getFaceId());
        if(StringUtils.isNotBlank(c.getFaceImg())){