From e80a6ad31c1e92899345eee9ab20b8f91693cd9b Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 11 十二月 2024 18:28:40 +0800
Subject: [PATCH] 代码初始化
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 23 +++++++----
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 44 ++++++++++++++--------
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java | 39 +++++++++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java | 2
4 files changed, 81 insertions(+), 27 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
index ea320cd..16e2bcb 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -452,11 +452,13 @@
bookings.setEditDate(new Date());
bookings.setEditor(user.getId());
bookingsMapper.updateById(bookings);
+ SystemUser systemUser = systemUserMapper.selectById(bookings.getCreator());
+
+ bookings.setManagerInfo(systemUser.getRealname());
//鍙栨秷浼氳 鍙戦�佸彇娑堥�氱煡
if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
this.sendNotice(bookings, 3);
}
- SystemUser systemUser = systemUserMapper.selectById(bookings.getUserId());
this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ONE);
}
@@ -1053,12 +1055,12 @@
}
bookingsMapper.updateById(bookings);
//鍙栨秷浼氳 鍙戦�佸彇娑堥�氱煡
- if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
- this.sendNotice(bookings, 3);
- }
- SystemUser systemUser = systemUserMapper.selectById(bookings.getUserId());
+// if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
+// this.sendNotice(bookings, 3);
+// }
+ SystemUser systemUser = systemUserMapper.selectById(bookings.getCreator());
+ bookings.setManagerInfo(systemUser.getRealname());
this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ONE);
-
}
@@ -1338,6 +1340,10 @@
Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.MEETING_START;
if (sendType.equals(MeetConstants.THREE)){
noticeObjectType = Constants.NoticeObjectType.MEETING_CACEL;
+ smsConfig = smsConfigMapper.selectOne(new QueryWrapper<SmsConfig>().lambda().eq(SmsConfig::getCode,
+ SmsConstants.meetingContent.meetingBookCancel)
+ .eq(SmsConfig::getIsdeleted,Constants.ZERO)
+ .last(" limit 1 "));
}else if (sendType.equals(MeetConstants.TWO)){
noticeObjectType = Constants.NoticeObjectType.MEETING_BOOK_SUCCESS;
smsConfig = smsConfigMapper.selectOne(new QueryWrapper<SmsConfig>().lambda().eq(SmsConfig::getCode,
@@ -1406,11 +1412,10 @@
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(openIds)){
WxPlatNotice wxPlatNotice = new WxPlatNotice();
if(Constants.equalsInteger(sendType,Constants.ZERO)){
- wxPlatNotice.sendMeetingBookTemplateNotice(bookings,"CuoDoxOl6SFwi4NhNgOQgKSJVjDD4VCIaPYlnbv_zdY",
+ wxPlatNotice.sendMeetingBookTemplateNotice(systemDictDataBiz,bookings,"CuoDoxOl6SFwi4NhNgOQgKSJVjDD4VCIaPYlnbv_zdY",
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),openIds);
}else{
-
- wxPlatNotice.sendMeetingBookCancelTemplateNotice(bookings,"CiB6vCT2InovAoQfudY-lvzLSV0-3lfz3a5GsSFCzd8",
+ wxPlatNotice.sendMeetingBookCancelTemplateNotice(systemDictDataBiz,bookings,"CiB6vCT2InovAoQfudY-lvzLSV0-3lfz3a5GsSFCzd8",
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),openIds);
}
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
index 22227be..cee28e5 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
@@ -7,6 +7,11 @@
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
+import com.doumee.core.haikang.model.HKConstants;
+import com.doumee.core.haikang.model.param.BaseResponse;
+import com.doumee.core.haikang.model.param.request.FacePictureCheckRequest;
+import com.doumee.core.haikang.model.param.respose.FacePictureCheckResponse;
+import com.doumee.core.haikang.service.HKService;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.FtpUtil;
@@ -149,7 +154,7 @@
@ApiOperation(value = "涓婁紶鏂囦欢鍒癋TP")
@RequestMapping(method= RequestMethod.POST,value="/upload")
@ResponseBody
- public void upload(HttpServletRequest request, HttpServletResponse response, String folder) throws Exception {
+ public void upload(HttpServletRequest request, HttpServletResponse response, String folder,Integer isFace) throws Exception {
// folder = systemDictDataBiz.queryByCode(Constants.FTP,folder).getCode();
Date d1 = new Date();
log.error("鎬诲緱涓婁紶鏂囦欢鎴愬姛=============寮�濮�========="+DateUtil.getPlusTime2(d1));
@@ -186,6 +191,38 @@
String fileName = folder+"/"+fName;
boolean r = ftp.uploadInputstream(is,fileName);
if(r){
+ if(Constants.equalsInteger(isFace,Constants.ZERO)){
+ //楠岃瘉浜鸿劯璇勫垎
+ //浜鸿劯璇勫垎
+ FacePictureCheckRequest param = new FacePictureCheckRequest();
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode();
+ param.setFacePicUrl(prefixUrl + fileName);
+ BaseResponse<FacePictureCheckResponse> responseBaseResponse = HKService.facePictureCheck(param);
+ if(responseBaseResponse == null || !StringUtils.equals(responseBaseResponse.getCode(), HKConstants.RESPONSE_SUCCEE)){
+ context.put("code", 0);
+ context.put("message", "瀵逛笉璧凤紝浜鸿劯璇勫垎鑾峰彇鏁版嵁澶辫触~");
+ context.put("errno",0);
+ writerJson(response, context);
+ return;
+ }
+ FacePictureCheckResponse facePictureCheckResponse = responseBaseResponse.getData();
+ if(Objects.isNull(facePictureCheckResponse) || Objects.isNull(facePictureCheckResponse.getCheckResult())){
+ context.put("code", 0);
+ context.put("message", "瀵逛笉璧凤紝浜鸿劯璇勫垎鑾峰彇鏁版嵁澶辫触~");
+ context.put("errno",0);
+ writerJson(response, context);
+ return;
+ }
+ if(!facePictureCheckResponse.getCheckResult()){
+ context.put("code", 0);
+ context.put("message", facePictureCheckResponse.getStatusMessage());
+ context.put("errno",0);
+ writerJson(response, context);
+ return;
+ }
+
+ }
+
context.put("success", true);
context.put("code", 200);
context.put("errno",0);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
index a72c6c9..ddccf93 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
@@ -411,7 +411,7 @@
}else if(Constants.equalsInteger(platformBooks.getStatus(),Constants.TWO)){
const9.put("value","鐢宠宸插鏍搁�氳繃");
}else{
- const9.put("value","鐢宠宸茶椹冲洖");
+ const9.put("value","鐢宠鏈�氳繃");
}
}
//杞︾墝鍙�
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index 3bf827a..642c52d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -592,13 +592,13 @@
null,Arrays.asList(member.getPhone().split(","))
);
//鍏紬鍙烽�氱煡
- if(StringUtils.isNotBlank(member.getOpenid())){
- wxPlatNotice.sendPlatformBookTemplateNotice(
+ if(StringUtils.isNotBlank(member.getSystemOpenid())){
+ wxPlatNotice.sendPlatformBookTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,
platformBooksMapper.selectById(businessId),
WxPlatConstants.platformBookContent.platformBookWaitAudit,
token,
- Arrays.asList(member.getOpenid().split(",")),
+ Arrays.asList(member.getSystemOpenid().split(",")),
Constants.ONE);
}
}else if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.visit)){
@@ -611,7 +611,7 @@
);
//鍏紬鍙烽�氱煡
if(StringUtils.isNotBlank(member.getSystemOpenid())){
- wxPlatNotice.sendVisitTemplateNotice(
+ wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,visitsMapper.selectById(businessId), WxPlatConstants.visitContent.visitWaitAudit,
token,
Arrays.asList(member.getSystemOpenid().split(","))
@@ -626,7 +626,7 @@
);
//鍏紬鍙烽�氱煡
if(StringUtils.isNotBlank(member.getSystemOpenid())){
- wxPlatNotice.sendVisitTemplateNotice(
+ wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,visitsMapper.selectById(businessId), WxPlatConstants.visitReportContent.visitReportWaitAudit,
token,
Arrays.asList(member.getSystemOpenid().split(","))
@@ -646,7 +646,7 @@
SystemUser systemUser = systemUserMapper.selectById(carUseBook.getCreator());
if(Objects.nonNull(systemUser)){
carUseBook.setMemberName(systemUser.getRealname());
- wxPlatNotice.sendCarUseBookTemplateNotice(
+ wxPlatNotice.sendCarUseBookTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,
carUseBookMapper.selectById(businessId),
WxPlatConstants.carUseBookContent.carUseBookWaitAudit,
@@ -1434,8 +1434,16 @@
SmsConstants.platformBookContent.platformBookWaitAudit,
approveDTO.getCheckInfo(),memberPhone
);
- //TODO 鍙戦�佷笅绾х殑寰呭鎵圭殑閫氱煡
-
+ //鍏紬鍙烽�氱煡
+ if(CollectionUtils.isNotEmpty(openIdList)){
+ wxPlatNotice.sendPlatformBookTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,
+ platformBooksMapper.selectById(approveDTO.getObjId()),
+ WxPlatConstants.platformBookContent.platformBookWaitAudit,
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+ openIdList,
+ Constants.ONE);
+ }
} else if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)
|| approveDTO.getObjType().equals(Constants.approveObjectType.unCityUseCar)){
@@ -1454,7 +1462,7 @@
if(Objects.nonNull(systemUser)){
carUseBook.setMemberName(systemUser.getRealname());
//鍙戦�佸井淇″叕浼楀彿閫氱煡
- wxPlatNotice.sendCarUseBookTemplateNotice(
+ wxPlatNotice.sendCarUseBookTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,carUseBook,
WxPlatConstants.carUseBookContent.carUseBookWaitAudit,
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
@@ -1480,7 +1488,7 @@
);
//鍏紬鍙烽�氱煡
if(CollectionUtils.isNotEmpty(openIdList)){
- wxPlatNotice.sendVisitTemplateNotice(
+ wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,visitsMapper.selectById(approveDTO.getObjId()),
approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)?WxPlatConstants.visitReportContent.visitReportWaitAudit:WxPlatConstants.visitContent.visitWaitAudit,
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
@@ -1731,7 +1739,7 @@
//鍙戦�佸井淇″叕浼楀彿
if(StringUtils.isNotBlank(objCode)){
if(Objects.nonNull(visits) && StringUtils.isNotBlank(visits.getOpenid())){
- wxPlatNotice.sendVisitTemplateNotice(
+ wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,visits, objCode,
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
Arrays.asList(visits.getOpenid().split(","))
@@ -1757,7 +1765,7 @@
if(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getOpenid())){
carUseBook.setMemberName(systemUser.getRealname());
//鍙戦�佸井淇″叕浼楀彿閫氱煡
- wxPlatNotice.sendCarUseBookTemplateNotice(
+ wxPlatNotice.sendCarUseBookTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,carUseBook,
Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?WxPlatConstants.carUseBookContent.carUseBookAuditSuccess: WxPlatConstants.carUseBookContent.carUseBookAuditFail,
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
@@ -1821,14 +1829,18 @@
);
//鍙戦�佸井淇″叕浼楀彿娑堟伅
- Member member = memberMapper.selectById(platformBooks.getDriverId() );
- if(Objects.nonNull(member) && StringUtils.isNotBlank(member.getOpenid())){
+ SystemUser driver = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted, Constants.ZERO)
+ .eq(SystemUser::getType, Constants.ZERO)
+ .eq(SystemUser::getMobile,platformBooks.getDriverPhone())
+ .last(" limit 1 "));
+ if(Objects.nonNull(driver) && StringUtils.isNotBlank(driver.getOpenid())){
//鍙戦�佸井淇″叕浼楀彿閫氱煡
- wxPlatNotice.sendPlatformBookTemplateNotice(
+ wxPlatNotice.sendPlatformBookTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,platformBooks,
Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?WxPlatConstants.platformBookContent.platformBookAuditSuccess: WxPlatConstants.platformBookContent.platformBookAuditFail,
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
- Arrays.asList(member.getOpenid().split(",")),0);
+ Arrays.asList(driver.getOpenid().split(",")),0);
}
}else{
--
Gitblit v1.9.3