yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
fanzongzhe 2 years ago
parent
2571a50fdc a5ff2972c9
commit
5fc1e2104a
2 changed files with 72 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 67
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  2. 29
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java

67
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
View File

@ -860,7 +860,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
});
//推送合格证管理员站内信提醒有待移交的合格证，同时自动更改出库车辆的合格证移交状态为“待移交”。
//ToDo:合格证管理员、随车资料管理员、发票管理员创建并查询该角色的用户推送消息有待移交的资料等等。
/* Future future6 = pool.submit(() -> {
Future future6 = pool.submit(() -> {
//合格证管理员
List<String> recipientSidList = new ArrayList<>();
UserQuery userQuery = new UserQuery();
@ -869,14 +869,69 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
recipientSidList = sysUserFeign.getUserSidByRole(userQuery).getData();
PushMessageQuery pushMessageQuery = new PushMessageQuery();
pushMessageQuery.setReceivedSids(recipientSidList);
pushMessageQuery.setMsgTitle("业务");
pushMessageQuery.setMsgContent("有待移交的合格证，请查看");
pushMessageQuery.setModuleName("业务");
pushMessageQuery.setMsgContent("您有待移交的合格证，请前往合格证移交查看");
pushMessageQuery.setApp_type("2");
pushMessageQuery.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
pushMessageQuery.setMsgTitle("合格证待移交提醒");
pushMessageQuery.setBusinessSid(busDeliveredApply.getSid());
// 消息推送
messageFeign.pushNoUriMessage(pushMessageQuery);
});
Future future7 = pool.submit(() -> {
//随车资料管理员
List<String> recipientSidList = new ArrayList<>();
UserQuery userQuery = new UserQuery();
userQuery.setRoleSid("55b41998-d246-4169-b666-fe53a27a6b8d");
userQuery.setOrgSidPath(bv.getOrgSidPath());
recipientSidList = sysUserFeign.getUserSidByRole(userQuery).getData();
PushMessageQuery pushMessageQuery = new PushMessageQuery();
pushMessageQuery.setReceivedSids(recipientSidList);
pushMessageQuery.setModuleName("业务");
pushMessageQuery.setMsgContent("您有待移交的随车资料，请前往随车资料管理查看");
pushMessageQuery.setApp_type("2");
pushMessageQuery.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
pushMessageQuery.setMsgTitle("随车资料待移交提醒");
pushMessageQuery.setBusinessSid(busDeliveredApply.getSid());
// 消息推送
messageFeign.pushNoUriMessage(pushMessageQuery);
});
Future future8 = pool.submit(() -> {
//发票管理员
List<String> recipientSidList = new ArrayList<>();
UserQuery userQuery = new UserQuery();
userQuery.setRoleSid("32e24879-2785-4900-874e-1da6b706484b");
userQuery.setOrgSidPath(bv.getOrgSidPath());
recipientSidList = sysUserFeign.getUserSidByRole(userQuery).getData();
PushMessageQuery pushMessageQuery = new PushMessageQuery();
pushMessageQuery.setReceivedSids(recipientSidList);
pushMessageQuery.setModuleName("业务");
pushMessageQuery.setMsgContent("您有待移交的发票，请前往开票管理查看");
pushMessageQuery.setApp_type("2");
pushMessageQuery.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
pushMessageQuery.setMsgTitle("发票待移交提醒");
pushMessageQuery.setBusinessSid(busDeliveredApply.getSid());
// 消息推送
messageFeign.pushNoUriMessage(pushMessageQuery);
});
Future future9 = pool.submit(() -> {
//优惠包管理员
List<String> recipientSidList = new ArrayList<>();
UserQuery userQuery = new UserQuery();
userQuery.setRoleSid("2def57cf-2423-49b3-9af4-7f74e9fd27a6");
userQuery.setOrgSidPath(bv.getOrgSidPath());
recipientSidList = sysUserFeign.getUserSidByRole(userQuery).getData();
PushMessageQuery pushMessageQuery = new PushMessageQuery();
pushMessageQuery.setReceivedSids(recipientSidList);
pushMessageQuery.setModuleName("业务");
pushMessageQuery.setMsgContent("您有待移交的优惠包，请前往优惠包交接查看");
pushMessageQuery.setApp_type("2");
pushMessageQuery.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
pushMessageQuery.setMsgTitle("优惠包待移交提醒");
pushMessageQuery.setBusinessSid(busDeliveredApply.getSid());
// 消息推送
messageFeign.pushNoUriMessage(pushMessageQuery);
});
*/
} catch (Exception e) {
e.printStackTrace();
log.error("推送数据失败=========================" + e.getMessage());
@ -922,10 +977,6 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
} catch (Exception e) {
e.printStackTrace();
}
/*for (int i = 0; i < stringList.size(); i++) {
String vinNo = stringList.get(i);
busDeliveredService.updateState(vinNo, 0);
}*/
//更改申请的状态为待审核2
baseMapper.updateStateBySid(2, bv.getBusinessSid());
} else {

29
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java
View File

@ -18,6 +18,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUser;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
import com.yxt.anrui.portal.api.sysuser.UserQuery;
import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeign;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
@ -26,10 +27,7 @@ import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.messagecenter.api.message.AppScmMessageFlowableQuery;
import com.yxt.messagecenter.api.message.MessageFeign;
import com.yxt.messagecenter.api.message.MessageFlowVo;
import com.yxt.messagecenter.api.message.MessageFlowableQuery;
import com.yxt.messagecenter.api.message.*;
import org.apache.tomcat.util.threads.ThreadPoolExecutor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -287,23 +285,22 @@ public class BusTransferRecordsService extends MybatisBaseService<BusTransferRec
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
ExecutorService pool = new ThreadPoolExecutor(1, 10,
1000, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
Future future1 = pool.submit(() -> {
//消息推送
AppScmMessageFlowableQuery messageFlowableQuery = new AppScmMessageFlowableQuery();
List<String> recipientSidList = new ArrayList<>();
recipientSidList.add(busTransferRecordss.getReceiveSid());
messageFlowableQuery.setRecipientSidList(recipientSidList);
messageFlowableQuery.setMsgTitle("业务");
messageFlowableQuery.setMsgContent(busTransferRecords.getReceiveName() + "的发票交接已准备好，请前往交车准备进行确认");
messageFlowableQuery.setMsgSource("业务");
messageFlowableQuery.setApp_type("2");
messageFlowableQuery.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
messageFlowableQuery.setName("业务");
PushMessageQuery pushMessageQuery = new PushMessageQuery();
pushMessageQuery.setReceivedSids(recipientSidList);
pushMessageQuery.setModuleName("业务");
pushMessageQuery.setMsgContent(busTransferRecords.getReceiveName() + "的发票交接已准备好，请前往交车准备进行确认");
pushMessageQuery.setApp_type("2");
pushMessageQuery.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
pushMessageQuery.setMsgTitle("发票交接确认提醒");
pushMessageQuery.setBusinessSid(busTransferRecords.getSid());
// 消息推送
messageFeign.sendAutoserviceMessage(messageFlowableQuery);
messageFeign.pushNoUriMessage(pushMessageQuery);
});

Write Preview
Loading…
Cancel
Save