From 2d34613f07deabbbe7e5065c13eec61cfe2a4dcf Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 22 四月 2024 11:32:11 +0800
Subject: [PATCH] 最新版本
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 1025 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 803 insertions(+), 222 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 7886100..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
@@ -2,54 +2,54 @@
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.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;
+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.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.dao.web.reqeust.CheckVisitedDTO;
-import com.doumee.dao.web.response.MemberVO;
-import com.doumee.service.business.*;
+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 io.swagger.models.auth.In;
+import lombok.Synchronized;
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.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.servlet.http.HttpServletResponse;
+import javax.annotation.PostConstruct;
import java.util.*;
import java.util.stream.Collectors;
@@ -64,6 +64,8 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private DataSyncConfig dataSyncConfig;
@Autowired
private RedisTemplate<String, Object> redisTemplate;
@@ -86,15 +88,21 @@
@Autowired
private DeviceEventJoinMapper deviceEventJoinMapper;
+ @Value("${debug_model}")
+ private Boolean isDebug;
@Autowired
private CarEventJoinMapper carEventJoinMapper;
@Autowired
private CompanyMapper companyMapper;
+ @Autowired
+ private EmpowerMapper empowerMapper;
+ @Autowired
+ private ParkBookMapper parkBookMapper;
@Autowired
private MemberMapper memberMapper;
-
+
@Autowired
private MemberRoleMapper memberRoleMapper;
@@ -107,17 +115,172 @@
@Autowired
private InterfaceLogService interfaceLogService;
+ @Autowired
+ private ErpTool erpTool;
+
+
+ @Autowired
+ private WxPlatNotice wxPlatNotice;
+
+ @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
+ @Synchronized
public String syncCompany(OrgListRequest param){
- List<OrgListRespone> allList = new ArrayList<>();
+ if( Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) != DataSyncConfig.origin.erp){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝褰撳墠涓嶆敮鎸佺粍缁囧悓姝ユ搷浣渵");
+ }
+ //鑾峰彇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());
+ if(StringUtils.isNotBlank(respone.getParentOrgId())&&!respone.getParentOrgId().equals("orgRoot")){
+ company.setErpParentId(respone.getParentOrgId());
+ }
+ company.setErpDate(date);
+ company.setHkStatus(Constants.ZERO);
+ company.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
+ return company;
+ }
+ /**
+ * 鏇存柊缁勭粐瀵硅薄
+ * @param respone
+ * @param date
+ * @return
+ */
+ 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());
+ if(StringUtils.isNotBlank(respone.getParentOrgId())&&!respone.getParentOrgId().equals("orgRoot")){
+ company.setErpParentId(respone.getParentOrgId());
+ }
+ company.setErpDate(date);
+ company.setHkStatus(Constants.ZERO);
+ company.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
+ 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浜哄憳淇℃伅
@@ -125,20 +288,190 @@
* @return
*/
@Override
- public String syncUsers(UserListRequest param){
+ @Transactional
+ @Synchronized
+ public String syncUsers(UserListRequest param){
+ if( Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) != DataSyncConfig.origin.erp){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝褰撳墠涓嶆敮鎸佺粍缁囧悓姝ユ搷浣渵");
+ }
+ 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,param);
+ if(addList.size()>0){
+ memberMapper.insertBatchSomeColumn(addList);
+ /* for (Member member:addList) {
+ dealRoleEmpower(member );
+ }*/
+ }
+ if(updateList.size()>0){
+ for(Member c : updateList){
+// dealRoleEmpower(c );
+ c.setHkStatus(Constants.ZERO);
+ c.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
+ memberMapper.updateById(c);
+ }
+ }
+ if(delList.size()>0){
+ /* 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)
+ .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 ){
+// 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"));
+ 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,param));
+ }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,param));
+ }
+ }
+ 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,UserListRequest request) {
+ Member member = new Member();
+ BeanUtils.copyProperties(param,member);
+ 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(date);
+ member.setErpId(param.getId());
+ 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.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,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(date);
+ member.setStatus(param.getStatus());
+ 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;
+ }
+
+ 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){
@@ -146,7 +479,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);
@@ -154,8 +487,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);
@@ -163,8 +497,6 @@
saveInterfaceLog(param,"/visitBiz/accesstoken",JSONObject.toJSONString(result),Constants.ZERO);
}
-
- return result;
}
/**
@@ -175,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 (Exception e){
- e.printStackTrace();
- }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;
}
@@ -229,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 (Exception e){
- e.printStackTrace();
- }finally {
- saveInterfaceLog(param,"/visitBiz/resource/park/list",JSONObject.toJSONString(result),Constants.ZERO);
}
return result;
}
@@ -258,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<>();
@@ -266,12 +590,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());
@@ -290,11 +621,6 @@
}
IPage<VisitEventListResponse> pageData = visitEventJoinMapper.selectJoinPage(page, VisitEventListResponse.class,queryWrapper);
result = PageData.from(pageData);
- }catch (Exception e){
- e.printStackTrace();
- }finally {
- saveInterfaceLog(param,"/visitBiz/resource/visit/list",JSONObject.toJSONString(result),Constants.ZERO);
- }
return result;
}
@@ -302,37 +628,37 @@
@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<>();
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);
- 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)){
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());
@@ -344,11 +670,6 @@
IPage<DoorEventListResponse> pageData = deviceEventJoinMapper.selectJoinPage(page, DoorEventListResponse.class,queryWrapper);
result = PageData.from(pageData);
- }catch (Exception e){
- e.printStackTrace();
- }finally {
- saveInterfaceLog(param,"/visitBiz/resource/doorEvent/list",JSONObject.toJSONString(result),Constants.ZERO);
- }
return result;
}
@@ -356,14 +677,14 @@
@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<>();
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);
@@ -387,8 +708,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());
@@ -407,12 +728,6 @@
i.setVehiclePicUrl(null);
}
});
- }catch (Exception e){
- e.printStackTrace();
- }finally {
- saveInterfaceLog(param,"/visitBiz/resource/carEventList",JSONObject.toJSONString(result),Constants.ZERO);
- }
-
return result;
}
@@ -421,171 +736,437 @@
@Override
public void orgUpdate(OrgUpdateRequest param){
- try{
if(Objects.isNull(param)
||Objects.isNull(param.getId())
||StringUtils.isBlank(param.getName())
- ||StringUtils.isBlank(param.getLinkName())
- ||StringUtils.isBlank(param.getLinkPhone())
- ||Objects.isNull(param.getEditDate())
+// ||StringUtils.isBlank(param.getLinkName())
+// ||StringUtils.isBlank(param.getLinkPhone())
+// ||Objects.isNull(param.getEditDate())
){
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(),"鏈煡璇㈠埌涓婄骇缁勭粐鏁版嵁");
+ }
+ }
+ String rootOrgId = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_ROOTORG_CODE).getCode();
if(Objects.isNull(company)){
company = new Company();
- BeanUtils.copyProperties(param,company);
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());
+ /* if(StringUtils.isNotBlank(param.getParentId())){
+ company.setHkId(rootOrgId);
+ }*/
company.setErpId(param.getId());
+ company.setErpParentId(param.getParentId());
+ 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);
//TODO 娴峰悍鏁版嵁鍒涘缓
}else{
- BeanUtils.copyProperties(param,company);
+// BeanUtils.copyProperties(param,company);
company.setEditDate(new Date());
+ company.setErpId(param.getId());
+ /* if(StringUtils.isNotBlank(param.getParentId())){
+ company.setHkId(rootOrgId);
+ }*/
+ company.setHkStatus(Constants.ZERO);
+ company.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
company.setErpDate(new Date());
+ company.setName(param.getName());
+ 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();
- }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.isNotBlank(param.getFaceImg())
- ||StringUtils.isNotBlank(param.getCode())
- ||StringUtils.isNotBlank(param.getPhone())
- ||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)){
- 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.setType(Constants.memberType.internal);
- String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
- member.setIdcardNo(encryptIdNo);
- member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
- member.setCompanyId(param.getOrgId());
- memberMapper.insert(member);
-
- //TODO 娴峰悍鏁版嵁鍒涘缓
- }else{
- BeanUtils.copyProperties(param,member);
- String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
- member.setIdcardNo(encryptIdNo);
- member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
- member.setCompanyId(param.getOrgId());
- member.setEditDate(new Date());
- member.setErpDate(new Date());
- 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<DeviceRole> deviceRoleList
- = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda().eq(DeviceRole::getId,param.getRoleIds()));
- if(CollectionUtils.isNotEmpty(deviceRoleList)){
- List<MemberRole> memberRoleList = new ArrayList<>();
- for (DeviceRole deviceRole:deviceRoleList) {
- 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);
+ if(param.getIsdeleted() == 1){
+ if( Objects.isNull(param.getId()) ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- }
-
- //娣诲姞浜哄憳鍗＄墖鏁版嵁
- 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);
+ 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);
}
- }catch (Exception e){
- e.printStackTrace();
- }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()) || 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);
+ }
+ }
+ }
+ private Integer getRoleIdByParam(Integer[] param, Member member) {
+ //娣诲姞浜哄憳瑙掕壊鍏宠仈鏁版嵁
+ 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)
+ .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());
+ memberRoleList.add(memberRole);
+ }
+ member.setRoleId(ids);
+ memberRoleMapper.insertBatchSomeColumn(memberRoleList);
+ member.setRoleId(ids);
+ return 1;
+ }
+ }
+ return 0;
+ }
+
+
+ @Override
+ @Transactional
+ public void roleUserAuthor(UserAuthorRequest param){
+ 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);
+ }
+ 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){
try{
if(Objects.isNull(param)
||Objects.isNull(param.getId())
- ||Objects.isNull(param.getStatus())
- ){
+ ||Objects.isNull(param.getStatus())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
if(!(param.getStatus()==Constants.ZERO||param.getStatus()==Constants.ONE)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐘舵�佺爜閿欒");
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀹℃壒缁撴灉鍙傛暟涓嶆纭�");
}
if(visitsMapper.selectCount(new QueryWrapper<Visits>().lambda().eq(Visits::getErpId,param.getId())
.ne(Visits::getStatus,Constants.VisitStatus.submitCheck))>Constants.ZERO){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�佺爜閿欒");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ョ敵璇峰綋鍓嶇姸鎬佷笉鏀寔璇ユ搷浣�");
}
+ isValidDoors(param.getDoors());
List<Visits> visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda().eq(Visits::getErpId,param.getId()));
if(CollectionUtils.isNotEmpty(visitsList)){
visitsList.forEach(i->{
- i.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 (Exception e){
- e.printStackTrace();
+ }catch (BusinessException e){
+ throw e;
}finally {
saveInterfaceLog(param,"/visitBiz/resource/approveApply",null,Constants.ZERO);
}
}
-
- 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