整理

nidapeng

2024-03-25 755b60c531999e9d3c0a94759a2a5e92f5e4ad4e

 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,