From cc75dc22053806bff7aa0f4432823b43cea43132 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 09 十二月 2024 17:23:25 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 107 insertions(+), 2 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 6c229ad..f8d9293 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 @@ -17,6 +17,8 @@ import com.doumee.core.tms.model.response.TmsBaseResponse; import com.doumee.core.tms.model.response.TmsLockStatusQueryResponse; import com.doumee.core.utils.*; +import com.doumee.core.wx.wxPlat.WxPlatConstants; +import com.doumee.core.wx.wxPlat.WxPlatNotice; import com.doumee.dao.business.*; import com.doumee.dao.business.dao.SmsConfigMapper; import com.doumee.dao.business.dao.SmsEmailMapper; @@ -118,6 +120,10 @@ private PlatformBroadcastLogMapper platformBroadcastLogMapper; @Autowired private PlatformWarnEventServiceImpl platformWarnEventService; + @Autowired + private MemberMapper memberMapper; + @Autowired + private WxNoticeConfigMapper wxNoticeConfigMapper; @Override public Integer create(PlatformJob platformJob) { @@ -860,6 +866,20 @@ emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(), SmsConstants.platformJobContent.platformJobCallIn,null,null ); + + //鍏紬鍙锋ā鏉挎秷鎭� + 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(",")) + ); + } + } return platformJob; } @@ -1058,6 +1078,21 @@ SmsConstants.platformJobContent.platformJobSingIn,platform.getName(),null ); + //鍏紬鍙锋ā鏉挎秷鎭� + 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(",")) + ); + } + } + + //骞挎挱 led閫氱煡 platformJob.setPlatformName(platform.getName()); this.broadcastAndLEed(platformJob,Constants.PlatformLedContent.CALLING.getInfo(), @@ -1188,6 +1223,20 @@ SmsConstants.platformJobContent.platformJobMove,oldPlatform.getName(),platform.getName() ); + //鍏紬鍙锋ā鏉挎秷鎭� + 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(",")) + ); + } + } + platformJob.setPlatformName(oldPlatform.getName()); platformJob.setPlatformId(oldPlatform.getId()); this.broadcastAndLEed(platformJob, StringUtils.isBlank(oldPlatform.getLedContent())?Constants.PlatformLedContent.IDEL_CONTNET.getName():oldPlatform.getLedContent(), @@ -1216,7 +1265,7 @@ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�"); } - Platform platform = platformJoinMapper.selectById(jobOperateDTO.getPlatformId()); + Platform platform = platformJoinMapper.selectById(platformJob.getPlatformId()); if(Objects.isNull(platform)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鏈堝彴淇℃伅"); } @@ -1235,6 +1284,21 @@ emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(), SmsConstants.platformJobContent.platformJobOverNum,null,null ); + + //鍏紬鍙锋ā鏉挎秷鎭� + 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(",")) + ); + } + } + platformJob.setPlatformName(platform.getName()); this.broadcastAndLEed(platformJob, StringUtils.isBlank(platform.getLedContent())?Constants.PlatformLedContent.IDEL_CONTNET.getName():platform.getLedContent(), null @@ -1281,6 +1345,20 @@ emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(), SmsConstants.platformJobContent.platformJobError,platform.getName(),null ); + + //鍏紬鍙锋ā鏉挎秷鎭� + 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(",")) + ); + } + } platformJob.setPlatformName(platform.getName()); this.broadcastAndLEed(platformJob, StringUtils.isBlank(platform.getLedContent())?Constants.PlatformLedContent.IDEL_CONTNET.getName():platform.getLedContent(), @@ -1331,7 +1409,19 @@ emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(), SmsConstants.platformJobContent.platformJobWorking,platform.getName(),null ); - + //鍏紬鍙锋ā鏉挎秷鎭� + 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(",")) + ); + } + } //骞挎挱 led閫氱煡 platformJob.setPlatformName(platform.getName()); this.broadcastAndLEed(platformJob,Constants.PlatformLedContent.WORKING.getInfo(), @@ -1416,6 +1506,21 @@ emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(), SmsConstants.platformJobContent.platformJobFinish,platform.getName(),null ); + + //鍏紬鍙锋ā鏉挎秷鎭� + 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(",")) + ); + } + } + //骞挎挱 led閫氱煡 platformJob.setPlatformName(platform.getName()); this.broadcastAndLEed(platformJob,Constants.PlatformLedContent.DONE.getInfo(), -- Gitblit v1.9.3