Skip to content

C
clx-performance
提交 15c09488 authored 作者: 马路路's avatar 马路路
浏览文件
操作

Merge branch 'v29.3_carrier_messsage_20241016' into 33.6_app_carrier_messsage_20241106

上级 a0aa23f7 8127cea9
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 180 行增加 和 18 行删除
clx-performance-web/src/main/java/com/clx/performance/controller/temp/TempInternalMessageController.java 0 → 100644
浏览文件 @ 15c09488
package com.clx.performance.controller.temp;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.clx.open.sdk.callback.message.OrderChildSyncMessage;
import com.clx.performance.dto.OrderChildExpectDTO;
import com.clx.performance.enums.InternalMessageTemplateEnum;
import com.clx.performance.extranal.transport.TransportService;
import com.clx.performance.feign.TransportFeignService;
import com.clx.performance.listener.OrderChildDtsListener;
import com.clx.performance.service.OrderChildService;
import com.clx.performance.service.SendInternalMessageService;
import com.clx.performance.service.TempService;
import com.clx.performance.service.child.FeignOrderChildService;
import com.msl.common.result.Result;
import com.msl.common.utils.DateUtils;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* @Author: aiqingguo
* @Description: 临时接口
* @Date: 2023-8-21 12:10:16
* @Version: 1.0
*/
@Slf4j
@RestController
@AllArgsConstructor
@RequestMapping(value="/temp/internalMessage")
public class TempInternalMessageController {
private final SendInternalMessageService sendInternalMessageService;
@Operation(summary = "发送站内信", description = "<br>By:刘海泉")
@RequestMapping(value = "/send", method = RequestMethod.GET)
public Result<Object> send(@RequestParam("businessType") @NotBlank(message = "站内信大类业务不能为空") String businessType,
@RequestParam("typeCode") @NotNull(message = "业务code不能为空") Integer typeCode,
@RequestParam("listJson") @NotBlank(message = "参数字符串") String listJson
) {
sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
businessType, typeCode, JSON.parseObject(listJson, new TypeReference<>() {
}),null,null);
return Result.ok();
}
}
clx-performance-web/src/main/java/com/clx/performance/service/SendInternalMessageService.java
浏览文件 @ 15c09488
......@@ -7,7 +7,7 @@ import java.util.List;
public interface SendInternalMessageService {
//发送站内信的业务Code
void sendInternalMessageMq(String productCode,String businessType, Integer typeCode, List<String> variableList, Long userNo);
void sendInternalMessageMq(String productCode,String businessType, Integer typeCode, List<String> variableList, List<String> jumpUrlVariableList, Long userNo);
//发送承运站内信
void sendCarrierInternalMessage(InternalMessageParam internalMessageDTO);
......
clx-performance-web/src/main/java/com/clx/performance/service/customer/impl/CustomerComplaintDetailServiceImpl.java
浏览文件 @ 15c09488
......@@ -4,9 +4,14 @@ import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.dao.customer.CustomerComplaintDetailDao;
import com.clx.performance.dao.customer.CustomerComplaintTypeDao;
import com.clx.performance.enums.InternalMessageTemplateEnum;
import com.clx.performance.enums.ResultEnum;
import com.clx.performance.model.customer.CustomerComplaintDetail;
import com.clx.performance.model.customer.CustomerComplaintType;
import com.clx.performance.param.pc.customer.PageCustomerComplaintDetailParam;
import com.clx.performance.param.pc.customer.SaveCustomerComplaintDetailParam;
import com.clx.performance.service.SendInternalMessageService;
import com.clx.performance.service.customer.CustomerComplaintDetailService;
import com.clx.performance.struct.customer.CustomerComplaintDetailStruct;
import com.clx.performance.vo.pc.customer.CustomerComplaintDetailVO;
......@@ -18,6 +23,8 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
/**
* @ClassName CustomerComplaintTypeServiceImpl
......@@ -31,9 +38,13 @@ import java.util.Arrays;
@AllArgsConstructor
public class CustomerComplaintDetailServiceImpl implements CustomerComplaintDetailService {
private final CustomerComplaintDetailDao customerComplaintDetailDao;
private final CustomerComplaintDetailStruct customerComplaintDetailStruct;
private final CustomerComplaintTypeDao customerComplaintTypeDao;
private final SendInternalMessageService sendInternalMessageService;
@Override
public void saveCustomerComplaintDetail(SaveCustomerComplaintDetailParam param) {
CustomerComplaintType type = customerComplaintTypeDao.getEntityByKey(
param.getComplaintTypeId()).orElseThrow(ResultEnum.DATA_NOT_FIND, "投诉类型不存在");
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
CustomerComplaintDetail detail = new CustomerComplaintDetail();
detail.setDriverUserNo(loginUserInfo.getUserNo());
......@@ -46,6 +57,12 @@ public class CustomerComplaintDetailServiceImpl implements CustomerComplaintDeta
detail.setPicture(String.join(",",param.getPicture()));
}
customerComplaintDetailDao.saveEntity(detail);
//客户投诉 站内信
sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
InternalMessageTemplateEnum.BusinessType.COMPLAINT_NOTICE.getCode(),
InternalMessageTemplateEnum.CUSTOM_DRIVER_SUBMIT_COMPLAINT_CODE, List.of(param.getChildNo(),type.getName(),param.getContent()),null,null);
}
@Override
......
clx-performance-web/src/main/java/com/clx/performance/service/impl/SendInternalMessageServiceImpl.java
浏览文件 @ 15c09488
......@@ -59,11 +59,12 @@ public class SendInternalMessageServiceImpl implements SendInternalMessageServic
//发送站内信的业务Code
@Override
public void sendInternalMessageMq(String productCode,String businessType, Integer typeCode, List<String> variableList, Long userNo){
public void sendInternalMessageMq(String productCode,String businessType, Integer typeCode, List<String> variableList, List<String> jumpUrlVariableList,Long userNo){
InternalMessageParam param = new InternalMessageParam();
param.setBusinessType(businessType);
param.setTypeCode(typeCode);
param.setVariableList(variableList);
param.setJumpUrlVariableList(jumpUrlVariableList);
param.setUserNo(userNo);
param.setProductCode(productCode);
log.info("发送站内信消息开始,站内信业务类型{}，实际业务Code：{},消息内容:{}", businessType,typeCode,JSON.toJSONString(param));
......@@ -163,9 +164,11 @@ public class SendInternalMessageServiceImpl implements SendInternalMessageServic
}
if(StringUtils.isNotBlank(templateType.getBusinessDetailType().getParamJson())){
data.putAll(JSON.parseObject(templateType.getBusinessDetailType().getParamJson(),new TypeReference<Map<String, String>>(){}));
String jumpUrlParamJson = replaceContent(templateType.getBusinessDetailType().getParamJson(),
internalMessageDTO.getJumpUrlVariableList());
data.putAll(JSON.parseObject(jumpUrlParamJson,new TypeReference<Map<String, String>>(){}));
}
defaultMessageContent.setData(data); //放入标识，让前端根据这个标识跳转页面
defaultMessageContent.setData(data);
message.setMessageContent(defaultMessageContent);
......
clx-performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractDriverRecordServiceImpl.java
浏览文件 @ 15c09488
......@@ -37,6 +37,7 @@ import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
/**
......@@ -118,7 +119,7 @@ public class BreakContractDriverRecordServiceImpl implements BreakContractDrive
//司机违约通知 站内信
sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
InternalMessageTemplateEnum.BusinessType.WAIT_APPROVED_ITEM.getCode(),
InternalMessageTemplateEnum.CUSTOM_DRIVER_TRIGGER_BREAK_CONTRACT_CODE, Collections.singletonList(breakNo),null);
InternalMessageTemplateEnum.CUSTOM_DRIVER_TRIGGER_BREAK_CONTRACT_CODE, List.of(breakNo),null,null);
}
......@@ -185,7 +186,7 @@ public class BreakContractDriverRecordServiceImpl implements BreakContractDrive
//司机违约通知 站内信
sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
InternalMessageTemplateEnum.BusinessType.WAIT_APPROVED_ITEM.getCode(),
InternalMessageTemplateEnum.CUSTOM_DRIVER_TRIGGER_BREAK_CONTRACT_CODE, Collections.singletonList(record.getBreakNo()),null);
InternalMessageTemplateEnum.CUSTOM_DRIVER_TRIGGER_BREAK_CONTRACT_CODE, List.of(record.getBreakNo()),null,null);
}
@Override
......@@ -231,7 +232,7 @@ public class BreakContractDriverRecordServiceImpl implements BreakContractDrive
//司机违约通知 站内信
sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
InternalMessageTemplateEnum.BusinessType.WAIT_APPROVED_ITEM.getCode(),
InternalMessageTemplateEnum.CUSTOM_DRIVER_TRIGGER_BREAK_CONTRACT_CODE, Collections.singletonList(record.getBreakNo()),null);
InternalMessageTemplateEnum.CUSTOM_DRIVER_TRIGGER_BREAK_CONTRACT_CODE, List.of(record.getBreakNo()),null,null);
}
......@@ -275,7 +276,7 @@ public class BreakContractDriverRecordServiceImpl implements BreakContractDrive
//司机违约通知 站内信
sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
InternalMessageTemplateEnum.BusinessType.WAIT_APPROVED_ITEM.getCode(),
InternalMessageTemplateEnum.CUSTOM_DRIVER_TRIGGER_BREAK_CONTRACT_CODE, Collections.singletonList(record.getBreakNo()),null);
InternalMessageTemplateEnum.CUSTOM_DRIVER_TRIGGER_BREAK_CONTRACT_CODE, List.of(record.getBreakNo()),null,null);
}
@Override
......
clx-performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractOwnerRecordServiceImpl.java
浏览文件 @ 15c09488
......@@ -126,7 +126,7 @@ public class BreakContractOwnerRecordServiceImpl implements BreakContractOwnerR
//货主违约通知 站内信
sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
InternalMessageTemplateEnum.BusinessType.WAIT_APPROVED_ITEM.getCode(),
InternalMessageTemplateEnum.CUSTOM_OWNER_TRIGGER_BREAK_CONTRACT_CODE, Collections.singletonList(breakNo),null);
InternalMessageTemplateEnum.CUSTOM_OWNER_TRIGGER_BREAK_CONTRACT_CODE, List.of(breakNo),null,null);
}
......@@ -199,7 +199,7 @@ public class BreakContractOwnerRecordServiceImpl implements BreakContractOwnerR
//货主违约通知 站内信
sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
InternalMessageTemplateEnum.BusinessType.WAIT_APPROVED_ITEM.getCode(),
InternalMessageTemplateEnum.CUSTOM_OWNER_TRIGGER_BREAK_CONTRACT_CODE, Collections.singletonList(breakNo),null);
InternalMessageTemplateEnum.CUSTOM_OWNER_TRIGGER_BREAK_CONTRACT_CODE, List.of(breakNo),null,null);
}
......
clx-performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectLineReportServiceImpl.java
浏览文件 @ 15c09488
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.dao.OrderChildDao;
import com.clx.performance.dao.OrderGoodsDao;
import com.clx.performance.dao.collect.CollectLineReportDao;
import com.clx.performance.enums.InternalMessageTemplateEnum;
import com.clx.performance.enums.PerformanceResultEnum;
import com.clx.performance.enums.integral.IntegralRecordEnum;
import com.clx.performance.model.OrderChild;
......@@ -13,6 +14,7 @@ import com.clx.performance.model.collect.CollectLineReport;
import com.clx.performance.param.app.collect.*;
import com.clx.performance.param.pc.carrier.*;
import com.clx.performance.service.IntegralRecordService;
import com.clx.performance.service.SendInternalMessageService;
import com.clx.performance.service.collect.CollectLineReportService;
import com.clx.performance.service.integral.IntegralRuleService;
import com.clx.performance.struct.collect.CollectLineReportStruct;
......@@ -26,6 +28,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
@Slf4j
......@@ -45,6 +48,8 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
private IntegralRuleService integralRuleService;
@Autowired
private IntegralRecordService integralRecordService;
@Autowired
SendInternalMessageService sendInternalMessageService;
@Transactional(rollbackFor = Exception.class)
@Override
......@@ -83,12 +88,17 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
collectLineReport.setReportTime(LocalDateTime.now());
collectLineReport.setCreateTime(collectLineReport.getReportTime());
collectLineReportDao.saveEntity(collectLineReport);
//待审核：司机货源地信息上报 站内信
sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
InternalMessageTemplateEnum.BusinessType.DRIVER_REPORT.getCode(),
InternalMessageTemplateEnum.CUSTOM_DRIVER_REPORT_SEND_INFO_CODE, List.of(loginUserInfo.getUserName()),null,null);
}
@Transactional(rollbackFor = Exception.class)
@Override
public void saveAbnormalReport(CollectLineReportAbnormalSaveParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
if (Objects.equals(param.getReportType(), CollectLineReport.ReportType.UNABLE_TO_SEND_ADDRESS.getCode())){
saveSendAddressAbnormalReport(new CollectLineReportSendAddressAbnormalSaveParam(param.getChildNo(), param.getRemark()));
}
......@@ -102,6 +112,10 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
saveLoadUnloadAbnormalReport(new CollectLineReportLoadUnloadAbnormalSaveParam(param.getChildNo(), param.getRemark()));
}
//待审核：司机异常情况上报 站内信
sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
InternalMessageTemplateEnum.BusinessType.DRIVER_REPORT.getCode(),
InternalMessageTemplateEnum.CUSTOM_DRIVER_REPORT_EXCEPTION_SITUATION_CODE, List.of(loginUserInfo.getUserName()),null,null);
}
@Transactional(rollbackFor = Exception.class)
......@@ -258,6 +272,11 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
collectLineReport.setReportTime(LocalDateTime.now());
collectLineReport.setCreateTime(collectLineReport.getReportTime());
collectLineReportDao.saveEntity(collectLineReport);
//待审核：无接单上报 站内信
sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
InternalMessageTemplateEnum.BusinessType.DRIVER_REPORT.getCode(),
InternalMessageTemplateEnum.CUSTOM_DRIVER_REPORT_NO_TAKE_ORDER_CODE, List.of(loginUserInfo.getUserName()),null,null);
}
@Transactional(rollbackFor = Exception.class)
......@@ -280,6 +299,11 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
collectLineReport.setReportTime(LocalDateTime.now());
collectLineReport.setCreateTime(collectLineReport.getReportTime());
collectLineReportDao.saveEntity(collectLineReport);
//司机上报：其他 站内信
sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
InternalMessageTemplateEnum.BusinessType.DRIVER_REPORT.getCode(),
InternalMessageTemplateEnum.CUSTOM_DRIVER_REPORT_OTHER_CODE, List.of(loginUserInfo.getUserName()),null,null);
}
@Transactional(rollbackFor = Exception.class)
......@@ -312,6 +336,11 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
collectLineReport.setCreateTime(collectLineReport.getReportTime());
collectLineReportDao.saveEntity(collectLineReport);
//待审核：煤炭质量上报 站内信
sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
InternalMessageTemplateEnum.BusinessType.DRIVER_REPORT.getCode(),
InternalMessageTemplateEnum.CUSTOM_DRIVER_REPORT_COAL_QUALITY_CODE, List.of(loginUserInfo.getUserName()),null,null);
}
@Override
......
clx-performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectTrafficCongestionServiceImpl.java
浏览文件 @ 15c09488
......@@ -3,6 +3,7 @@ package com.clx.performance.service.impl.collect;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.dao.collect.CollectTrafficCongestionDao;
import com.clx.performance.enums.InternalMessageTemplateEnum;
import com.clx.performance.enums.PerformanceResultEnum;
import com.clx.performance.enums.integral.IntegralRecordEnum;
import com.clx.performance.model.collect.CollectTrafficCongestion;
......@@ -11,6 +12,7 @@ import com.clx.performance.param.app.collect.CollectTrafficCongestionSaveParam;
import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTraficCongestionParam;
import com.clx.performance.service.IntegralRecordService;
import com.clx.performance.service.SendInternalMessageService;
import com.clx.performance.service.collect.CollectTrafficCongestionService;
import com.clx.performance.service.integral.IntegralRuleService;
import com.clx.performance.struct.collect.CollectTrafficCongestionStruct;
......@@ -25,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import java.time.LocalDateTime;
import java.util.List;
@Slf4j
@Service
......@@ -36,9 +39,7 @@ public class CollectTrafficCongestionServiceImpl implements CollectTrafficConges
@Autowired
private CollectTrafficCongestionStruct collectTrafficCongestionStruct;
@Autowired
private IntegralRecordService integralRecordService;
@Autowired
private IntegralRuleService integralRuleService;
private SendInternalMessageService sendInternalMessageService;
@Transactional(rollbackFor = Exception.class)
@Override
......@@ -77,7 +78,10 @@ public class CollectTrafficCongestionServiceImpl implements CollectTrafficConges
collectTrafficCongestion.setCreateTime(collectTrafficCongestion.getReportTime());
collectTrafficCongestionDao.saveEntity(collectTrafficCongestion);
//待审核：交通情况上报 站内信
sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
InternalMessageTemplateEnum.BusinessType.DRIVER_REPORT.getCode(),
InternalMessageTemplateEnum.CUSTOM_DRIVER_REPORT_TRAFFIC_SITUATION_CODE, List.of(loginUserInfo.getUserName()),null,null);
}
@Override
......
clx-performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectTruckLocationServiceImpl.java
浏览文件 @ 15c09488
......@@ -2,11 +2,13 @@ package com.clx.performance.service.impl.collect;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.dao.collect.CollectTruckLocationDao;
import com.clx.performance.enums.InternalMessageTemplateEnum;
import com.clx.performance.enums.PerformanceResultEnum;
import com.clx.performance.model.collect.CollectTruckLocation;
import com.clx.performance.param.app.collect.CollectTruckLocationSaveParam;
import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLocationParam;
import com.clx.performance.service.SendInternalMessageService;
import com.clx.performance.service.collect.CollectTruckLocationService;
import com.clx.performance.struct.collect.CollectTruckLocationStruct;
import com.clx.performance.vo.pc.collect.CollectTruckLocationVO;
......@@ -18,6 +20,7 @@ import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.time.LocalDateTime;
import java.util.List;
@Slf4j
@Service
......@@ -29,6 +32,9 @@ public class CollectTruckLocationServiceImpl implements CollectTruckLocationServ
@Autowired
private CollectTruckLocationStruct collectTruckLocationStruct;
@Autowired
SendInternalMessageService sendInternalMessageService;
@Override
public void saveLocationReport(CollectTruckLocationSaveParam param) {
......@@ -68,6 +74,11 @@ public class CollectTruckLocationServiceImpl implements CollectTruckLocationServ
collectTruckLocation.setReportTime(LocalDateTime.now());
collectTruckLocation.setCreateTime(collectTruckLocation.getReportTime());
collectTruckLocationDao.saveEntity(collectTruckLocation);
//司机上报：位置 站内信
sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
InternalMessageTemplateEnum.BusinessType.DRIVER_REPORT.getCode(),
InternalMessageTemplateEnum.CUSTOM_DRIVER_REPORT_POSITION_CODE, List.of(loginUserInfo.getUserName()),null,null);
}
@Override
......
clx-performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectTruckRefuelServiceImpl.java
浏览文件 @ 15c09488
......@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.dao.OrderChildDao;
import com.clx.performance.dao.collect.CollectTruckRefuelDao;
import com.clx.performance.enums.InternalMessageTemplateEnum;
import com.clx.performance.enums.PerformanceResultEnum;
import com.clx.performance.enums.integral.IntegralRecordEnum;
import com.clx.performance.model.OrderChild;
......@@ -12,6 +13,7 @@ import com.clx.performance.param.app.collect.CollectTruckRefuelSaveParam;
import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckRefuelParam;
import com.clx.performance.service.IntegralRecordService;
import com.clx.performance.service.SendInternalMessageService;
import com.clx.performance.service.collect.CollectTruckRefuelService;
import com.clx.performance.service.integral.IntegralRuleService;
import com.clx.performance.struct.collect.CollectTruckRefuelStruct;
......@@ -20,11 +22,13 @@ import com.clx.performance.vo.pc.integral.AppIntegralRuleVO;
import com.msl.user.data.UserSessionData;
import com.msl.user.utils.TokenUtil;
import lombok.extern.slf4j.Slf4j;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.List;
@Slf4j
@Service
......@@ -43,6 +47,8 @@ public class CollectTruckRefuelServiceImpl implements CollectTruckRefuelService
private IntegralRuleService integralRuleService;
@Autowired
private IntegralRecordService integralRecordService;
@Autowired
SendInternalMessageService sendInternalMessageService;
@Transactional(rollbackFor = Exception.class)
@Override
......@@ -80,6 +86,10 @@ public class CollectTruckRefuelServiceImpl implements CollectTruckRefuelService
integralRecordService.addDriverReportRecord(ruleInfo, collectTruckRefuel.getTruckNo(), IntegralRecordEnum.Type.REPORT_REFUEL.getValue(),
ruleInfo.getDriverReportRule().getIntegralRefuel(), IntegralRecordEnum.Type.REPORT_REFUEL.getMsg());
//司机上报：油表信息 站内信
sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
InternalMessageTemplateEnum.BusinessType.DRIVER_REPORT.getCode(),
InternalMessageTemplateEnum.CUSTOM_DRIVER_REPORT_REFUEL_CODE, List.of(loginUserInfo.getUserName()),null,null);
}
@Override
......
clx-performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectWaitReportServiceImpl.java
浏览文件 @ 15c09488
......@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.dao.OrderChildDao;
import com.clx.performance.dao.collect.CollectTruckWaitDao;
import com.clx.performance.enums.InternalMessageTemplateEnum;
import com.clx.performance.enums.PerformanceResultEnum;
import com.clx.performance.enums.collect.CollectTruckWaitEnum;
import com.clx.performance.enums.integral.IntegralRecordEnum;
......@@ -15,6 +16,7 @@ import com.clx.performance.param.app.collect.CollectWaitReportSendAddressSavePar
import com.clx.performance.param.app.collect.PageCollectTruckWaitParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckWaitParam;
import com.clx.performance.service.IntegralRecordService;
import com.clx.performance.service.SendInternalMessageService;
import com.clx.performance.service.collect.CollectWaitReportService;
import com.clx.performance.service.integral.IntegralRuleService;
import com.clx.performance.struct.collect.CollectTruckWaitStruct;
......@@ -28,6 +30,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
@Slf4j
......@@ -46,6 +49,9 @@ public class CollectWaitReportServiceImpl implements CollectWaitReportService {
@Autowired
private IntegralRecordService integralRecordService;
@Autowired
SendInternalMessageService sendInternalMessageService;
@Transactional(rollbackFor = Exception.class)
@Override
public void saveSendAddressReport(CollectWaitReportSendAddressSaveParam param) {
......@@ -74,6 +80,12 @@ public class CollectWaitReportServiceImpl implements CollectWaitReportService {
collectTruckWait.setCreateTime(collectTruckWait.getReportTime());
collectTruckWaitDao.saveEntity(collectTruckWait);
//待审核：排队信息上报 站内信
sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
InternalMessageTemplateEnum.BusinessType.DRIVER_REPORT.getCode(),
InternalMessageTemplateEnum.CUSTOM_DRIVER_REPORT_LINE_UP_INFO_CODE, List.of(loginUserInfo.getUserName()),null,null);
}
@Transactional(rollbackFor = Exception.class)
......@@ -104,6 +116,11 @@ public class CollectWaitReportServiceImpl implements CollectWaitReportService {
collectTruckWait.setCreateTime(collectTruckWait.getReportTime());
collectTruckWaitDao.saveEntity(collectTruckWait);
//待审核：排队信息上报 站内信
sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
InternalMessageTemplateEnum.BusinessType.DRIVER_REPORT.getCode(),
InternalMessageTemplateEnum.CUSTOM_DRIVER_REPORT_LINE_UP_INFO_CODE, List.of(loginUserInfo.getUserName()),null,null);
}
@Override
......
clx-performance-web/src/main/java/com/clx/performance/service/impl/linewarn/LineWarnMqHandlerServiceImpl.java
浏览文件 @ 15c09488
......@@ -221,7 +221,7 @@ public class LineWarnMqHandlerServiceImpl implements LineWarnMqHandlerService {
//发送站内信mq
sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
InternalMessageTemplateEnum.BusinessType.LINE_WARN.getCode(),
vehicleWarnInfo.getWarnType(), Collections.singletonList(vehicleWarnInfo.getOrderGoodsNo()),null);
vehicleWarnInfo.getWarnType(), List.of(vehicleWarnInfo.getOrderGoodsNo()),null,null);
......
clx-performance-web/src/main/java/com/clx/performance/service/impl/vehiclewarn/VehicleWarnMqHandlerServiceImpl.java
浏览文件 @ 15c09488
......@@ -345,7 +345,7 @@ public class VehicleWarnMqHandlerServiceImpl implements VehicleWarnMqHandlerServ
//发送站内信mq
sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
InternalMessageTemplateEnum.BusinessType.CHILD_WARN.getCode(),
vehicleWarnInfo.getWarnType(), Collections.singletonList(vehicleWarnInfo.getChildNo()),null);
vehicleWarnInfo.getWarnType(), List.of(vehicleWarnInfo.getChildNo()),null,null);
List<String> mobileList = new ArrayList<>();
......
performance-api/src/main/java/com/clx/performance/param/mq/InternalMessageParam.java
浏览文件 @ 15c09488
......@@ -24,6 +24,10 @@ public class InternalMessageParam {
//内容参数
List<String> variableList;
//跳转地址参数
List<String> jumpUrlVariableList;
//站内信点对点的用户
private Long userNo;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论