From 21ffb032824db3c392f63d318d36efee33326b80 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 二月 2025 09:17:15 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 399 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 298 insertions(+), 101 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 63dac41..49118e4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -12,33 +12,29 @@
import com.doumee.core.erp.model.openapi.response.erp.ApproveInfoResponse;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
-import com.doumee.core.haikang.model.param.BaseListPageResponse;
import com.doumee.core.haikang.model.param.BaseResponse;
-import com.doumee.core.haikang.model.param.request.FacePictureCheckRequest;
+import com.doumee.core.haikang.model.param.request.VisitAppointmentCancelRequest;
import com.doumee.core.haikang.model.param.request.VisitAppointmentOutRequest;
import com.doumee.core.haikang.model.param.request.VisitAppointmentRequest;
-import com.doumee.core.haikang.model.param.respose.AscDeviceStatusInfoResponse;
-import com.doumee.core.haikang.model.param.respose.FacePictureCheckResponse;
import com.doumee.core.haikang.model.param.respose.VisitAppointmentResponse;
import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
-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.dao.business.dao.*;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.core.utils.*;
+import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.admin.response.InterestedListVO;
import com.doumee.dao.admin.response.PCWorkPlatformDataVO;
import com.doumee.dao.business.*;
-import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.dto.ResetPasswordDTO;
import com.doumee.dao.business.join.DeviceJoinMapper;
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
+
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
-import com.doumee.dao.system.dto.NoticesDTO;
import com.doumee.dao.system.dto.ResetSystemUserPwdDTO;
import com.doumee.dao.system.join.NoticesJoinMapper;
import com.doumee.dao.system.model.Notices;
@@ -58,9 +54,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.service.business.impl.hksync.HkSyncVisitServiceImpl;
+import com.doumee.service.business.third.EmayService;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -68,10 +64,8 @@
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.*;
+import java.util.Date;
import java.util.stream.Collectors;
/**
@@ -85,7 +79,9 @@
@Autowired
private RetentionMapper retentionMapper;
@Autowired
- private VisitsMapper visitsMapper;
+ private VisitsJoinMapper visitsMapper;
+ @Autowired
+ private UserActionMapper userActionMapper;
@Autowired
private ApproveMapper approveMapper;
@Autowired
@@ -126,6 +122,22 @@
private NoticesJoinMapper noticesJoinMapper;
@Autowired
private InoutDayCountMapper inoutDayCountMapper;
+ @Autowired
+ private CarEventMapper carEventMapper;
+
+ @Autowired
+ private SmsConfigMapper smsConfigMapper;
+
+ @Autowired
+ private SmsEmailMapper smsEmailMapper;
+
+ @Autowired
+ private WxNoticeConfigMapper wxNoticeConfigMapper;
+
+ @Autowired
+ private EmayService emayService;
+
+
@Override
public Integer create(Visits visits) {
@@ -157,10 +169,9 @@
}
if (Constants.equalsInteger(Constants.ZERO, erpVisitDTO.getIdcardType()) && erpVisitDTO.getIdcardNo().length() != 18
//&&!IdcardUtil.isValidCard(visits.getIdcardNo())
- ) {
+ ){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝韬唤璇佸彿鐮佹湁璇紝璇锋牳瀹炲悗閲嶈瘯锛�");
}
-
Visits visits = new Visits();
//鏍规嵁琚闂汉ERP涓婚敭鏌ヨ绯荤粺鍐呬汉鍛樹富閿俊鎭�
Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
@@ -216,6 +227,7 @@
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer createFk(Visits visits,Boolean isERP,Integer source) {
+ visits.setId(null);
isValidBaseParam(visits);
//妫�鏌ユ槸鍚﹀繀椤荤瓟棰橈紝骞朵笖绗﹀悎绛旈瑕佹眰
ProblemLog problemLog = isValidProblemLog(visits,source);
@@ -240,30 +252,25 @@
//鍒濆鍖栬瀹俊鎭�
initVisitInfo(visits,date);
- //浜鸿劯璇勫垎
- FacePictureCheckRequest param = new FacePictureCheckRequest();
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
- systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
- param.setFacePicBinaryData(visits.getFaceImg());
- try{
- Path path = Paths.get(prefixUrl + visits.getFaceImg());
-// Path path = Paths.get("d://b0e01861-fcef-4e22-a209-66a649f1b7ef.jpg");
- byte[] imageBytes = Files.readAllBytes(path);
- param.setFacePicBinaryData(Base64.getEncoder().encodeToString(imageBytes));
- }catch (Exception e){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浜鸿劯淇℃伅瑙ｆ瀽澶辫触");
-
- }
- BaseResponse<FacePictureCheckResponse> response = HKService.facePictureCheck(param);
- if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝浜鸿劯璇勫垎鑾峰彇鏁版嵁澶辫触~");
- }
- FacePictureCheckResponse facePictureCheckResponse = response.getData();
- if(!facePictureCheckResponse.getCheckResult()){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), facePictureCheckResponse.getStatusMessage());
- }
-
-
+// if(StringUtils.isNotBlank(visits.getFaceImg())&&(Constants.equalsInteger(visits.getType(),Constants.ZERO)|| Constants.equalsInteger(visits.getType(),Constants.TWO))){
+// //浜鸿劯璇勫垎
+// FacePictureCheckRequest param = new FacePictureCheckRequest();
+// String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode() +
+// systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+// param.setFacePicUrl(prefixUrl + visits.getFaceImg());
+// BaseResponse<FacePictureCheckResponse> response = HKService.facePictureCheck(param);
+// if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
+// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝浜鸿劯璇勫垎鑾峰彇鏁版嵁澶辫触~");
+// }
+// FacePictureCheckResponse facePictureCheckResponse = response.getData();
+// if(Objects.isNull(facePictureCheckResponse) || Objects.isNull(facePictureCheckResponse.getCheckResult())){
+// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝浜鸿劯璇勫垎鑾峰彇鏁版嵁澶辫触~");
+// }
+// if(!facePictureCheckResponse.getCheckResult()){
+// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), facePictureCheckResponse.getStatusMessage());
+// }
+// }
+ visits.setSendTimeOutNotice(Constants.ZERO);
visitsMapper.insert(visits);
//鍙戣捣ERP瀹℃壒鐢宠
@@ -276,26 +283,31 @@
}else{
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鍙戣捣鎷滆瀹℃壒鐢宠澶辫触锛�");
}
- //鍙戦�佸井淇″叕浼楀彿閫氱煡
- wxPlatNotice.sendVisitAuditTemplateNotice(visits,
- systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_PREFIX).getCode(),
- systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_AUDIT_VISIT).getCode());
}else if(dataSyncConfig.getVisitorDataOrigin().equals(Constants.ZERO)){
visits.setStatus(Constants.VisitStatus.waitCheck);
visitsMapper.updateById(visits);
- approveService.createApproveFlow(visits.getType(),visits.getId(),visits.getReceptMemberId());
+ approveService.createApproveFlow(visits.getType(),visits.getId(),visits.getReceptMemberId(),member);
}else{
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鍙戣捣鎷滆瀹℃壒鐢宠澶辫触锛�");
}
initWithVisitInfo(visits);
updateProblemLog(visits,problemLog,member);
+
+ //鍙戦�佸井淇″叕浼楀彿閫氱煡 - 鐢宠鎻愪氦鎴愬姛寰呭鏍�
+ if(StringUtils.isNotBlank(visits.getOpenid())){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,visits,
+ Constants.equalsInteger(visits.getType(),Constants.TWO)?WxPlatConstants.visitReportContent.visitReportUpload:WxPlatConstants.visitContent.visitUpload,
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+ Arrays.asList(visits.getOpenid().split(","))
+ );
+ }
//鍒涘缓瀹℃壒璁板綍
createApprove(visits,visitMember);
return visits.getId();
}
-
-
@Override
@@ -318,7 +330,20 @@
//鍒濆鍖栬瀹俊鎭�
// initVisitInfo(visits,date);
visitsMapper.insert(visits);
- approveService.createApproveFlow(visits.getType(),visits.getId(),visits.getReceptMemberId());
+ if(Objects.nonNull(visits.getLoginUserInfo())){
+ SystemUser systemUser = systemUserMapper.selectById(visits.getLoginUserInfo().getId());
+ if(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getOpenid())){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,visits,
+ Constants.equalsInteger(visits.getType(),Constants.TWO)?WxPlatConstants.visitReportContent.visitReportUpload:WxPlatConstants.visitContent.visitUpload,
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+ Arrays.asList(systemUser.getOpenid().split(","))
+ );
+ }
+ }
+
+ approveService.createApproveFlow(visits.getType(),visits.getId(),visits.getReceptMemberId(),null);
return visits.getId();
}
@@ -661,7 +686,7 @@
if(Constants.equalsInteger(visits.getType(),Constants.ZERO)
|| Constants.equalsInteger(visits.getType(),Constants.ONE)){
if( visits.getIdcardType() == null
- || StringUtils.isBlank( visits.getIdcardNo() ) ){
+ || StringUtils.isBlank( visits.getIdcardNo() ) || StringUtils.isBlank(visits.getFaceImg()) ){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝淇℃伅濉啓涓嶆纭紒");
}
}
@@ -1111,6 +1136,32 @@
public void deleteById(Integer id) {
visitsMapper.deleteById(id);
}
+ @Override
+ @Transactional(rollbackFor ={BusinessException.class,Exception.class})
+ public void deleteById(Integer id,LoginUserInfo user) {
+ Visits model = visitsMapper.selectById(id);
+ if(model ==null || Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ Date date = new Date();
+ visitsMapper.update(null,new UpdateWrapper<Visits>().lambda()
+ .set(Visits::getIsdeleted,Constants.ONE)
+ .set(Visits::getEditDate,new Date())
+ .set(Visits::getEditor,user.getId())
+ .eq(Visits::getId,id));
+ String[] params = new String[3];
+ params[0] = user.getRealname();
+ params[1]=DateUtil.getPlusTime2(date);
+ if(Constants.equalsInteger(model.getType(),Constants.TWO)){
+ params[2]=model.getCarNos()+"-銆愬崟浣嶏細"+model.getCompanyName()+" "+model.getName()+" "+model.getPhone()+"銆�-銆愭椂闂达細"+DateUtil.getPlusTime2(model.getStarttime())+"-"+DateUtil.getPlusTime2(model.getEndtime())+"銆�";
+ //璁板綍鍒犻櫎璁垮鎶ュ鏃ュ織
+ UserActionServiceImpl.saveUserActionBiz(user,id,Constants.UserActionType.VISIT_DEL,userActionMapper,date,params, JSONObject.toJSONString(model));
+ }else{
+ params[2]=model.getCompanyName()+"-銆愯瀹細"+model.getName()+" "+model.getPhone()+"銆�-銆愭椂闂达細"+DateUtil.getPlusTime2(model.getStarttime())+"-"+DateUtil.getPlusTime2(model.getEndtime())+"銆�";
+ //璁板綍鍒犻櫎璁垮鐢宠鏃ュ織
+ UserActionServiceImpl.saveUserActionBiz(user,id,Constants.UserActionType.VISIT_DEL,userActionMapper,date,params, JSONObject.toJSONString(model));
+ }
+ }
@Override
public void delete(Visits visits) {
@@ -1154,6 +1205,7 @@
queryWrapper.leftJoin("Member t3 on t.CREATE_MEMBER_ID=t3.id");
queryWrapper.eq(Visits::getId,id);
+ queryWrapper.eq(Visits::getIsdeleted,Constants.ZERO);
Visits result = visitsJoinMapper.selectJoinOne(Visits.class,queryWrapper);
if(result!=null){
@@ -1164,6 +1216,8 @@
List<DeviceRole> deviceRoleList= deviceRoleMapper.selectList(deviceQuery);
result.setDeviceRoleList(deviceRoleList);
}
+ }else{
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
MPJLambdaWrapper<Visits> visitQuery = new MPJLambdaWrapper<>();
@@ -1194,6 +1248,22 @@
result.setBusinessStatus(result.getStatus());
}
+
+ Notices notices = noticesJoinMapper.selectOne(new QueryWrapper<Notices>().lambda()
+ .eq(Notices::getObjId,id)
+ .eq(Notices::getType,Constants.equalsInteger(result.getType(),Constants.TWO)?Constants.noticesObjectType.visitReporting:Constants.noticesObjectType.visit)
+ .eq(Notices::getUserId,memberId)
+ .eq(Notices::getSendacopy,Constants.ZERO)
+ .orderByDesc(Notices::getId).last(" limit 1 "));
+ if(Objects.nonNull(notices)){
+ if(Constants.equalsInteger(notices.getStatus(),Constants.ZERO)){
+ result.setInfo("寰呮垜澶勭悊");
+ }else{
+ result.setInfo(notices.getInfo());
+ }
+ }
+
+
return result;
}
@@ -1221,6 +1291,18 @@
queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ //鏁版嵁鏉冮檺寮�濮�--------------------start----------------
+ LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo();
+ if(userInfo!=null && userInfo.getCompanyIdList()!=null){
+ if( userInfo.getCompanyIdList().size() ==0){
+ //鍙兘鐪嬭嚜宸�(鎷滆浜猴級
+ queryWrapper.eq(Member::getId,userInfo.getMemberId());
+ }else{
+ queryWrapper.in(Company::getId ,userInfo.getCompanyIdList());
+ }
+ }
+ //鏁版嵁鏉冮檺寮�濮�--------------------end----------------
+
queryWrapper.eq(Visits::getIsdeleted,Constants.ZERO);
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType())&&Constants.equalsInteger(pageWrap.getModel().getType(),Constants.TWO),Visits::getType,pageWrap.getModel().getType());
queryWrapper.ne(Objects.nonNull(pageWrap.getModel().getType())&&!Constants.equalsInteger(pageWrap.getModel().getType(),Constants.TWO),Visits::getType,Constants.TWO);
@@ -1235,6 +1317,23 @@
queryWrapper.isNull(Visits::getParentId);
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getMemberId()),Visits::getMemberId,pageWrap.getModel().getMemberId());
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getReceptMemberId()),Visits::getReceptMemberId,pageWrap.getModel().getReceptMemberId());
+
+ if(Objects.nonNull(pageWrap.getModel().getBusinessStatus())){
+ if(Constants.equalsInteger(pageWrap.getModel().getBusinessStatus(),Constants.TWO)){
+ queryWrapper.in(Visits::getStatus,
+ Constants.VisitStatus.xfSuccess,
+ Constants.VisitStatus.xfFail,
+ Constants.VisitStatus.signin,
+ Constants.VisitStatus.signout,
+ Constants.VisitStatus.invalid,
+ Constants.VisitStatus.pass
+ );
+ }else{
+ queryWrapper.eq(Visits::getStatus,pageWrap.getModel().getBusinessStatus());
+ }
+
+ }
+
queryWrapper.orderByDesc(Visits::getCreateDate);
IPage<Visits> result = visitsJoinMapper.selectJoinPage(page, Visits.class,queryWrapper);
@@ -1251,10 +1350,7 @@
QueryWrapper<Visits> wrapper = new QueryWrapper<>(visits);
return visitsMapper.selectCount(wrapper);
}
-
-
- @Override
- public PageData<Visits> retentionPage(PageWrap<Visits> pageWrap) {
+ public static PageData<Visits> retentionPageBiz(PageWrap<Visits> pageWrap, VisitsJoinMapper visitsJoinMapper,SystemDictDataBiz systemDictDataBiz) {
String code= systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.TIMEOUT_WARNING).getCode();
IPage<Visits> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
@@ -1266,9 +1362,7 @@
queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
queryWrapper.leftJoin(" member m on m.id= t.MEMBER_ID");
-
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getLevelStatus()),Visits::getStatus,Constants.VisitStatus.signin);
-
queryWrapper.apply(Objects.nonNull(pageWrap.getModel().getLevelStatus())," TIMESTAMPDIFF( MINUTE, NOW(), t.OUT_DATE) <= "+code+" ");
queryWrapper.ne("m.type ",Constants.TWO);
@@ -1297,12 +1391,17 @@
return PageData.from(result);
}
+ @Override
+ public PageData<Visits> retentionPage(PageWrap<Visits> pageWrap) {
+ return retentionPageBiz(pageWrap,visitsJoinMapper,systemDictDataBiz);
+ }
+
@Override
public VisitDetailVO getVisitDetail(Integer id,Integer memberId){
Visits visits = visitsMapper.selectById(id);
- if(Objects.isNull(visits)){
+ if(Objects.isNull(visits) || Constants.equalsInteger(visits.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
Member member = memberMapper.selectById(visits.getReceptMemberId());
@@ -1367,6 +1466,21 @@
memberId)
);
// }
+
+ Notices notices = noticesJoinMapper.selectOne(new QueryWrapper<Notices>().lambda()
+ .eq(Notices::getObjId,id)
+ .eq(Notices::getType,Constants.equalsInteger(visits.getType(),Constants.TWO)?Constants.noticesObjectType.visitReporting:Constants.noticesObjectType.visit)
+ .eq(Notices::getUserId,memberId)
+ .eq(Notices::getSendacopy,Constants.ZERO)
+ .orderByDesc(Notices::getId).last(" limit 1 "));
+ if(Objects.nonNull(notices)){
+ if(Constants.equalsInteger(notices.getStatus(),Constants.ZERO)){
+ visitDetailVO.setInfo("寰呮垜澶勭悊");
+ }else{
+ visitDetailVO.setInfo(notices.getInfo());
+ }
+ }
+
return visitDetailVO;
}
@@ -1415,12 +1529,13 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
if(!visits.getStatus().equals(Constants.VisitStatus.signin)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁垮璁板綍鐘舵�侀敊璇紝璇峰埛鏂伴噸璇�");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浠呮敮鎸併�愭嫓璁夸腑銆戠姸鎬佽繘琛岃绂诲満鎿嶄綔锛岃鍒锋柊閲嶈瘯");
}
VisitAppointmentOutRequest request = new VisitAppointmentOutRequest();
request.setOrderId(visits.getHkId());
//璋冪敤娴峰悍寮哄埗绛剧
- BaseResponse response = HKService.outVisitAppiontment(request);
+ BaseResponse response = HKService.iccmSignoff(request);
+// BaseResponse response = HKService.outVisitAppiontment(request);
visitsMapper.update(null,new UpdateWrapper<Visits>().lambda().set(Visits::getStatus,Constants.VisitStatus.signout)
.eq(Visits::getId,visitId));
//浜у嚭鍦ㄥ満浜哄憳淇℃伅
@@ -1437,10 +1552,11 @@
if(!visits.getStatus().equals(Constants.VisitStatus.xfSuccess)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁垮璁板綍鐘舵�侀敊璇紝璇峰埛鏂伴噸璇�");
}
- VisitAppointmentOutRequest request = new VisitAppointmentOutRequest();
- request.setOrderId(visits.getHkId());
+ VisitAppointmentCancelRequest request = new VisitAppointmentCancelRequest();
+ request.setAppointRecordIds(new String[]{visits.getHkId()});
//璋冪敤娴峰悍寮哄埗绛剧
- BaseResponse response = HKService.outVisitAppiontment(request);
+// BaseResponse response = HKService.outVisitAppiontment(request);
+ BaseResponse response = HKService.iccmCancelAppointment(request);
visitsMapper.update(null,new UpdateWrapper<Visits>().lambda().set(Visits::getStatus,Constants.VisitStatus.signout)
.eq(Visits::getId,visitId));
//浜у嚭鍦ㄥ満浜哄憳淇℃伅
@@ -1473,11 +1589,6 @@
if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.xfSuccess)){
//濡傛灉涓嬪彂鎴愬姛锛�
visitsMapper.updateById(visits);
- if(Objects.isNull(visits.getParentId())){
- wxPlatNotice.sendVisitAuditTemplateNotice(visits,
- systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_PREFIX).getCode(),
- systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_AUDIT_VISIT).getCode());
- }
}else{
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"閲嶆柊涓嬪彂浼氬け璐ワ紒");
}
@@ -1502,6 +1613,7 @@
dto.setPassword(resetPasswordDTO.getPassword());
dto.setId(systemUser.getId());
dto.setOperaUserId(systemUser.getId());
+ dto.setNeedChangePwd(Constants.ONE);
systemUserBiz.resetPwd(dto);
}
@@ -1520,6 +1632,7 @@
.selectAll(Retention.class)
.selectAs(Company::getType,Retention::getCompanyType)
.leftJoin(Company.class,Company::getId,Retention::getCompanyId)
+ .eq(Retention::getIsdeleted,Constants.ZERO)
);
InoutDayCount inoutDayCount = inoutDayCountMapper.selectOne(new QueryWrapper<InoutDayCount>()
@@ -1530,7 +1643,7 @@
//浠婃棩鍦ㄥ洯浜烘暟
pcWorkPlatformDataVO.setTodayInParkUserNum(
- retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO)).count()
+ retentionList.stream().filter(i->!Constants.equalsInteger(i.getType(),Constants.THREE)).count()
);
pcWorkPlatformDataVO.setTodayInUserNum(Constants.ZERO);
@@ -1538,7 +1651,8 @@
//鍦ㄥ洯闀挎湡鐩稿叧鏂逛汉鏁�
pcWorkPlatformDataVO.setInParkLwUserNum(
- retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO) && Constants.equalsInteger(i.getCompanyType(),Constants.ZERO)).count()
+ retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO)
+ && Constants.equalsInteger(i.getCompanyType(),Constants.ZERO)).count()
);
pcWorkPlatformDataVO.setLwUserInNum(Constants.ZERO);
pcWorkPlatformDataVO.setLwUserOutNum(Constants.ZERO);
@@ -1546,7 +1660,7 @@
//鍦ㄥ洯璁垮鏁伴噺
pcWorkPlatformDataVO.setInParkVisitUserNum(
- retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO)&&Objects.isNull(i.getCompanyType())).count()
+ retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&Objects.isNull(i.getCompanyType())).count()
);
pcWorkPlatformDataVO.setVisitUserNum(Constants.ZERO);
pcWorkPlatformDataVO.setSignLevelNum(Constants.ZERO);
@@ -1577,23 +1691,48 @@
List<InterestedListVO> weekVisitList = new ArrayList<>();
List<InterestedListVO> weekCarList = new ArrayList<>();
List<InterestedListVO> lwList = new ArrayList<>();
+ //鏌ヨ涓冨ぉ鍓嶇殑璁垮璁板綍鏁伴噺
+ List<Visits> visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda().in(Visits::getStatus,
+ Constants.VisitStatus.signin,Constants.VisitStatus.signout)
+ .apply(" STARTTIME > CURDATE() - INTERVAL 7 DAY " )
+ );
+
+ List<CarEvent> carEventList = carEventMapper.selectList(new QueryWrapper<CarEvent>().lambda()
+ .in(CarEvent::getEventType,"771760131","771760130")
+ .apply(" STR_TO_DATE(happen_time, '%Y-%m-%dT%H:%i:%s') > CURDATE() - INTERVAL 7 DAY " )
+ );
for (String days:weekDays) {
- InoutDayCount inoutDayCount = inoutDayCountMapper.selectOne(new QueryWrapper<InoutDayCount>()
- .lambda()
- .apply(" DATE(TIME_INFO) = '"+days+"' ")
- .last(" limit 1 ")
- );
InterestedListVO visitVO = new InterestedListVO();
+ visitVO.setName(days);
+ if(CollectionUtils.isNotEmpty(visitsList)){
+ //澶勭悊璁垮浜哄憳鏁伴噺
+ List<Visits> daysList = visitsList.stream().filter(i->Objects.nonNull(i.getStarttime())&&DateUtil.dateToString(i.getStarttime(),"yyyy-MM-dd").equals(days)).collect(Collectors.toList());
+ List<String> memberIds = daysList.stream().map(i->i.getMemberId().toString()).collect(Collectors.toList());
+ if(CollectionUtils.isNotEmpty(memberIds)){
+ visitVO.setNum(new HashSet<String>(memberIds).size());
+ }
+ }
+ if(Objects.isNull(visitVO.getNum())){
+ visitVO.setNum(Constants.ZERO);
+ }
+
+
visitVO.setName(days);
InterestedListVO carVO = new InterestedListVO();
carVO.setName(days);
- if(Objects.isNull(inoutDayCount)){
+
+
+ if(CollectionUtils.isNotEmpty(carEventList)){
+ //澶勭悊璁垮浜哄憳鏁伴噺
+ List<CarEvent> daysList = carEventList.stream().filter(i->StringUtils.isNotBlank(i.getHappenTime()) && i.getHappenTime().substring(0,10).equals(days)).collect(Collectors.toList());
+ List<String> carCodeList = daysList.stream().map(i->i.getPlateNos()).collect(Collectors.toList());
+ if(CollectionUtils.isNotEmpty(carCodeList)){
+ carVO.setNum(new HashSet<String>(carCodeList).size());
+ }
+ }
+ if(Objects.isNull(carVO.getNum())){
visitVO.setNum(Constants.ZERO);
- carVO.setNum(Constants.ZERO);
- }else{
- visitVO.setNum(inoutDayCount.getInVisitorNum());
- carVO.setNum(inoutDayCount.getInCarNum());
}
weekVisitList.add(visitVO);
weekCarList.add(carVO);
@@ -1610,45 +1749,50 @@
List<Integer> companyIds = companyList.stream().map(i->i.getId()).collect(Collectors.toList());
List<Retention> retentionList = retentionMapper.selectList(
new QueryWrapper<Retention>().lambda()
+ .eq(Retention::getType,Constants.TWO)
.in(Retention::getCompanyId,companyIds)
);
for (Company company:companyList) {
Integer count = retentionList.stream().filter(i->Constants.equalsInteger(i.getCompanyId(),company.getId())).collect(Collectors.toList()).size();
- InterestedListVO lw = new InterestedListVO();
- lw.setNum(count);
- lw.setName(company.getName());
- lwList.add(lw);
+ if(count>0){
+ InterestedListVO lw = new InterestedListVO();
+ lw.setNum(count);
+ lw.setName(company.getName());
+ lwList.add(lw);
+ }
}
}
pcWorkPlatformDataVO.setLwList(lwList );
}else if(Constants.equalsInteger(queryType,Constants.THREE)) {
- MPJLambdaWrapper<Notices> queryWrapper = new MPJLambdaWrapper<>();
- queryWrapper.selectAll(Notices.class);
if (Objects.isNull(loginUserInfo.getMemberId())) {
- queryWrapper.eq("1", "2");
+ pcWorkPlatformDataVO.setNoticesList(new ArrayList<>());
+ pcWorkPlatformDataVO.setNoticesNum(0);
+// queryWrapper.eq("1", "2");
} else {
+ MPJLambdaWrapper<Notices> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(Notices.class);
queryWrapper.eq(Notices::getStatus, Constants.ZERO);
queryWrapper.eq(Notices::getSendacopy, Constants.ZERO);
queryWrapper.eq(Notices::getParam2, Constants.ZERO);
queryWrapper.eq(Notices::getUserId, loginUserInfo.getMemberId());
- }
- queryWrapper.orderByDesc(Notices::getCreateDate);
- List<Notices> noticesList = noticesJoinMapper.selectList(queryWrapper);
- pcWorkPlatformDataVO.setNoticesList(noticesList);
- pcWorkPlatformDataVO.setNoticesNum(noticesList.size());
- if(noticesList.size() > 5 ){
- pcWorkPlatformDataVO.setNoticesList(noticesList.subList(0,5));
- }else{
+ queryWrapper.orderByDesc(Notices::getCreateDate);
+ List<Notices> noticesList = noticesJoinMapper.selectList(queryWrapper);
pcWorkPlatformDataVO.setNoticesList(noticesList);
+ pcWorkPlatformDataVO.setNoticesNum(noticesList.size());
+ if(noticesList.size() > 5 ){
+ pcWorkPlatformDataVO.setNoticesList(noticesList.subList(0,5));
+ }else{
+ pcWorkPlatformDataVO.setNoticesList(noticesList);
+ }
}
+
}else{
String code= systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.TIMEOUT_WARNING).getCode();
MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Visits.class);
queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName);
queryWrapper.select("TIMESTAMPDIFF( MINUTE, NOW(), t.OUT_DATE) AS timeOut");
- queryWrapper.selectAs(Member::getType,Visits::getMemberType);
queryWrapper.selectAs(Company::getName,Visits::getReceptMemberDepartment);
queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
@@ -1678,13 +1822,66 @@
}else{
pcWorkPlatformDataVO.setTimeOutVisitList(result);
}
+ }
+ return pcWorkPlatformDataVO;
+ }
+ @Override
+ public void syncTimeOutData(){
+ String times = systemDictDataBiz.queryByCode(Constants.VISIT_CONFIG,Constants.TIME_OUT_CONFIG).getCode();
+ List<Visits> visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda()
+ .eq(Visits::getStatus,Constants.VisitStatus.signin)
+ .eq(Visits::getSendTimeOutNotice,Constants.ZERO)
+ .apply(" now() >= DATE_ADD(ENDTIME,INTERVAL -"+times+" MINUTE) ")
+ );
+ Integer visitTimeCount = 0;
+ Integer visitReportTimeCount = 0;
+ for (Visits visits:visitsList) {
+ if(Constants.equalsInteger(visits.getType(),Constants.TWO)){
+ SmsEmailServiceImpl.sendVisitReportSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,visitsMapper,visits.getId(),
+ SmsConstants.visitReportingContent.visitReportingTimeOutSignOut,
+ null,Arrays.asList(visits.getPhone().split(","))
+ );
+ visitReportTimeCount = visitReportTimeCount + 1;
+ }else{
+ SmsEmailServiceImpl.sendVisitSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,visitsMapper,visits.getId(),
+ SmsConstants.visitContent.visitTimeOutSignOut,
+ null,Arrays.asList(visits.getPhone().split(","))
+ );
+ visitTimeCount = visitTimeCount + 1 ;
+ }
+ visits.setSendTimeOutNotice(Constants.ONE);
+ visitsMapper.updateById(visits);
+ }
+
+ if(visitTimeCount > 0 ){
+ String mobile = systemDictDataBiz.queryByCode(Constants.VISIT_CONFIG,Constants.VISIT_TIME_OUT_MOBILE).getCode();
+ if(StringUtils.isNotBlank(mobile)){
+ SmsEmailServiceImpl.sendVisitTimeOutSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,
+ SmsConstants.visitContent.visitTimeOutSignOutNum,
+ visitTimeCount.toString(),Arrays.asList(mobile.split(","))
+ );
+ }
+ }
+
+ if(visitReportTimeCount > 0 ){
+ String mobile = systemDictDataBiz.queryByCode(Constants.VISIT_CONFIG,Constants.VISIT_REPORT_TIME_OUT_MOBILE).getCode();
+ if(StringUtils.isNotBlank(mobile)){
+ SmsEmailServiceImpl.sendVisitReportTimeOutSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,
+ SmsConstants.visitReportingContent.visitReportingTimeOutSignOutNum,
+ visitReportTimeCount.toString(),Arrays.asList(mobile.split(","))
+ );
+ }
}
-
- return pcWorkPlatformDataVO;
}
+
+
}
--
Gitblit v1.9.3