From 2e7ba2bc0fbefa6ee0b44eaf1990a493795efe4a Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 16:33:36 +0800
Subject: [PATCH] 导出字段对接调整提交
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 665 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 578 insertions(+), 87 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 9429df2..8d5026f 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
@@ -2,53 +2,47 @@
import com.alibaba.fastjson.JSONObject;
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.plugins.pagination.Page;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.Jwt.JwtPayLoad;
import com.doumee.config.Jwt.JwtTokenUtil;
import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.erp.ErpConstants;
+import com.doumee.core.erp.ErpTool;
+import com.doumee.core.erp.model.openapi.request.erp.*;
+import com.doumee.core.erp.model.openapi.response.erp.ERPApiResponse;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
-import com.doumee.core.haikang.model.param.request.AcsDeviceListRequest;
-import com.doumee.core.haikang.model.param.request.DoorsListRequest;
-import com.doumee.core.haikang.model.param.request.PrivilegeGroupRequest;
-import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest;
-import com.doumee.core.haikang.model.param.request.event.parks.EventParkRequest;
-import com.doumee.core.haikang.model.param.request.event.visit.EventVisitRequest;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.openapi.request.*;
-import com.doumee.core.model.openapi.request.erp.OrgListRequest;
-import com.doumee.core.model.openapi.request.erp.UserInfoRequest;
-import com.doumee.core.model.openapi.request.erp.UserListRequest;
-import com.doumee.core.model.openapi.response.*;
-import com.doumee.core.model.openapi.response.erp.OrgListRespone;
+import com.doumee.core.erp.model.openapi.request.*;
+import com.doumee.core.erp.model.openapi.response.*;
+import com.doumee.core.erp.model.openapi.response.erp.ErpOrgListResponse;
+import com.doumee.core.erp.model.openapi.response.erp.ErpUserListResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
+import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.core.utils.redis.RedisUtil;
-import com.doumee.dao.admin.response.MemberInfoDTO;
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.dao.web.reqeust.CheckVisitedDTO;
-import com.doumee.dao.web.response.MemberVO;
-import com.doumee.service.business.*;
+import com.doumee.service.business.ERPSyncService;
+import com.doumee.service.business.InterfaceLogService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import io.swagger.models.auth.In;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
-import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
-import javax.servlet.http.HttpServletResponse;
+import javax.annotation.PostConstruct;
import java.util.*;
import java.util.stream.Collectors;
@@ -90,10 +84,14 @@
@Autowired
private CompanyMapper companyMapper;
+ @Autowired
+ private EmpowerMapper empowerMapper;
+ @Autowired
+ private ParkBookMapper parkBookMapper;
@Autowired
private MemberMapper memberMapper;
-
+
@Autowired
private MemberRoleMapper memberRoleMapper;
@@ -101,19 +99,160 @@
private MemberCardMapper memberCardMapper;
@Autowired
+ private VisitsMapper visitsMapper;
+
+ @Autowired
private InterfaceLogService interfaceLogService;
+
+ @Override
+ @PostConstruct
+ public int initHkConfig(){
+ ErpConstants.approveUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_APPROVE_URL).getCode();
+ ErpConstants.orgListUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_ORGLIST_URL).getCode();
+ ErpConstants.userListUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_USERLIST_URL).getCode();
+ ErpConstants.userStatusUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_USERSTATUS_RL).getCode();
+ return 0;
+ }
/**
* 鍚屾ERP缁勭粐淇℃伅
* @param param
* @return
*/
@Override
+ @Transactional
public String syncCompany(OrgListRequest param){
- List<OrgListRespone> allList = new ArrayList<>();
+ //鑾峰彇ERP缁勭粐淇℃伅锛堝叏閲忓悓姝ワ級
+ List<ErpOrgListResponse> list = ErpTool.getErpOrgList(ErpConstants.orgListUrl,param);
+ if(list !=null && list.size()>0){
+ List<Company> addList = new ArrayList<>();
+ List<Company> updateList = new ArrayList<>();
+ List<Integer> delIds = new ArrayList<>();
+ List<Company> allList = companyMapper.selectList(new QueryWrapper<Company>().lambda().eq(Company::getType,Constants.ONE));
+ dealCompanyChangeList(list,addList,updateList,delIds,allList);
+ if(addList.size()>0){
+ companyMapper.insertBatchSomeColumn(addList);
+ }
+ if(updateList.size()>0){
+ for(Company c : updateList){
+ companyMapper.updateById(c);
+ }
+ }
+ if(delIds.size()>0){
+ //鍒犻櫎鎵�鏈夐渶瑕佸垹闄ょ殑缁勭粐淇℃伅(閫昏緫鍒犻櫎锛�
+ companyMapper.update(null,new UpdateWrapper<Company>().lambda()
+ .set(Company::getIsdeleted, Constants.ONE)
+ .set(Company::getHkStatus, Constants.ZERO)
+ .in(Company::getId,delIds));
+ }
+ return "鍚屾鏁版嵁锛氭柊澧炪��"+addList.size()+"銆戞潯锛屾洿鏂般��"+updateList.size()+"銆戞潯锛屽垹闄ゃ��"+delIds.size()+"銆戞潯";
+ }else{
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鍚屾ERP鏁版嵁涓虹┖锛�");
+ }
+ }
+ /**
+ * 鏍规嵁鍚屾erp鐨勭粍缁囦俊鎭皝瑁� 缁勭粐鏂板銆佷慨鏀瑰拰鍒犻櫎鐨勯泦鍚堜俊鎭�
+ * @param list
+ * @param addList
+ * @param updateList
+ * @param delIds
+ * @param allList
+ */
+ private void dealCompanyChangeList(List<ErpOrgListResponse> list, List<Company> addList, List<Company> updateList, List<Integer> delIds, List<Company> allList) {
+ Date date = new Date();
+ for(ErpOrgListResponse respone : list){
+ //鏍规嵁erpid鏌ヨ浼佷笟淇℃伅锛屽垽鏂槸鏂板杩樻槸鏇存柊
+ Company company = findCompanyByERPId(allList,respone.getId());
+ if(company == null){
+ //濡傛灉鏄柊澧�
+ if(Constants.formatIntegerNum(respone.getIsdeleted()) == Constants.ONE){
+ continue;
+ }
+ //灏佽鏂板缁勭粐瀵硅薄鏁版嵁
+ addList.add(getAddCompanyModel(respone,date));
+ }else{
+ //濡傛灉鏄洿鏂�
+ if(Constants.formatIntegerNum(respone.getIsdeleted()) == Constants.ONE){
+ //濡傛灉宸插垹闄わ紝鍔犲叆鍒犻櫎闆嗗悎涓�
+ delIds.add(company.getId());
+ continue;
+ }else{
+ company.setIsdeleted(Constants.ZERO);
+ }
+ updateList.add(addUpdateCompanyModel(respone,company,date));
+ }
+ }
+ if(allList!=null && allList.size()>0){
+ for(Company c : allList){
+ if(!isCompanyDeleted(c,list)){
+ delIds.add(c.getId());
+ }
+ }
+ }
+
+ }
+
+ /**
+ * 鏂板缁勭粐瀵硅薄
+ * @param respone
+ * @param company
+ * @param date
+ * @return
+ */
+ private Company addUpdateCompanyModel(ErpOrgListResponse respone, Company company, Date date) {
+ company.setName(respone.getName());
+ company.setErpId(respone.getId());
+ company.setEditDate(date);
+ company.setStatus(respone.getStatus());
+ company.setCode(respone.getCode());
+ company.setErpParentId(respone.getParentOrgId());
+ company.setErpDate(date);
+ company.setHkStatus(Constants.ZERO);
+ return company;
+ }
+ /**
+ * 鏇存柊缁勭粐瀵硅薄
+ * @param respone
+ * @param date
+ * @return
+ */
+ private Company getAddCompanyModel(ErpOrgListResponse respone, Date date) {
+ Company company = new Company();
+ 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());
+ company.setErpDate(date);
+ company.setHkStatus(Constants.ZERO);
+ return company;
+ }
+
+ private boolean isCompanyDeleted(Company c, List<ErpOrgListResponse> list) {
+ for(ErpOrgListResponse m : list){
+ if(StringUtils.equals(c.getErpId(),m.getId())){
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private Company findCompanyByERPId(List<Company> allList, String id) {
+ if(allList!=null){
+ for(Company com :allList){
+ if(StringUtils.equals(com.getErpId(),id)){
+ return com;
+ }
+ }
+ }
return null;
}
+
+
+
/**
* 鍚屾ERP浜哄憳淇℃伅
@@ -121,20 +260,168 @@
* @return
*/
@Override
- public String syncUsers(UserListRequest param){
+ @Transactional
+ public String syncUsers(UserListRequest 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<>();
+ List<Integer> delIds = new ArrayList<>();
+ List<Member> delList = new ArrayList<>();
+ 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);
+ if(addList.size()>0){
+ for (Member member:addList) {
+ dealRoleEmpower(member,param.getStartTime(), param.getEndTime());
+ }
+ memberMapper.insertBatchSomeColumn(addList);
+ }
+ if(updateList.size()>0){
+ for(Member c : updateList){
+ dealRoleEmpower(c,param.getStartTime(), param.getEndTime());
+ c.setHkStatus(Constants.ZERO);
+ memberMapper.updateById(c);
+ }
+ }
+ if(delList.size()>0){
+ for (Member member:delList) {
+ dealRoleEmpower(member,param.getStartTime(), param.getEndTime());
+ }
+ delIds = delList.stream().map(m->m.getId()).collect(Collectors.toList());
+ memberMapper.update(null,new UpdateWrapper<Member>().lambda()
+ .set(Member::getHkStatus,Constants.ZERO)
+ .set(Member::getIsdeleted, Constants.ONE).in(Member::getId,delIds));
+ }
+ return "鍚屾鏁版嵁锛氭柊澧炪��"+addList.size()+"銆戞潯锛屾洿鏂般��"+updateList.size()+"銆戞潯锛屽垹闄ゃ��"+delIds.size()+"銆戞潯";
+ }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);
+ }
+
+
+ private void dealUserChangeList(List<ErpUserListResponse> list, List<Member> addList, List<Member> updateList, List<Member> delList, List<Member> allList) {
+ Date date = new Date();
+ for(ErpUserListResponse response : list){
+ 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());
+ if(member == null){
+ //濡傛灉鏄柊澧�
+ if(Constants.formatIntegerNum(response.getIsdeleted()) == Constants.ONE){
+ continue;
+ }
+ //灏佽鏂板缁勭粐瀵硅薄鏁版嵁
+ addList.add(getAddMemberModel(response,date,company));
+ }else{
+ //濡傛灉鏄洿鏂�
+ if(Constants.formatIntegerNum(response.getIsdeleted()) == Constants.ONE){
+ //濡傛灉宸插垹闄わ紝鍔犲叆鍒犻櫎闆嗗悎涓�
+ member.setRoleIds(response.getRoleIds());
+ delList.add(member);
+// delIds.add(member.getId());
+ continue;
+ }
+ updateList.add(addUpdateMemberModel(response,member,date,company));
+ }
+ }
+ if(allList!=null && allList.size()>0){
+ for(Member c : allList){
+ if(!Constants.equalsInteger(c.getIsdeleted(),Constants.ONE) && !isUserDeleted(c,list)){
+ delList.add(c);
+ }
+ }
+ }
+ }
+
+ private Member getAddMemberModel(ErpUserListResponse param, Date date,Company company) {
+ Member member = new Member();
+ BeanUtils.copyProperties(param,member);
+ 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.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());
+ return member;
+ }
+
+ private Member addUpdateMemberModel(ErpUserListResponse param, Member member, Date date,Company company) {
+ 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.setStatus(param.getStatus());
+ member.setErpDate(new Date());
+ member.setHkStatus(Constants.ZERO);
+ member.setRoleIds(param.getRoleIds());
+ member.setCompanyId(Objects.isNull(company)?null:company.getId());
+ member.setErpOrgId(param.getOrgId());
+ return member;
+ }
+
+ private boolean isUserDeleted(Member c, List<ErpUserListResponse> list) {
+ for(ErpUserListResponse m : list){
+ if(StringUtils.equals(c.getErpId(),m.getId().toString())){
+ c.setRoleIds(m.getRoleIds());
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private Member findUserByERPId(List<Member> allList, String id) {
+ if(allList!=null){
+ for(Member com :allList){
+ if(StringUtils.equals(com.getErpId(),id)){
+ return com;
+ }
+ }
+ }
return null;
}
+
+
/**
- * 鑾峰彇ERP浜哄憳淇℃伅
+ * 鎻愪氦鐢ㄦ埛鍚屾澶辫触璁板綍
* @param param
* @return
*/
@Override
- public String syncUserInfo(UserInfoRequest param){
- return null;
+ public boolean noticeUserFail(UserFailRequest param){
+ ERPApiResponse r = ErpTool.noticeUserStatus(ErpConstants.userStatusUrl,param);
+ if(r!=null && r.isSuccess()){
+ return true;
+ }
+ return false;
}
-
@Override
public AccessTokenResponse createERPToken(String accessKey, String accessSecret){
@@ -142,7 +429,7 @@
try{
String erpAccessKey = systemDictDataBiz.queryByCode(Constants.ERP_CONFIG,Constants.ERP_ACCESS_KEY).getCode();
String erpAccessSecret = systemDictDataBiz.queryByCode(Constants.ERP_CONFIG,Constants.ERP_ACCESS_SECRET).getCode();
- if(!accessKey.equals(erpAccessKey)||!erpAccessSecret.equals(accessSecret)){
+ if(!(accessKey.equals(erpAccessKey)&&erpAccessSecret.equals(accessSecret))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"绉橀挜鍖归厤澶辫触");
}
JwtPayLoad payLoad = new JwtPayLoad(erpAccessKey+"-"+erpAccessSecret);
@@ -150,8 +437,9 @@
RedisUtil.addObject(redisTemplate,Constants.RedisKeys.ERP_TOKEN,token,Constants.RedisKeys.EXPIRE_TIME);
result.setToken(token);
result.setExpireTime(Constants.RedisKeys.EXPIRE_TIME);
- }catch (Exception e){
-
+ return result;
+ }catch (BusinessException e){
+ throw e;
}finally {
Map<String,String> param = new HashMap<>();
param.put("accessKey",accessKey);
@@ -159,8 +447,6 @@
saveInterfaceLog(param,"/visitBiz/accesstoken",JSONObject.toJSONString(result),Constants.ZERO);
}
-
- return result;
}
/**
@@ -206,8 +492,8 @@
}
}
}
- }catch (Exception e){
- e.printStackTrace();
+ }catch (BusinessException e){
+ throw e;
}finally {
saveInterfaceLog(param,"/visitBiz/resource/role/list",JSONObject.toJSONString(result),Constants.ZERO);
}
@@ -238,8 +524,8 @@
result.add(parkListResponse);
}
}
- }catch (Exception e){
- e.printStackTrace();
+ }catch (BusinessException e){
+ throw e;
}finally {
saveInterfaceLog(param,"/visitBiz/resource/park/list",JSONObject.toJSONString(result),Constants.ZERO);
}
@@ -262,12 +548,19 @@
queryWrapper.selectAll(VisitEvent.class);
queryWrapper.selectAs(Visits::getName, VisitEventListResponse::getVisitorName);
+ queryWrapper.selectAs(VisitEvent::getBeVisitedPersonName, VisitEventListResponse::getBeVisitedUserName);
+ queryWrapper.selectAs(VisitEvent::getBeVisitedPersonOrg, VisitEventListResponse::getBeVisitedUserOrg);
+ queryWrapper.selectAs(VisitEvent::getSex, VisitEventListResponse::getVisitorSex);
+ queryWrapper.selectAs(VisitEvent::getVisitorWorkUint, VisitEventListResponse::getVisitorWorkUint);
+
queryWrapper.leftJoin(Visits.class,Visits::getId,VisitEvent::getVisitorId);
if(!Objects.isNull(visitListRequest)){
queryWrapper.eq(!Objects.isNull(visitListRequest.getEventId()),VisitEvent::getEventId, visitListRequest.getEventId());
queryWrapper.like(StringUtils.isNotBlank(visitListRequest.getVisitorName()),Visits::getName, visitListRequest.getVisitorName());
- queryWrapper.eq(StringUtils.isNotBlank(visitListRequest.getIdNo()),VisitEvent::getIdNo, visitListRequest.getIdNo());
+
+ queryWrapper.eq(StringUtils.isNotBlank(visitListRequest.getIdNo()),Visits::getIdcardNo, DESUtil.encrypt(Constants.EDS_PWD, visitListRequest.getIdNo()) );
+
queryWrapper.eq(StringUtils.isNotBlank(visitListRequest.getBeVisitedPersonId()),VisitEvent::getBeVisitedPersonId, visitListRequest.getBeVisitedPersonId());
queryWrapper.eq(StringUtils.isNotBlank(visitListRequest.getBeVisitedPersonOrgId()),VisitEvent::getBeVisitedPersonOrgId, visitListRequest.getBeVisitedPersonOrgId());
queryWrapper.like(StringUtils.isNotBlank(visitListRequest.getVisitorWorkUint()),VisitEvent::getVisitorWorkUint, visitListRequest.getVisitorWorkUint());
@@ -286,8 +579,8 @@
}
IPage<VisitEventListResponse> pageData = visitEventJoinMapper.selectJoinPage(page, VisitEventListResponse.class,queryWrapper);
result = PageData.from(pageData);
- }catch (Exception e){
- e.printStackTrace();
+ }catch (BusinessException e){
+ throw e;
}finally {
saveInterfaceLog(param,"/visitBiz/resource/visit/list",JSONObject.toJSONString(result),Constants.ZERO);
}
@@ -305,11 +598,11 @@
Utils.MP.blankToNull(doorEventListRequest);
queryWrapper.selectAs(DeviceEvent::getEventId,DoorEventListResponse::getEventId);
queryWrapper.selectAs(DeviceEvent::getEventType,DoorEventListResponse::getEventType);
- queryWrapper.selectAs(DeviceEvent::getSex,DoorEventListResponse::getSex);
+ queryWrapper.selectAs(Member::getSex,DoorEventListResponse::getSex);
queryWrapper.selectAs(DeviceEvent::getSrcName,DoorEventListResponse::getSrcName);
queryWrapper.selectAs(DeviceEvent::getSrcType,DoorEventListResponse::getSrcType);
- queryWrapper.selectAs(DeviceEvent::getIdcardDecode,DoorEventListResponse::getIdcardNo);
- queryWrapper.selectAs(DeviceEvent::getName,DoorEventListResponse::getName);
+ queryWrapper.selectAs(Member::getIdcardDecode,DoorEventListResponse::getIdcardNo);
+ queryWrapper.selectAs(Member::getName,DoorEventListResponse::getName);
queryWrapper.selectAs(DeviceEvent::getUserType,DoorEventListResponse::getType);
queryWrapper.selectAs(DeviceEvent::getExtEventInOut,DoorEventListResponse::getEventInOut);
queryWrapper.selectAs(DeviceEvent::getExtAccessChannel,DoorEventListResponse::getExtAccessChannel);
@@ -321,14 +614,14 @@
if(!Objects.isNull(doorEventListRequest)){
queryWrapper.eq(!Objects.isNull(doorEventListRequest.getEventId()),DeviceEvent::getEventId, doorEventListRequest.getEventId());
- queryWrapper.like(StringUtils.isNotBlank(doorEventListRequest.getName()),DeviceEvent::getName, doorEventListRequest.getName());
+ queryWrapper.like(StringUtils.isNotBlank(doorEventListRequest.getName()),Member::getName, doorEventListRequest.getName());
if(StringUtils.isNotBlank(doorEventListRequest.getIdNo())){
//杩涜鍔犲瘑
String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,doorEventListRequest.getIdNo());
- queryWrapper.eq(DeviceEvent::getIdNum, encryptIdNo);
+ queryWrapper.eq(Member::getIdcardNo, encryptIdNo);
}
- queryWrapper.ge(StringUtils.isNotBlank(doorEventListRequest.getStartTime()),DeviceEvent::getHappenTime, doorEventListRequest.getStartTime());
- queryWrapper.le(StringUtils.isNotBlank(doorEventListRequest.getEndTime()),DeviceEvent::getHappenTime, doorEventListRequest.getEndTime());
+ queryWrapper.ge(StringUtils.isNotBlank(doorEventListRequest.getStartTime()),DeviceEvent::getCreateDate, doorEventListRequest.getStartTime());
+ queryWrapper.le(StringUtils.isNotBlank(doorEventListRequest.getEndTime()),DeviceEvent::getCreateDate, doorEventListRequest.getEndTime());
for(PageWrap.SortData sortData: param.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
@@ -340,8 +633,8 @@
IPage<DoorEventListResponse> pageData = deviceEventJoinMapper.selectJoinPage(page, DoorEventListResponse.class,queryWrapper);
result = PageData.from(pageData);
- }catch (Exception e){
- e.printStackTrace();
+ }catch (BusinessException e){
+ throw e;
}finally {
saveInterfaceLog(param,"/visitBiz/resource/doorEvent/list",JSONObject.toJSONString(result),Constants.ZERO);
}
@@ -359,7 +652,8 @@
Utils.MP.blankToNull(carEventListRequest);
queryWrapper.selectAs(CarEvent::getEventId,CarEventListResponse::getEventId);
queryWrapper.selectAs(CarEvent::getEventType,CarEventListResponse::getEventType);
- queryWrapper.selectAs(CarEvent::getInoutType,CarEventListResponse::getEventType);
+ queryWrapper.selectAs(CarEvent::getCreateDate,CarEventListResponse::getCreateTime);
+ queryWrapper.selectAs(CarEvent::getInoutType,CarEventListResponse::getInoutType);
queryWrapper.selectAs(CarEvent::getAlarmCar,CarEventListResponse::getAlarmCar);
queryWrapper.selectAs(CarEvent::getCarAttributeName,CarEventListResponse::getCarAttributeName);
queryWrapper.selectAs(CarEvent::getCardNo,CarEventListResponse::getCardNo);
@@ -383,8 +677,8 @@
queryWrapper.eq(StringUtils.isNotBlank(carEventListRequest.getParkId()),CarEvent::getParkIndex, carEventListRequest.getParkId());
queryWrapper.like(StringUtils.isNotBlank(carEventListRequest.getParkName()),CarEvent::getParkName, carEventListRequest.getParkName());
queryWrapper.eq(StringUtils.isNotBlank(carEventListRequest.getPlateNo()),CarEvent::getPlateNos, carEventListRequest.getPlateNo());
- queryWrapper.ge(StringUtils.isNotBlank(carEventListRequest.getStartTime()),CarEvent::getHappenTime, carEventListRequest.getStartTime());
- queryWrapper.le(StringUtils.isNotBlank(carEventListRequest.getEndTime()),CarEvent::getHappenTime, carEventListRequest.getEndTime());
+ queryWrapper.ge(StringUtils.isNotBlank(carEventListRequest.getStartTime()),CarEvent::getCreateDate, carEventListRequest.getStartTime());
+ queryWrapper.le(StringUtils.isNotBlank(carEventListRequest.getEndTime()),CarEvent::getCreateDate, carEventListRequest.getEndTime());
for(PageWrap.SortData sortData: param.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
@@ -403,8 +697,8 @@
i.setVehiclePicUrl(null);
}
});
- }catch (Exception e){
- e.printStackTrace();
+ }catch (BusinessException e){
+ throw e;
}finally {
saveInterfaceLog(param,"/visitBiz/resource/carEventList",JSONObject.toJSONString(result),Constants.ZERO);
}
@@ -428,28 +722,44 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
Company company = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,param.getId()).last("limit 1"));
+ Company parentCompany = new Company();
+ if(StringUtils.isNotBlank(param.getParentId())){
+ parentCompany = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,param.getParentId()).last("limit 1"));
+ if(Objects.isNull(parentCompany)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌涓婄骇缁勭粐鏁版嵁");
+ }
+ }
if(Objects.isNull(company)){
company = new Company();
- BeanUtils.copyProperties(param,company);
company.setId(null);
company.setCreateDate(new Date());
company.setHkStatus(Constants.ZERO);
company.setErpStatus(Constants.ONE);
company.setErpDate(new Date());
company.setErpId(param.getId());
+ company.setErpParentId(param.getParentId());
+ company.setParentId(Objects.isNull(parentCompany)?null:parentCompany.getId());
company.setFsStatus(Constants.ZERO);
company.setType(Constants.ONE);
+ company.setLinkName(param.getLinkName());
+ company.setLinkPhone(param.getLinkPhone());
companyMapper.insert(company);
//TODO 娴峰悍鏁版嵁鍒涘缓
}else{
- BeanUtils.copyProperties(param,company);
+// BeanUtils.copyProperties(param,company);
company.setEditDate(new Date());
+ company.setErpId(param.getId());
+ company.setHkStatus(Constants.ZERO);
company.setErpDate(new Date());
+ company.setErpParentId(param.getParentId());
+ company.setParentId(Objects.isNull(parentCompany)?null:parentCompany.getId());
+ company.setLinkName(param.getLinkName());
+ company.setLinkPhone(param.getLinkPhone());
companyMapper.updateById(company);
//TODO 娴峰悍鏁版嵁鏇存柊
}
- }catch (Exception e){
- e.printStackTrace();
+ }catch (BusinessException e){
+ throw e;
}finally {
saveInterfaceLog(param,"/visitBiz/resource/orgUpdate",null,Constants.ZERO);
}
@@ -470,14 +780,19 @@
||StringUtils.isNotBlank(param.getFaceImg())
||StringUtils.isNotBlank(param.getCode())
||StringUtils.isNotBlank(param.getPhone())
- ||Objects.isNull(param.getEditDate())
- ){
+ ||Objects.isNull(param.getEditDate())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getId()).last("limit 1"));
- if(Objects.isNull(member)){
+ 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);
@@ -488,52 +803,228 @@
String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
member.setIdcardNo(encryptIdNo);
member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
- member.setCompanyId(param.getOrgId());
+ member.setErpOrgId(param.getOrgId());
+ doorIds = getRoleIdByParam(param.getRoleIds(),member);
memberMapper.insert(member);
-
- //TODO 娴峰悍鏁版嵁鍒涘缓
+ //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.setCompanyId(param.getOrgId());
+ 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()));
- memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
//TODO 娴峰悍鏁版嵁鏇存柊
}
- //娣诲姞浜哄憳瑙掑叧鑱旀暟鎹�
- if(!Objects.isNull(param.getRoleIds())&¶m.getRoleIds().length>Constants.ZERO){
- //鏌ヨ鏁版嵁搴撳瓨鍦ㄧ殑鏉冮檺
- List<MemberRole> memberRoleList = memberRoleMapper.selectList(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getId,param.getRoleIds()));
- List<Integer> roleIds = Arrays.asList(param.getRoleIds());
-
-// List<MemberRole> memberRoleList = new ArrayList<>();
-//
-// for (Integer id:roleIds) {
-//
-// }
-
-
-
-
- }
-
-
-
-
- }catch (Exception e){
- e.printStackTrace();
+ //濡傛灉鏈夋巿鏉冮棬绂佹暟鎹紝杩涜鐢ㄦ埛鎺堟潈鏁版嵁涓嬪彂浠诲姟鍒涘缓
+ dealMemberRoleEmpower(member,doorIds,param.getValidStartTime(),param.getValidEndTime());
+ //娣诲姞浜哄憳鍗＄墖鏁版嵁
+ dealMemberCard(member,param);
+ }catch (BusinessException e){
+ throw e;
}finally {
saveInterfaceLog(param,"/visitBiz/resource/userUpdate",null,Constants.ZERO);
}
}
+ /**
+ * 娣诲姞浜哄憳鍗＄墖鏁版嵁
+ * @param member
+ * @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()) {
+ MemberCard memberCard = new MemberCard();
+ memberCard.setCreateDate(new Date());
+ memberCard.setMemberId(member.getId());
+ memberCard.setIsdeleted(Constants.ZERO);
+ memberCard.setCode(id);
+ memberCardList.add(memberCard);
+ }
+ 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) {
+ //娣诲姞浜哄憳瑙掕壊鍏宠仈鏁版嵁
+ memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
+ if(!Objects.isNull(param)&¶m.length>Constants.ZERO){
+ //鏌ヨ鏁版嵁搴撳瓨鍦ㄧ殑鏉冮檺
+ List<DeviceRole> deviceRoleList= deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
+ .eq(DeviceRole::getType,Constants.TWO)
+ .in(DeviceRole::getId,param));
+ if(CollectionUtils.isNotEmpty(deviceRoleList)){
+ List<MemberRole> memberRoleList = new ArrayList<>();
+ String ids = "";
+ List<Integer> r = new ArrayList<>();
+ for (int i = 0; i < deviceRoleList.size(); i++) {
+ DeviceRole deviceRole =deviceRoleList.get(i);
+ if(i>0){
+ ids += ",";
+ }
+ Integer id =deviceRole.getId();
+ ids += "["+id+"]";
+ String doorids =deviceRole.getDoorIds();
+ if(StringUtils.isNotBlank(doorids)){
+ String[] ss = doorids.split(",");
+ try {
+ for(String s :ss){
+ r.add(Integer.parseInt(s));
+ }
+ }catch (Exception e){
+ //鑴忔暟鎹笉澶勭悊
+ }
+ }
+ MemberRole memberRole = new MemberRole();
+ memberRole.setCreateDate(new Date());
+ memberRole.setMemberId(member.getId());
+ memberRole.setIsdeleted(Constants.ZERO);
+ memberRole.setRoleId(deviceRole.getId().toString());
+ memberRoleList.add(memberRole);
+ }
+ memberRoleMapper.insertBatchSomeColumn(memberRoleList);
+ member.setRoleId(ids);
+
+ return r;
+ }
+ }
+ return null;
+ }
+
+ @Override
+ 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());
+
+ }
+ @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.getPartIdList()));
+ 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);
+ }
+ parkBookMapper.insertBatchSomeColumn(parkBookList);
+ }
+
+ }
+
+
+ @Override
+ public void approveApply(ApproveNoticeRequest param){
+ try{
+ 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(),"鐘舵�佺爜閿欒");
+ }
+ 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(),"鏁版嵁鐘舵�佺爜閿欒");
+ }
+ 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.setEndCheckDate(DateUtil.StringToDate(param.getApproveDate(),"yyyy-MM-dd HH:mm:ss"));
+ i.setHkStatus(Constants.ZERO);
+ visitsMapper.updateById(i);
+ });
+ }
+ }catch (BusinessException e){
+ throw e;
+ }finally {
+ saveInterfaceLog(param,"/visitBiz/resource/approveApply",null,Constants.ZERO);
+ }
+ }
--
Gitblit v1.9.3