From 6765787baa5e0b771d71f865c4deb776367410c4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 13 八月 2024 13:38:19 +0800
Subject: [PATCH] 修复bug
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 711 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 419 insertions(+), 292 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 5d18f99..0f9a0ab 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<>();
@@ -209,9 +227,12 @@
company.setEditDate(date);
company.setStatus(respone.getStatus());
company.setCode(respone.getCode());
- company.setErpParentId(respone.getParentOrgId());
+ if(StringUtils.isNotBlank(respone.getParentOrgId())&&!respone.getParentOrgId().equals("orgRoot")){
+ company.setErpParentId(respone.getParentOrgId());
+ }
company.setErpDate(date);
company.setHkStatus(Constants.ZERO);
+ company.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
return company;
}
/**
@@ -222,15 +243,19 @@
*/
private Company getAddCompanyModel(ErpOrgListResponse respone, Date date) {
Company company = new Company();
+ company.setStatus(respone.getStatus());
company.setIsdeleted(Constants.ZERO);
company.setName(respone.getName());
company.setErpId(respone.getId());
company.setCreateDate(date);
company.setType(Constants.ONE);
company.setCode(respone.getCode());
- company.setErpParentId(respone.getParentOrgId());
+ if(StringUtils.isNotBlank(respone.getParentOrgId())&&!respone.getParentOrgId().equals("orgRoot")){
+ company.setErpParentId(respone.getParentOrgId());
+ }
company.setErpDate(date);
company.setHkStatus(Constants.ZERO);
+ company.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
return company;
}
@@ -264,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<>();
@@ -277,24 +303,25 @@
List<Member> allList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
.eq(Member::getIsdeleted,Constants.ZERO)
.eq(Member::getType, Constants.memberType.internal));
- dealUserChangeList(list,addList,updateList,delList,allList);
+ dealUserChangeList(list,addList,updateList,delList,allList,param);
if(addList.size()>0){
- for (Member member:addList) {
- dealRoleEmpower(member,param.getStartTime(), param.getEndTime());
- }
memberMapper.insertBatchSomeColumn(addList);
+ /* for (Member member:addList) {
+ dealRoleEmpower(member );
+ }*/
}
if(updateList.size()>0){
for(Member c : updateList){
- dealRoleEmpower(c,param.getStartTime(), param.getEndTime());
+// dealRoleEmpower(c );
c.setHkStatus(Constants.ZERO);
+ c.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
memberMapper.updateById(c);
}
}
if(delList.size()>0){
- for (Member member:delList) {
- dealRoleEmpower(member,param.getStartTime(), param.getEndTime());
- }
+ /* 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)
@@ -304,26 +331,30 @@
}else{
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鍚屾ERP鏁版嵁涓虹┖锛�");
}
-
}
- public void dealRoleEmpower(Member member,Date startTime , Date endTime){
- List<Integer> doorIds = null;
- doorIds = getRoleIdByParam(member.getRoleIds(),member);
- //濡傛灉鏈夋巿鏉冮棬绂佹暟鎹紝杩涜鐢ㄦ埛鎺堟潈鏁版嵁涓嬪彂浠诲姟鍒涘缓
- dealMemberRoleEmpower(member,doorIds,startTime,endTime);
+ public void dealRoleEmpower(Member 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) {
+ 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"));
if(Objects.isNull(company)){
continue;
- }
+ }
}
//鏍规嵁 erpId 鏌ヨ鐢ㄦ埛淇℃伅锛屽垽鏂槸鏂板杩樻槸鏇存柊
Member member = findUserByERPId(allList,response.getId());
@@ -333,7 +364,7 @@
continue;
}
//灏佽鏂板缁勭粐瀵硅薄鏁版嵁
- addList.add(getAddMemberModel(response,date,company));
+ addList.add(getAddMemberModel(response,date,company,param));
}else{
//濡傛灉鏄洿鏂�
if(Constants.formatIntegerNum(response.getIsdeleted()) == Constants.ONE){
@@ -343,7 +374,7 @@
// delIds.add(member.getId());
continue;
}
- updateList.add(addUpdateMemberModel(response,member,date,company));
+ updateList.add(addUpdateMemberModel(response,member,date,company,param));
}
}
if(allList!=null && allList.size()>0){
@@ -355,38 +386,51 @@
}
}
- private Member getAddMemberModel(ErpUserListResponse param, Date date,Company company) {
+ private Member getAddMemberModel(ErpUserListResponse param, Date date,Company company,UserListRequest request) {
Member member = new Member();
BeanUtils.copyProperties(param,member);
- member.setCreateDate(new Date());
+ member.setCreateDate(date);
+ /*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(new Date());
+ member.setErpDate(date);
member.setErpId(param.getId());
- member.setFsStatus(Constants.ZERO);
+ member.setIdcardType(param.getIdType());
+ member.setFaceStatus(Constants.ZERO);
member.setStatus(param.getStatus());
member.setType(Constants.memberType.internal);
String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
member.setIdcardNo(encryptIdNo);
member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
- member.setHkStatus(Constants.ZERO);
member.setRoleIds(param.getRoleIds());
member.setCompanyId(Objects.isNull(company)?null:company.getId());
member.setErpOrgId(param.getOrgId());
+ member.setCanVisit(Constants.ONE);
+// member.setStartTime(request.getStartTime());
+// member.setEndTime(request.getEndTime());
return member;
}
- private Member addUpdateMemberModel(ErpUserListResponse param, Member member, Date date,Company company) {
+ private Member addUpdateMemberModel(ErpUserListResponse param, Member member, Date date,Company company,UserListRequest request) {
BeanUtils.copyProperties(param,member);
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.setEditDate(date);
member.setStatus(param.getStatus());
- member.setErpDate(new Date());
+ member.setErpDate(date);
member.setHkStatus(Constants.ZERO);
+ member.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
member.setRoleIds(param.getRoleIds());
+// member.setStartTime(request.getStartTime());
+// member.setEndTime(request.getEndTime());
member.setCompanyId(Objects.isNull(company)?null:company.getId());
member.setErpOrgId(param.getOrgId());
return member;
@@ -422,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;
}
@@ -463,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;
}
@@ -517,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;
}
@@ -546,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<>();
@@ -585,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;
}
@@ -597,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<>();
@@ -612,10 +643,10 @@
queryWrapper.selectAs(DeviceEvent::getUserType,DoorEventListResponse::getType);
queryWrapper.selectAs(DeviceEvent::getExtEventInOut,DoorEventListResponse::getEventInOut);
queryWrapper.selectAs(DeviceEvent::getExtAccessChannel,DoorEventListResponse::getExtAccessChannel);
- queryWrapper.selectAs(DeviceEvent::getCreateDate,DoorEventListResponse::getCreateTime);
+ queryWrapper.selectAs(DeviceEvent::getHappenTime,DoorEventListResponse::getCreateTime);
queryWrapper.selectAs(Member::getPhone,DoorEventListResponse::getPhone);
queryWrapper.selectAs(Member::getErpId,DoorEventListResponse::getUserId);
- queryWrapper.selectAs(Member::getCompanyId,DoorEventListResponse::getOrgId);
+ queryWrapper.selectAs(Member::getErpOrgId,DoorEventListResponse::getOrgId);
queryWrapper.leftJoin(Member.class,Member::getHkId,DeviceEvent::getExtEventPersonNo);
if(!Objects.isNull(doorEventListRequest)){
@@ -639,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;
}
@@ -651,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<>();
@@ -703,12 +728,6 @@
i.setVehiclePicUrl(null);
}
});
- }catch (BusinessException e){
- throw e;
- }finally {
- saveInterfaceLog(param,"/visitBiz/resource/carEventList",JSONObject.toJSONString(result),Constants.ZERO);
- }
-
return result;
}
@@ -717,7 +736,6 @@
@Override
public void orgUpdate(OrgUpdateRequest param){
- try{
if(Objects.isNull(param)
||Objects.isNull(param.getId())
||StringUtils.isBlank(param.getName())
@@ -741,6 +759,7 @@
company.setId(null);
company.setCreateDate(new Date());
company.setHkStatus(Constants.ZERO);
+ company.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
company.setErpStatus(Constants.ONE);
company.setErpDate(new Date());
company.setName(param.getName());
@@ -752,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);
@@ -765,6 +786,7 @@
company.setHkId(rootOrgId);
}*/
company.setHkStatus(Constants.ZERO);
+ company.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
company.setErpDate(new Date());
company.setName(param.getName());
company.setErpParentId(param.getParentId());
@@ -774,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())//鎵�灞炵粍缁囩紪鐮�
- ||StringUtils.isBlank(param.getFaceImg())//浜鸿劯鐓х墖
- ||StringUtils.isBlank(param.getCode())//宸ュ彿
- ||StringUtils.isBlank(param.getPhone())//鎵嬫満鍙�
- ){
- throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ 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);
+ }
+ 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.setHkStatus(Constants.ZERO);
- member.setErpStatus(Constants.ONE);
- member.setErpDate(new Date());
- member.setErpId(param.getId());
- member.setFsStatus(Constants.ZERO);
- member.setType(Constants.memberType.internal);
- String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
- member.setIdcardNo(encryptIdNo);
- member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
- member.setErpOrgId(param.getOrgId());
- doorIds = getRoleIdByParam(param.getRoleIds(),member);
- memberMapper.insert(member);
- //TODO 娴峰悍鏁版嵁鍒涘缓-------------淇敼-------------------
- }else{
- Integer id = member.getId();
- BeanUtils.copyProperties(param,member);
- member.setId(id);
- 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());
- doorIds = getRoleIdByParam(param.getRoleIds(),member);
- member.setErpDate(new Date());
- member.setHkStatus(Constants.ZERO);
- memberMapper.updateById(member);
- //鍒犻櫎鐢ㄦ埛鍗＄墖鏁版嵁 浜哄憳瑙掕壊鍏宠仈
- memberCardMapper.delete(new QueryWrapper<MemberCard>().lambda().eq(MemberCard::getMemberId,member.getId()));
- //TODO 娴峰悍鏁版嵁鏇存柊
- }
- //濡傛灉鏈夋巿鏉冮棬绂佹暟鎹紝杩涜鐢ㄦ埛鎺堟潈鏁版嵁涓嬪彂浠诲姟鍒涘缓
- dealMemberRoleEmpower(member,doorIds,param.getValidStartTime(),param.getValidEndTime());
- //娣诲姞浜哄憳鍗＄墖鏁版嵁
- dealMemberCard(member,param);
- }catch (BusinessException e){
- throw e;
- }finally {
- saveInterfaceLog(param,"/visitBiz/resource/userUpdate",null,Constants.ZERO);
- }
}
/**
@@ -857,63 +890,96 @@
* @param param
*/
private void dealMemberCard(Member member, UserUpdateRequest param) {
- if(!Objects.isNull(param.getCardList())&¶m.getCardList().size()>Constants.ZERO){
- if(CollectionUtils.isNotEmpty(param.getCardList())){
- List<MemberCard> memberCardList = new ArrayList<>();
- for (String id:param.getCardList()) {
+ if(Objects.isNull(param.getCardList()) || param.getCardList().size()== Constants.ZERO){
+ param.setCardList(new ArrayList<>());
+ //濡傛灉娌℃湁鍗″彿锛岄粯璁ょ粰涓�涓崱鍙�
+ param.getCardList().add(Constants.VIRTUAL_CARD_INDEX+member.getId());
+ }
+ if(CollectionUtils.isNotEmpty(param.getCardList())){
+ List<MemberCard> memberCardList = new ArrayList<>();
+ for (String id:param.getCardList()) {
+ MemberCard model = memberCardMapper.selectOne(new QueryWrapper<MemberCard>().lambda()
+ .eq(MemberCard::getCode,id)
+ .eq(MemberCard::getMemberId,member.getId()));
+
+ if(model!=null && Constants.equalsInteger(model.getHkStatus(),Constants.ONE)){
+ //濡傛灉宸茬粡寮�鍗″畬鎴�,涓嶅仛浠讳綍澶勭悊
+ }else if(model !=null){
+ //濡傛灉瀛樺湪锛屼絾鏈紑鍗★紝鍒欑洿鎺ユ洿鏀逛负寰呭悓姝�
+// model.setHkStatus(Constants.ZERO);
+// model.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
+ model.setIsdeleted(Constants.ZERO);
+ memberCardMapper.updateById(model);
+ }else{
MemberCard memberCard = new MemberCard();
memberCard.setCreateDate(new Date());
+ memberCard.setStatus(Constants.ONE);
memberCard.setMemberId(member.getId());
memberCard.setIsdeleted(Constants.ZERO);
+ memberCard.setType(HKConstants.CARD_TYPE.NORMAL.getKey());
+ memberCard.setHkStatus(Constants.ZERO);
+ memberCard.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
+ memberCard.setType(Constants.TWO);
memberCard.setCode(id);
memberCardList.add(memberCard);
}
+ }
+ if(memberCardList.size()>0){
memberCardMapper.insertBatchSomeColumn(memberCardList);
}
}
}
-
- /**
- * //濡傛灉鏈夋巿鏉冮棬绂佹暟鎹紝杩涜鐢ㄦ埛鎺堟潈鏁版嵁涓嬪彂浠诲姟鍒涘缓
- * @param member
- */
- private void dealMemberRoleEmpower(Member member, List<Integer> doorIds,Date startTime,Date endTime ) {
- //鍒犻櫎鎵�鏈夎�佺殑鎺堟潈淇℃伅
- empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
- .eq(Empower::getMemberId,member.getId())
- .set(Empower::getIsdeleted,Constants.ONE)
- .set(Empower::getSendStatus,Constants.ZERO));
-// empowerMapper.delete(new UpdateWrapper<Empower>().lambda()
-// .eq(Empower::getMemberId,member.getId())
-// );
- if(doorIds==null || doorIds.size() == 0){
- return;
- }
- List<Empower> list = new ArrayList<>();
- List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>().lambda().in(Device::getId,doorIds));
- if(deviceList == null || deviceList.size() == 0){
- return;
- }
- for (Device deviceRole:deviceList) {
- Empower model = new Empower();
- model.setCreateDate(new Date());
- model.setMemberId(member.getId());
- model.setIsdeleted(Constants.ZERO);
- model.setDeviceId(deviceRole.getId());
- model.setSendStatus(Constants.ZERO);
- model.setStartTime(startTime);
- model.setEndTime(endTime);
- model.setSendType(Constants.ZERO);
- list.add(model);
- }
- //瀵煎叆鏂板鐨勬巿鏉冧俊鎭�
- empowerMapper.insertBatchSomeColumn(list);
- }
-
- private List<Integer> getRoleIdByParam(Integer[] param, Member member) {
+ private Integer getRoleIdByParam(Integer[] param, Member member) {
//娣诲姞浜哄憳瑙掕壊鍏宠仈鏁版嵁
- memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,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)
@@ -944,72 +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);
- //濡傛灉鏈夋巿鏉冮棬绂佹暟鎹紝杩涜鐢ㄦ埛鎺堟潈鏁版嵁涓嬪彂浠诲姟鍒涘缓
- dealMemberRoleEmpower(member,doorIds,param.getValidStartTime(),param.getValidEndTime());
+ 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);
- 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){
@@ -1020,43 +1129,61 @@
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){
throw e;
}finally {
- saveInterfaceLog(param,"/visitBiz/resource/approveApply",null,Constants.ZERO);
+// saveInterfaceLog(param,"/visitBiz/resource/approveApply",null,Constants.ZERO);
}
}
-
- private void saveInterfaceLog(Object param, String path,String result,Integer type) {
- InterfaceLog interfaceLog=new InterfaceLog();
- interfaceLog.setType(type);
- interfaceLog.setCreateDate(new Date());
- interfaceLog.setIsdeleted(Constants.ZERO);
- if(param!=null){
- interfaceLog.setRequest(JSONObject.toJSONString(param));
+ @Override
+ public void saveInterfaceLog(Object param, String path, String result, Integer type) {
+ try {
+ InterfaceLog interfaceLog=new InterfaceLog();
+ interfaceLog.setType(type);
+ interfaceLog.setCreateDate(new Date());
+ interfaceLog.setIsdeleted(Constants.ZERO);
+ if(param!=null){
+ interfaceLog.setRequest(JSONObject.toJSONString(param));
+ }
+ interfaceLog.setPlat(Constants.ONE);
+ interfaceLog.setRepose(result);
+ interfaceLog.setName(path);
+ interfaceLog.setUrl(path);
+ interfaceLogService.create(interfaceLog);
+ }catch (Exception e){
+e.printStackTrace();
}
- interfaceLog.setPlat(Constants.ONE);
- interfaceLog.setRepose(result);
- interfaceLog.setName(path);
- interfaceLog.setUrl(path);
- interfaceLogService.create(interfaceLog);
+
}
}
--
Gitblit v1.9.3