From b0ea50dd24a7ed5ada38dc6c8209f78fc09f0441 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 21 六月 2024 17:45:33 +0800 Subject: [PATCH] 修复bug --- server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 564 +++++++++++++++++++++++++++++++++---------------------- 1 files changed, 336 insertions(+), 228 deletions(-) diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java index 3589b9d..e50e043 100644 --- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java +++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java @@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.api.R; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.doumee.biz.system.SystemDictDataBiz; +import com.doumee.config.DataSyncConfig; import com.doumee.config.Jwt.JwtPayLoad; import com.doumee.config.Jwt.JwtTokenUtil; import com.doumee.core.constants.ResponseStatus; @@ -26,20 +28,25 @@ import com.doumee.core.utils.DateUtil; import com.doumee.core.utils.Utils; import com.doumee.core.utils.redis.RedisUtil; +import com.doumee.core.wx.wxPlat.WxPlatNotice; import com.doumee.dao.business.*; import com.doumee.dao.business.join.CarEventJoinMapper; import com.doumee.dao.business.join.DeviceEventJoinMapper; import com.doumee.dao.business.join.VisitEventJoinMapper; import com.doumee.dao.business.model.*; -import com.doumee.service.business.ERPSyncService; +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; 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.Propagation; import org.springframework.transaction.annotation.Transactional; import javax.annotation.PostConstruct; @@ -57,6 +64,8 @@ @Autowired private SystemDictDataBiz systemDictDataBiz; + @Autowired + private DataSyncConfig dataSyncConfig; @Autowired private RedisTemplate<String, Object> redisTemplate; @@ -79,6 +88,8 @@ @Autowired private DeviceEventJoinMapper deviceEventJoinMapper; + @Value("${debug_model}") + private Boolean isDebug; @Autowired private CarEventJoinMapper carEventJoinMapper; @@ -104,6 +115,12 @@ @Autowired private InterfaceLogService interfaceLogService; + @Autowired + private ErpTool erpTool; + + + @Autowired + private WxPlatNotice wxPlatNotice; @Override @PostConstruct @@ -121,12 +138,13 @@ */ @Override @Transactional + @Synchronized public String syncCompany(OrgListRequest param){ - if(!StringUtils.equals(Constants.ONE+"", systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ORG_USER_ORIGIN).getCode())){ + if( Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) != DataSyncConfig.origin.erp){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝褰撳墠涓嶆敮鎸佺粍缁囧悓姝ユ搷浣渵"); } //鑾峰彇ERP缁勭粐淇℃伅锛堝叏閲忓悓姝ワ級 - List<ErpOrgListResponse> list = ErpTool.getErpOrgList(ErpConstants.orgListUrl,param); + List<ErpOrgListResponse> list = erpTool.getErpOrgList(ErpConstants.orgListUrl,param); if(list !=null && list.size()>0){ List<Company> addList = new ArrayList<>(); List<Company> updateList = new ArrayList<>(); @@ -271,11 +289,12 @@ */ @Override @Transactional + @Synchronized public String syncUsers(UserListRequest param){ - if(!StringUtils.equals(Constants.ONE+"", systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ORG_USER_ORIGIN).getCode())){ - throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝褰撳墠涓嶆敮鎸佷汉鍛樺悓姝ユ搷浣渵"); + if( Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) != DataSyncConfig.origin.erp){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝褰撳墠涓嶆敮鎸佺粍缁囧悓姝ユ搷浣渵"); } - List<ErpUserListResponse> list = ErpTool.getErpUserList(ErpConstants.userListUrl,param); + List<ErpUserListResponse> list = erpTool.getErpUserList(ErpConstants.userListUrl,param); if(list !=null && list.size()>0) { List<Member> addList = new ArrayList<>(); List<Member> updateList = new ArrayList<>(); @@ -287,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) @@ -315,14 +334,21 @@ } public void dealRoleEmpower(Member member ){ - List<Integer> doorIds = getRoleIdByParam(member.getRoleIds(),member); +// List<Integer> doorIds = getRoleIdByParam(member.getRoleIds(),member); //娣诲姞浜哄憳鍗$墖鏁版嵁 dealMemberCard(member,new UserUpdateRequest()); } private void dealUserChangeList(List<ErpUserListResponse> list, List<Member> addList, List<Member> updateList, List<Member> delList, List<Member> allList,UserListRequest param) { Date date = new Date(); + int num =0; for(ErpUserListResponse response : list){ +// 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())){ company = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,response.getOrgId()).last("limit 1")); @@ -364,17 +390,19 @@ Member member = new Member(); BeanUtils.copyProperties(param,member); member.setCreateDate(date); - if(StringUtils.isBlank(param.getFaceImg())){ + /*if(StringUtils.isBlank(param.getFaceImg())){ member.setHkStatus(Constants.THREE); }else{ member.setHkStatus(Constants.ZERO); member.setRemark("寰呭悓姝ュ畨闃插钩鍙�"); - } + }*/ + member.setHkStatus(Constants.ZERO); + member.setRemark("寰呭悓姝ュ畨闃插钩鍙�"); member.setErpStatus(Constants.ONE); member.setErpDate(date); member.setErpId(param.getId()); member.setIdcardType(param.getIdType()); - member.setFsStatus(Constants.ZERO); + member.setFaceStatus(Constants.ZERO); member.setStatus(param.getStatus()); member.setType(Constants.memberType.internal); String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo()); @@ -383,8 +411,9 @@ 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.setCanVisit(Constants.ONE); +// member.setStartTime(request.getStartTime()); +// member.setEndTime(request.getEndTime()); return member; } @@ -400,8 +429,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; @@ -437,7 +466,7 @@ */ @Override public boolean noticeUserFail(UserFailRequest param){ - ERPApiResponse r = ErpTool.noticeUserStatus(ErpConstants.userStatusUrl,param); + ERPApiResponse r = erpTool.noticeUserStatus(ErpConstants.userStatusUrl,param); if(r!=null && r.isSuccess()){ return true; } @@ -478,45 +507,44 @@ @Override public List<RoleListResponse> erpQueryDeviceList(RoleListRequest param){ List<RoleListResponse> result = new ArrayList<>(); - try{ - List<DeviceRole> deviceRoleList = this.deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda() - .eq(DeviceRole::getIsdeleted,Constants.ZERO) - .eq(!Objects.isNull(param.getId()),DeviceRole::getId,param.getId()) - .like(StringUtils.isNotBlank(param.getName()),DeviceRole::getName,param.getName()) - .orderByAsc(DeviceRole::getCreateDate) - ); - List<String> roleIds = new ArrayList<String>(); - if(CollectionUtils.isNotEmpty(deviceRoleList)){ - for (DeviceRole deviceRole:deviceRoleList) { - if(StringUtils.isNotBlank(deviceRole.getDoorIds())){ - List<String> doorList = Arrays.asList(deviceRole.getDoorIds().split(",")); - roleIds.addAll(doorList); - } - } - if(CollectionUtils.isNotEmpty(roleIds)){ - List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>().lambda().in(Device::getId,roleIds)); - for (DeviceRole deviceRole:deviceRoleList) { - RoleListResponse roleListResponse = new RoleListResponse(); - BeanUtils.copyProperties(deviceRole,roleListResponse); - if(StringUtils.isNotBlank(deviceRole.getDoorIds())){ - List<DeviceListResponse> DeviceListResponseList = new ArrayList<>(); - List<String> doorList = Arrays.asList(deviceRole.getDoorIds().split(",")); - List<Device> roleDeviceList = deviceList.stream().filter(m-> doorList.contains(m.getId().toString())).collect(Collectors.toList()); - for (Device device:roleDeviceList) { - DeviceListResponse deviceListResponse = new DeviceListResponse(); - BeanUtils.copyProperties(device,deviceListResponse); - DeviceListResponseList.add(deviceListResponse); - } - roleListResponse.setDeviceList(DeviceListResponseList); - } - result.add(roleListResponse); - } + List<DeviceRole> deviceRoleList = this.deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda() + .eq(DeviceRole::getIsdeleted,Constants.ZERO) + .eq(!Objects.isNull(param.getId()),DeviceRole::getId,param.getId()) + .like(StringUtils.isNotBlank(param.getName()),DeviceRole::getName,param.getName()) + .orderByAsc(DeviceRole::getCreateDate) + ); + List<String> roleIds = new ArrayList<String>(); + if(CollectionUtils.isNotEmpty(deviceRoleList)){ + for (DeviceRole deviceRole:deviceRoleList) { + if(StringUtils.isNotBlank(deviceRole.getDoorIds())){ + List<String> doorList = Arrays.asList(deviceRole.getDoorIds().split(",")); + roleIds.addAll(doorList); } } - }catch (BusinessException e){ - throw e; - }finally { - saveInterfaceLog(param,"/visitBiz/resource/role/list",JSONObject.toJSONString(result),Constants.ZERO); + if(CollectionUtils.isNotEmpty(roleIds)){ + List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>().lambda().in(Device::getId,roleIds)); + for (DeviceRole deviceRole:deviceRoleList) { + RoleListResponse roleListResponse = new RoleListResponse(); + BeanUtils.copyProperties(deviceRole,roleListResponse); + if(deviceRole.getType().equals("2")){ + roleListResponse.setType(Constants.ONE); + }else{ + roleListResponse.setType(Constants.ZERO); + } + if(StringUtils.isNotBlank(deviceRole.getDoorIds())){ + List<DeviceListResponse> DeviceListResponseList = new ArrayList<>(); + List<String> doorList = Arrays.asList(deviceRole.getDoorIds().split(",")); + List<Device> roleDeviceList = deviceList.stream().filter(m-> doorList.contains(m.getId().toString())).collect(Collectors.toList()); + for (Device device:roleDeviceList) { + DeviceListResponse deviceListResponse = new DeviceListResponse(); + BeanUtils.copyProperties(device,deviceListResponse); + DeviceListResponseList.add(deviceListResponse); + } + roleListResponse.setDeviceList(DeviceListResponseList); + } + result.add(roleListResponse); + } + } } return result; } @@ -532,23 +560,17 @@ @Override public List<ParkListResponse> parkList(ParkListRequest param){ List<ParkListResponse> result = new ArrayList<>(); - try{ - List<Parks> parksList = this.parksMapper.selectList(new QueryWrapper<Parks>().lambda() - .eq(Parks::getIsdeleted,Constants.ZERO) - .eq(!Objects.isNull(param.getId()),Parks::getId,param.getId()) - .like(StringUtils.isNotBlank(param.getName()),Parks::getName,param.getName()) - ); - if(CollectionUtils.isNotEmpty(parksList)){ - for (Parks parks:parksList) { - ParkListResponse parkListResponse = new ParkListResponse(); - BeanUtils.copyProperties(parks,parkListResponse); - result.add(parkListResponse); - } + List<Parks> parksList = this.parksMapper.selectList(new QueryWrapper<Parks>().lambda() + .eq(Parks::getIsdeleted,Constants.ZERO) + .eq(!Objects.isNull(param.getId()),Parks::getId,param.getId()) + .like(StringUtils.isNotBlank(param.getName()),Parks::getName,param.getName()) + ); + if(CollectionUtils.isNotEmpty(parksList)){ + for (Parks parks:parksList) { + ParkListResponse parkListResponse = new ParkListResponse(); + BeanUtils.copyProperties(parks,parkListResponse); + result.add(parkListResponse); } - }catch (BusinessException e){ - throw e; - }finally { - saveInterfaceLog(param,"/visitBiz/resource/park/list",JSONObject.toJSONString(result),Constants.ZERO); } return result; } @@ -561,7 +583,6 @@ @Override public PageData<VisitEventListResponse> visitListPage(PageWrap<VisitListRequest> param) { PageData<VisitEventListResponse> result = new PageData<>(); - try{ VisitListRequest visitListRequest = param.getModel(); IPage<VisitEvent> page = new Page<>(param.getPage(), param.getCapacity()); MPJLambdaWrapper<VisitEvent> queryWrapper = new MPJLambdaWrapper<>(); @@ -600,11 +621,6 @@ } IPage<VisitEventListResponse> pageData = visitEventJoinMapper.selectJoinPage(page, VisitEventListResponse.class,queryWrapper); result = PageData.from(pageData); - }catch (BusinessException e){ - throw e; - }finally { - saveInterfaceLog(param,"/visitBiz/resource/visit/list",JSONObject.toJSONString(result),Constants.ZERO); - } return result; } @@ -612,7 +628,7 @@ @Override public PageData<DoorEventListResponse> doorEventListPage(PageWrap<DoorEventListRequest> param) { PageData<DoorEventListResponse> result = new PageData<>(); - try{ + DoorEventListRequest doorEventListRequest = param.getModel(); IPage<DeviceEvent> page = new Page<>(param.getPage(), param.getCapacity()); MPJLambdaWrapper<DeviceEvent> queryWrapper = new MPJLambdaWrapper<>(); @@ -654,11 +670,6 @@ IPage<DoorEventListResponse> pageData = deviceEventJoinMapper.selectJoinPage(page, DoorEventListResponse.class,queryWrapper); result = PageData.from(pageData); - }catch (BusinessException e){ - throw e; - }finally { - saveInterfaceLog(param,"/visitBiz/resource/doorEvent/list",JSONObject.toJSONString(result),Constants.ZERO); - } return result; } @@ -666,7 +677,6 @@ @Override public PageData<CarEventListResponse> carEventList(PageWrap<CarEventListRequest> param) { PageData<CarEventListResponse> result = new PageData<>(); - try{ CarEventListRequest carEventListRequest = param.getModel(); IPage<CarEvent> page = new Page<>(param.getPage(), param.getCapacity()); MPJLambdaWrapper<CarEvent> queryWrapper = new MPJLambdaWrapper<>(); @@ -718,12 +728,6 @@ i.setVehiclePicUrl(null); } }); - }catch (BusinessException e){ - throw e; - }finally { - saveInterfaceLog(param,"/visitBiz/resource/carEventList",JSONObject.toJSONString(result),Constants.ZERO); - } - return result; } @@ -732,7 +736,6 @@ @Override public void orgUpdate(OrgUpdateRequest param){ - try{ if(Objects.isNull(param) ||Objects.isNull(param.getId()) ||StringUtils.isBlank(param.getName()) @@ -768,7 +771,9 @@ company.setParentId(Objects.isNull(parentCompany)?null:parentCompany.getId()); company.setErpParentId(param.getParentId()); company.setFsStatus(Constants.ZERO); + company.setStatus(Constants.ZERO); company.setType(Constants.ONE); + company.setIsdeleted(Constants.ZERO); company.setLinkName(param.getLinkName()); company.setLinkPhone(param.getLinkPhone()); companyMapper.insert(company); @@ -791,81 +796,92 @@ companyMapper.updateById(company); //TODO 娴峰悍鏁版嵁鏇存柊 } - }catch (BusinessException e){ - throw e; - }finally { - saveInterfaceLog(param,"/visitBiz/resource/orgUpdate",null,Constants.ZERO); - } } @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.setFaceStatus(Constants.ZERO); + member.setCompanyId(company.getId()); + member.setType(Constants.memberType.internal); + member.setCanVisit(Constants.ONE); + 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(); + String faceImg = member.getFaceImg(); + 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); + 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); } - 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 { - saveInterfaceLog(param,"/visitBiz/resource/userUpdate",null,Constants.ZERO); - } } /** @@ -890,8 +906,8 @@ //濡傛灉宸茬粡寮�鍗″畬鎴�,涓嶅仛浠讳綍澶勭悊 }else if(model !=null){ //濡傛灉瀛樺湪锛屼絾鏈紑鍗★紝鍒欑洿鎺ユ洿鏀逛负寰呭悓姝� - model.setHkStatus(Constants.ZERO); - model.setRemark("寰呭悓姝ュ畨闃插钩鍙�"); +// model.setHkStatus(Constants.ZERO); +// model.setRemark("寰呭悓姝ュ畨闃插钩鍙�"); model.setIsdeleted(Constants.ZERO); memberCardMapper.updateById(model); }else{ @@ -913,12 +929,57 @@ } } } - private List<Integer> getRoleIdByParam(Integer[] param, Member member) { + private Integer getRoleIdByParam(Integer[] param, Member member) { //娣诲姞浜哄憳瑙掕壊鍏宠仈鏁版嵁 - if(!Objects.isNull(member)&&!Objects.isNull(member.getId())){ + member.setRoleId(null); + List<MemberRole> roleList = memberRoleMapper.selectList( new QueryWrapper<MemberRole>().lambda() + .eq(MemberRole::getIsdeleted,Constants.ZERO) + .eq(MemberRole::getMemberId,member.getId())); + if((param == null || param.length==0 ) &&( roleList==null || roleList.size()==0)){ + //妫�鏌ョ敤鎴锋潈闄愭槸鍚﹀彂鐜板彉鍖� + return 0; + } + if((param == null || param.length==0 ) &&( roleList!=null && roleList.size()>0) ){ + //濡傛灉鍘熸潵鏈夋潈闄愶紝鎺ュ彛杩涜鏉冮檺鍒犻櫎 memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId())); + return 1; } if(!Objects.isNull(param)&¶m.length>Constants.ZERO){ + if(roleList!=null && roleList.size()>0) { + //鍜屽師鏈夋潈闄愯繘琛屽姣旓紝鐪嬫槸鍚︽潈闄愬彂鐢熷彉鍖� + boolean ischange1=false; + for (MemberRole role : roleList) { + ischange1=false; + for (int j = 0; j < param.length; j++) { + if(Constants.equalsInteger(role.getRoleId(),param[j])){ + ischange1=true; + break; + } + } + if(!ischange1){ + break; + } + } + + boolean ischange2 =false; + for (int j = 0; j < param.length; j++) { + ischange2=false; + for (MemberRole role : roleList) { + if(Constants.equalsInteger(role.getRoleId(),param[j])){ + ischange2=true; + break; + } + } + if(!ischange2){ + break; + } + } + if(ischange2 && ischange1){ + return 0;//鏉冮檺鏈彂鐢熸敼鍙� + } + } + //濡傛灉鍘熸潵鏈夋潈闄愶紝鎺ュ彛杩涜鏉冮檺鍒犻櫎 + memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId())); //鏌ヨ鏁版嵁搴撳瓨鍦ㄧ殑鏉冮檺 List<DeviceRole> deviceRoleList= deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda() .eq(DeviceRole::getType,Constants.TWO) @@ -949,80 +1010,115 @@ memberRole.setCreateDate(new Date()); memberRole.setMemberId(member.getId()); memberRole.setIsdeleted(Constants.ZERO); - memberRole.setRoleId(deviceRole.getId().toString()); + memberRole.setRoleId(deviceRole.getId()); memberRoleList.add(memberRole); } + member.setRoleId(ids); memberRoleMapper.insertBatchSomeColumn(memberRoleList); member.setRoleId(ids); - return r; + return 1; } } - return null; + return 0; } + @Override + @Transactional public void roleUserAuthor(UserAuthorRequest param){ - if(Objects.isNull(param) - ||StringUtils.isBlank(param.getUserId())){ - throw new BusinessException(ResponseStatus.BAD_REQUEST); - } - Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getUserId()).last("limit 1")); - if(Objects.isNull(member)){ - return; - } - List<Integer> doorIds = getRoleIdByParam(param.getRoleIds(),member); - //鏇存柊鎺堟潈鏈夋晥鏈� - Member update = new Member(); - update.setId(member.getId()); - update.setEditDate(new Date()); - update.setStartTime(param.getValidStartTime()); - update.setEndTime(param.getValidEndTime()); - update.setHkStatus(Constants.ZERO);//鍋氫竴閬嶆洿鏂伴�昏緫 - update.setRemark("寰呭悓姝ュ畨闃插钩鍙�"); - memberMapper.updateById(update); + if(Objects.isNull(param) + ||StringUtils.isBlank(param.getUserId())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); + } + if(Objects.nonNull(param.getValidStartTime())&&Objects.nonNull(param.getValidEndTime())){ + if(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)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛淇℃伅涓嶅瓨鍦紒"); + } + Integer ischange = getRoleIdByParam(param.getRoleIds(),member); + if(ischange == 0){ + return;//鏈彂鐜版潈闄愬彉鍖栵紝鐩存帴杩斿洖 + } + 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() + .eq(Member::getId,member.getId()) + .set(Member::getRoleId,member.getRoleId()) + .set(Member::getStartTime,param.getValidStartTime()) + .set(Member::getEndTime,param.getValidEndTime()) + .set(Member::getEditDate,new Date()) ); + //閲嶆柊鎺堟潈 + HkSyncOrgUserToHKServiceImpl.dealMemberRoleEmpowerDo(null,member,deviceRoleMapper,empowerMapper,deviceMapper); + } @Override public void parkCarAuthor(CarAuthorRequest param){ - if(Objects.isNull(param) - ||StringUtils.isBlank(param.getCarCode())){ - throw new BusinessException(ResponseStatus.BAD_REQUEST); - } - Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getUserId()).last("limit 1")); - if(Objects.isNull(member)){ - return; - } - //鍒犻櫎杞﹂噺搴撹褰曟暟鎹� - parkBookMapper.update(null,new UpdateWrapper<ParkBook>().lambda() - .eq(ParkBook::getCarCode,param.getCarCode()) - .set(ParkBook::getIsdeleted,Constants.ONE) - .set(ParkBook::getHkStatus,Constants.ZERO) - ); - //鏌ヨ杞﹀簱淇℃伅 - List<Parks> parksList = parksMapper.selectList(new QueryWrapper<Parks>().lambda().in(Parks::getId,param.getParkIdList())); - if(CollectionUtils.isNotEmpty(parksList)){ - List<ParkBook> parkBookList = new ArrayList<>(); - for (Parks parks:parksList) { - ParkBook parkBook = new ParkBook(); - parkBook.setIsdeleted(Constants.ZERO); - parkBook.setCreateDate(new Date()); - parkBook.setCarCode(param.getCarCode()); - parkBook.setParkId(parks.getId()); - parkBook.setOrigin(Constants.ZERO); - parkBook.setStartTime(Objects.isNull(param.getValidStartTime())?new Date():param.getValidStartTime()); - parkBook.setEndTime(param.getValidEndTime()); - parkBook.setTimeType(Objects.isNull(param.getValidEndTime())?Constants.ZERO:Constants.ONE); - parkBook.setMemberId(member.getId()); - parkBook.setHkStatus(Constants.ZERO); - parkBook.setRemark("寰呭悓姝ュ畨闃插钩鍙�"); - parkBookList.add(parkBook); + if(Objects.isNull(param) + ||StringUtils.isBlank(param.getCarCode())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); } - parkBookMapper.insertBatchSomeColumn(parkBookList); - } - + if(Objects.nonNull(param.getValidStartTime())&&Objects.nonNull(param.getValidEndTime())){ + if(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)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛淇℃伅涓嶅瓨鍦紒"); + } + //鍒犻櫎杞﹂噺搴撹褰曟暟鎹� + parkBookMapper.update(null,new UpdateWrapper<ParkBook>().lambda() + .eq(ParkBook::getCarCode,param.getCarCode()) + .set(ParkBook::getIsdeleted,Constants.ONE) + .set(ParkBook::getHkStatus,Constants.ZERO) + ); + //鏌ヨ杞﹀簱淇℃伅 + if(CollectionUtils.isNotEmpty(param.getParkIdList())){ + List<Parks> parksList = parksMapper.selectList(new QueryWrapper<Parks>().lambda() + .in(Parks::getId,param.getParkIdList()) + ); + if(CollectionUtils.isNotEmpty(parksList)){ + List<ParkBook> parkBookList = new ArrayList<>(); + for (Parks parks:parksList) { + ParkBook parkBook = new ParkBook(); + parkBook.setIsdeleted(Constants.ZERO); + parkBook.setCreateDate(new Date()); + parkBook.setCarCode(param.getCarCode()); + parkBook.setParkId(parks.getId()); + parkBook.setOrigin(Constants.ZERO); + parkBook.setStartTime(Objects.isNull(param.getValidStartTime())?null:param.getValidStartTime()); + parkBook.setEndTime(Objects.isNull(param.getValidEndTime())?null:param.getValidEndTime()); + parkBook.setTimeType(Objects.isNull(param.getValidEndTime())?Constants.ZERO:Constants.ONE); + parkBook.setMemberId(member.getId()); + parkBook.setHkStatus(Constants.ZERO); + parkBook.setRemark("寰呭悓姝ュ畨闃插钩鍙�"); + parkBookList.add(parkBook); + } + parkBookMapper.insertBatchSomeColumn(parkBookList); + }else{ + throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鍋滆溅搴撲俊鎭笉瀛樺湪锛屾巿鏉冨け璐�"); + } + } } - + 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){ @@ -1033,20 +1129,32 @@ 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.setStatus(param.getStatus().equals(Constants.ZERO)?Constants.VisitStatus.pass:Constants.VisitStatus.noPass); + 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, + systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_PREFIX).getCode(), + systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_AUDIT_VISIT).getCode()); + } }); } }catch (BusinessException e){ @@ -1057,8 +1165,8 @@ } - - private void saveInterfaceLog(Object param, String path,String result,Integer type) { + @Override + public void saveInterfaceLog(Object param, String path, String result, Integer type) { InterfaceLog interfaceLog=new InterfaceLog(); interfaceLog.setType(type); interfaceLog.setCreateDate(new Date()); -- Gitblit v1.9.3