k94314517
2024-03-01 2d95605efd098e1b1c80f80021b259314b10f204
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -41,6 +41,7 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -84,6 +85,8 @@
    @Autowired
    private DeviceEventJoinMapper deviceEventJoinMapper;
    @Value("${debug_model}")
    private Boolean isDebug;
    @Autowired
    private CarEventJoinMapper carEventJoinMapper;
@@ -337,9 +340,11 @@
        Date date = new Date();
        int num =0;
        for(ErpUserListResponse response : list){
            response.setPhone("1534569100"+num);
            response.setFaceImg("20223402/DM1005.png");
            response.setIdNo("34112219880427200"+num);
//            if(isDebug){
//                response.setPhone("1534569100"+num);
//                response.setFaceImg("20223402/DM1005.png");
//                response.setIdNo("34112219880427200"+num);
//            }
            num++;
            Company company =  new Company();
            if(StringUtils.isNotBlank(response.getOrgId())){
@@ -401,8 +406,8 @@
        member.setRoleIds(param.getRoleIds());
        member.setCompanyId(Objects.isNull(company)?null:company.getId());
        member.setErpOrgId(param.getOrgId());
        member.setStartTime(request.getStartTime());
        member.setEndTime(request.getEndTime());
//        member.setStartTime(request.getStartTime());
//        member.setEndTime(request.getEndTime());
        return  member;
    }
@@ -418,8 +423,8 @@
        member.setHkStatus(Constants.ZERO);
        member.setRemark("待同步安防平台");
        member.setRoleIds(param.getRoleIds());
        member.setStartTime(request.getStartTime());
        member.setEndTime(request.getEndTime());
//        member.setStartTime(request.getStartTime());
//        member.setEndTime(request.getEndTime());
        member.setCompanyId(Objects.isNull(company)?null:company.getId());
        member.setErpOrgId(param.getOrgId());
        return  member;
@@ -819,66 +824,80 @@
    @Override
    public void userUpdate(UserUpdateRequest param){
        try{
            if(Objects.isNull(param)
                    ||Objects.isNull(param.getId())//编码
                    ||StringUtils.isBlank(param.getName())//名称
                    ||StringUtils.isBlank(param.getIdNo())//证件号
                    ||Objects.isNull(param.getIdType())//证件类型
                    ||Objects.isNull(param.getSex())//性别
                    ||Objects.isNull(param.getOrgId())//所属组织编码
            if(param.getIsdeleted() == 1){
                if(  Objects.isNull(param.getId()) ){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST);
                }
               memberMapper.update(null,new UpdateWrapper<Member>().lambda()
                        .eq(Member::getErpId,param.getId())
                       .eq(Member::getIsdeleted,Constants.ZERO)
                       .set(Member::getIsdeleted,Constants.ONE)
                       .set(Member::getHkStatus,Constants.ZERO)
                       .set(Member::getEditDate,new Date())
                       .set(Member::getRemark,"待同步安防平台")
               );
            }else {
                if( Objects.isNull(param)
                        ||Objects.isNull(param.getId())//编码
                        ||StringUtils.isBlank(param.getName())//名称
                        ||StringUtils.isBlank(param.getIdNo())//证件号
                        ||Objects.isNull(param.getIdType())//证件类型
                        ||Objects.isNull(param.getSex())//性别
                        ||Objects.isNull(param.getOrgId())//所属组织编码
//                    ||StringUtils.isBlank(param.getFaceImg())//人脸照片
                    ||StringUtils.isBlank(param.getCode())//工号
                    ||StringUtils.isBlank(param.getPhone())//手机号
             ){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
                        ||StringUtils.isBlank(param.getCode())//工号
                        ||StringUtils.isBlank(param.getPhone())//手机号
                ){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST);
                }
                Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getId()).last("limit 1"));
                Company company = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,param.getOrgId()).last("limit 1"));
                if(Objects.isNull(company)){
                    throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到组织信息");
                }
                List<Integer> doorIds = null;
                if(Objects.isNull(member)){
                    member = new Member();
                    BeanUtils.copyProperties(param,member);
                    member.setId(null);
                    member.setCreateDate(new Date());
                    member.setRemark("待同步安防平台");
                    member.setHkStatus(Constants.ZERO);
                    member.setErpStatus(Constants.ONE);
                    member.setErpDate(new Date());
                    member.setErpId(param.getId());
                    member.setFsStatus(Constants.ZERO);
                    member.setCompanyId(company.getId());
                    member.setType(Constants.memberType.internal);
                    String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
                    member.setIdcardNo(encryptIdNo);
                    member.setStartTime(param.getValidStartTime());
                    member.setRoleId(param.getRoleIds()!=null?JSONObject.toJSONString(param.getRoleIds()):null);
                    member.setEndTime(param.getValidEndTime());
                    member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
                    member.setErpOrgId(param.getOrgId());
                    memberMapper.insert(member);
                }else{
                    Integer id = member.getId();
                    BeanUtils.copyProperties(param,member);
                    member.setId(id);
                    member.setCompanyId(company.getId());
                    String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
                    member.setIdcardNo(encryptIdNo);
                    member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
                    member.setErpOrgId(param.getOrgId());
                    member.setEditDate(new Date());
                    member.setErpDate(new Date());
                    member.setHkStatus(Constants.ZERO);
                    member.setRemark("待同步安防平台");
                    member.setStartTime(param.getValidStartTime());
                    member.setEndTime(param.getValidEndTime());
                    memberMapper.updateById(member);
                }
                //添加人员卡片数据
                getRoleIdByParam(param.getRoleIds(),member);
                dealMemberCard(member,param);
            }
            Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getId()).last("limit 1"));
            Company company = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,param.getOrgId()).last("limit 1"));
            if(Objects.isNull(company)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到组织信息");
            }
            List<Integer> doorIds = null;
              if(Objects.isNull(member)){
                member = new Member();
                BeanUtils.copyProperties(param,member);
                member.setId(null);
                member.setCreateDate(new Date());
                  member.setRemark("待同步安防平台");
                member.setHkStatus(Constants.ZERO);
                member.setErpStatus(Constants.ONE);
                member.setErpDate(new Date());
                member.setErpId(param.getId());
                member.setFsStatus(Constants.ZERO);
                member.setCompanyId(company.getId());
                member.setType(Constants.memberType.internal);
                String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
                member.setIdcardNo(encryptIdNo);
                member.setStartTime(param.getValidStartTime());
                member.setRoleId(param.getRoleIds()!=null?JSONObject.toJSONString(param.getRoleIds()):null);
                member.setEndTime(param.getValidEndTime());
                member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
                member.setErpOrgId(param.getOrgId());
                memberMapper.insert(member);
            }else{
                Integer id = member.getId();
                BeanUtils.copyProperties(param,member);
                member.setId(id);
                member.setCompanyId(company.getId());
                String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
                member.setIdcardNo(encryptIdNo);
                member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
                member.setErpOrgId(param.getOrgId());
                member.setEditDate(new Date());
                member.setErpDate(new Date());
                member.setHkStatus(Constants.ZERO);
                member.setRemark("待同步安防平台");
                member.setStartTime(param.getValidStartTime());
                member.setEndTime(param.getValidEndTime());
                memberMapper.updateById(member);
            }
            //添加人员卡片数据
            getRoleIdByParam(param.getRoleIds(),member);
            dealMemberCard(member,param);
        }catch (BusinessException e){
            throw e;
        }finally {
@@ -978,6 +997,7 @@
        return  null;
    }
    @Override
    public void roleUserAuthor(UserAuthorRequest param){
        if(Objects.isNull(param)
@@ -1006,6 +1026,9 @@
        if(Objects.isNull(param)
                ||StringUtils.isBlank(param.getCarCode())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        if(param.getValidStartTime()!=null && param.getValidEndTime()!=null&&param.getValidStartTime().getTime()> param.getValidEndTime().getTime()){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起,有效期时间不合法!");
        }
        Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getUserId()).last("limit 1"));
        if(Objects.isNull(member)){
@@ -1047,6 +1070,10 @@
    @Override
    public void approveApply(ApproveNoticeRequest param){
        try{
            if(!Objects.isNull(param)
                ){
            }
            if(Objects.isNull(param)
                    ||Objects.isNull(param.getId())
                    ||Objects.isNull(param.getStatus())){