From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 106 ++++++++++++++++-------------------------------------
1 files changed, 32 insertions(+), 74 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
index 4203b81..322e44a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -29,6 +29,7 @@
import com.doumee.dao.openapi.request.*;
import com.doumee.dao.openapi.response.*;
+import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.web.reqeust.*;
import com.doumee.dao.web.response.DriverHomeVO;
@@ -129,6 +130,8 @@
private MemberMapper memberMapper;
@Autowired
private WxNoticeConfigMapper wxNoticeConfigMapper;
+ @Autowired
+ private SystemUserMapper systemUserMapper;
@Override
public Integer create(PlatformJob platformJob) {
@@ -874,19 +877,26 @@
//鍏紬鍙锋ā鏉挎秷鎭�
if(Objects.nonNull(platformJob.getDriverId())) {
- Member member = memberMapper.selectById(platformJob.getDriverId());
- if (Objects.nonNull(member) && StringUtils.isNotBlank(member.getOpenid())) {
- WxPlatNotice wxPlatNotice = new WxPlatNotice();
- wxPlatNotice.sendPlatformJobTemplateNotice(
- wxNoticeConfigMapper, platformJob,
- WxPlatConstants.platformJobContent.platformJobCallIn,
- systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
- Arrays.asList(member.getOpenid().split(","))
- );
- }
+ this.sendWxNotice(WxPlatConstants.platformJobContent.platformJobCallIn,platformJob);
}
-
return platformJob;
+ }
+
+ public void sendWxNotice(String objCode,PlatformJob platformJob){
+ SystemUser driver = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted, Constants.ZERO)
+ .eq(SystemUser::getType, Constants.ZERO)
+ .eq(SystemUser::getMobile,platformJob.getDrivierPhone())
+ .last(" limit 1 "));
+ if (Objects.nonNull(driver) && StringUtils.isNotBlank(driver.getOpenid())) {
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.sendPlatformJobTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper, platformJob,
+ objCode,
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+ Arrays.asList(driver.getOpenid().split(","))
+ );
+ }
}
private Logger logger = LoggerFactory.getLogger(PlatformJobServiceImpl.class);
@@ -1084,17 +1094,8 @@
);
//鍏紬鍙锋ā鏉挎秷鎭�
- if(Objects.nonNull(platformJob.getDriverId())){
- Member member = memberMapper.selectById(platformJob.getDriverId());
- if(Objects.nonNull(member) && StringUtils.isNotBlank(member.getOpenid())){
- WxPlatNotice wxPlatNotice = new WxPlatNotice();
- wxPlatNotice.sendPlatformJobTemplateNotice(
- wxNoticeConfigMapper,platformJob,
- WxPlatConstants.platformJobContent.platformJobSingIn,
- systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
- Arrays.asList(member.getOpenid().split(","))
- );
- }
+ if(Objects.nonNull(platformJob.getDriverId())){
+ this.sendWxNotice(WxPlatConstants.platformJobContent.platformJobSingIn,platformJob);
}
@@ -1229,17 +1230,8 @@
);
//鍏紬鍙锋ā鏉挎秷鎭�
- if(Objects.nonNull(platformJob.getDriverId())) {
- Member member = memberMapper.selectById(platformJob.getDriverId());
- if (Objects.nonNull(member) && StringUtils.isNotBlank(member.getOpenid())) {
- WxPlatNotice wxPlatNotice = new WxPlatNotice();
- wxPlatNotice.sendPlatformJobTemplateNotice(
- wxNoticeConfigMapper, platformJob,
- WxPlatConstants.platformJobContent.platformJobMove,
- systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
- Arrays.asList(member.getOpenid().split(","))
- );
- }
+ if(Objects.nonNull(platformJob.getDriverId())) {
+ this.sendWxNotice(WxPlatConstants.platformJobContent.platformJobMove,platformJob);
}
platformJob.setPlatformName(oldPlatform.getName());
@@ -1292,16 +1284,7 @@
//鍏紬鍙锋ā鏉挎秷鎭�
if(Objects.nonNull(platformJob.getDriverId())){
- Member member = memberMapper.selectById(platformJob.getDriverId());
- if(Objects.nonNull(member) && StringUtils.isNotBlank(member.getOpenid())){
- WxPlatNotice wxPlatNotice = new WxPlatNotice();
- wxPlatNotice.sendPlatformJobTemplateNotice(
- wxNoticeConfigMapper,platformJob,
- WxPlatConstants.platformJobContent.platformJobOverNum,
- systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
- Arrays.asList(member.getOpenid().split(","))
- );
- }
+ this.sendWxNotice(WxPlatConstants.platformJobContent.platformJobOverNum,platformJob);
}
platformJob.setPlatformName(platform.getName());
@@ -1353,16 +1336,7 @@
//鍏紬鍙锋ā鏉挎秷鎭�
if(Objects.nonNull(platformJob.getDriverId())) {
- Member member = memberMapper.selectById(platformJob.getDriverId());
- if (Objects.nonNull(member) && StringUtils.isNotBlank(member.getOpenid())) {
- WxPlatNotice wxPlatNotice = new WxPlatNotice();
- wxPlatNotice.sendPlatformJobTemplateNotice(
- wxNoticeConfigMapper, platformJob,
- WxPlatConstants.platformJobContent.platformJobError,
- systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
- Arrays.asList(member.getOpenid().split(","))
- );
- }
+ this.sendWxNotice(WxPlatConstants.platformJobContent.platformJobError,platformJob);
}
platformJob.setPlatformName(platform.getName());
@@ -1416,16 +1390,7 @@
);
//鍏紬鍙锋ā鏉挎秷鎭�
if(Objects.nonNull(platformJob.getDriverId())) {
- Member member = memberMapper.selectById(platformJob.getDriverId());
- if (Objects.nonNull(member) && StringUtils.isNotBlank(member.getOpenid())) {
- WxPlatNotice wxPlatNotice = new WxPlatNotice();
- wxPlatNotice.sendPlatformJobTemplateNotice(
- wxNoticeConfigMapper, platformJob,
- WxPlatConstants.platformJobContent.platformJobWorking,
- systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
- Arrays.asList(member.getOpenid().split(","))
- );
- }
+ this.sendWxNotice(WxPlatConstants.platformJobContent.platformJobWorking,platformJob);
}
//骞挎挱 led閫氱煡
platformJob.setPlatformName(platform.getName());
@@ -1435,7 +1400,8 @@
return platformJob;
}
-
+
+ @Override
public PlatformJob getLastWaitJob(String uuid, LoginUserInfo loginUser){
String u = (String) redisTemplate.opsForValue().get(Constants.RedisKeys.BIGSCREEN_UUID);
if(!StringUtils.equals(u,uuid)){
@@ -1449,6 +1415,7 @@
.last(" limit 1 ") );
return platformJob;
}
+
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
public PlatformJob finishWork(JobOperateDTO jobOperateDTO){
@@ -1523,16 +1490,7 @@
//鍏紬鍙锋ā鏉挎秷鎭�
if(Objects.nonNull(platformJob.getDriverId())) {
- Member member = memberMapper.selectById(platformJob.getDriverId());
- if (Objects.nonNull(member) && StringUtils.isNotBlank(member.getOpenid())) {
- WxPlatNotice wxPlatNotice = new WxPlatNotice();
- wxPlatNotice.sendPlatformJobTemplateNotice(
- wxNoticeConfigMapper, platformJob,
- WxPlatConstants.platformJobContent.platformJobFinish,
- systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
- Arrays.asList(member.getOpenid().split(","))
- );
- }
+ this.sendWxNotice(WxPlatConstants.platformJobContent.platformJobFinish,platformJob);
}
//骞挎挱 led閫氱煡
--
Gitblit v1.9.3