diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/order/Order.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/order/Order.java index 4afc6f5..b27f778 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/order/Order.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/order/Order.java @@ -1,5 +1,6 @@ package com.evotech.hd.common.core.entity.order; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -74,4 +75,6 @@ public class Order extends BaseOrder{ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; + @TableField(exist = false) + private OrderDetail orderDetail; } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/open/processor/StrategyFactory.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/open/processor/StrategyFactory.java index 4d4fd60..8eda524 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/open/processor/StrategyFactory.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/open/processor/StrategyFactory.java @@ -10,6 +10,8 @@ package com.evotech.hd.cloud.open.processor; */ import com.alibaba.fastjson.JSONObject; +import com.evotech.hd.cloud.entity.MessageMqtt; +import com.evotech.hd.cloud.service.MessageMqttService; import com.evotech.hd.common.core.Dto.Result; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.BeansException; @@ -31,6 +33,8 @@ public class StrategyFactory implements InitializingBean, ApplicationContextAwar private static final Map CONTEXT = new HashMap<>(); + private static MessageMqttService messageMqttService; + @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { this.applicationContext = applicationContext; @@ -42,11 +46,13 @@ public class StrategyFactory implements InitializingBean, ApplicationContextAwar applicationContext.getBeansOfType(StationMessageStrategyExchangeProcessor.class) .values() .forEach(exchange -> CONTEXT.putIfAbsent(exchange.getClass().getSimpleName().toLowerCase(), exchange)); + messageMqttService = applicationContext.getBean(MessageMqttService.class); } public Result exchange(JSONObject json) { try { StationMessageStrategyExchangeProcessor processor = CONTEXT.get(json.getString("class").toLowerCase()); + log(json); if (ObjectUtils.isEmpty(processor)){ return Result.getInstance().error("当前接口不存在"); } @@ -64,4 +70,16 @@ public class StrategyFactory implements InitializingBean, ApplicationContextAwar return Result.getInstance().error(e.getMessage()); } } + + public void log(JSONObject json){ + MessageMqtt messageMqtt = new MessageMqtt(); + messageMqtt.setStationCode(json.getString("stationCode")); + messageMqtt.setDirection("M2S"); + messageMqtt.setType("状态信息类"); + messageMqtt.setMessageFunction(json.getString("method")); + messageMqtt.setTopic(json.getString("class")); + messageMqtt.setContent(json.toJSONString()); + messageMqttService.add(messageMqtt); + } +// public void } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/open/processor/impl/OrderSwapProcessor.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/open/processor/impl/OrderSwapProcessor.java index 8b99869..2539f44 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/open/processor/impl/OrderSwapProcessor.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/open/processor/impl/OrderSwapProcessor.java @@ -9,6 +9,7 @@ import com.evotech.hd.cloud.mqtt.message.dto.newer.state.OrderStatusData; import com.evotech.hd.cloud.mqtt.message.processor.strategy.impl.confirm.MqttConfirmSwapCompleteExchangeProcessorImpl; import com.evotech.hd.cloud.mqtt.message.processor.strategy.impl.state.MqttStateSwapStepDataExchangeProcessor; import com.evotech.hd.cloud.open.processor.StationMessageStrategyExchangeProcessor; +import com.evotech.hd.cloud.service.OrderDetailService; import com.evotech.hd.cloud.service.OrderService; import com.evotech.hd.cloud.service.OrderSwapBatteryPreService; import com.evotech.hd.cloud.service.OrderSwapBatteryStepService; @@ -41,6 +42,8 @@ public class OrderSwapProcessor implements StationMessageStrategyExchangeProcess @Resource OrderService orderService; @Resource + OrderDetailService orderDetailService; + @Resource private OrderSwapBatteryStepService orderSwapBatteryStepService; @Resource private MqttStateSwapStepDataExchangeProcessor mqttStateSwapStepDataExchangeProcessor; @@ -115,6 +118,7 @@ public class OrderSwapProcessor implements StationMessageStrategyExchangeProcess orderService.handleOrderStatus(orderStatus, statusData); //再次查询数据信息 order = orderService.getById(json.getInteger("pkId")); + order.setOrderDetail(orderDetailService.getOrderDetailByOrder(order.getPkId())); return Result.getInstance().build(JSONObject.class).success((JSONObject)JSONObject.toJSON(order)); } catch (Exception e) { e.printStackTrace(); diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/OrderDetailService.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/OrderDetailService.java index 40419ea..d73faac 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/OrderDetailService.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/OrderDetailService.java @@ -16,4 +16,6 @@ public interface OrderDetailService extends IService { public OrderDetail addOrderDetailByOrder(Integer orderId); + + public OrderDetail getOrderDetailByOrder(Integer orderId); } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/OrderDetailServiceImpl.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/OrderDetailServiceImpl.java index 220566e..e683703 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/OrderDetailServiceImpl.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/OrderDetailServiceImpl.java @@ -36,6 +36,11 @@ public class OrderDetailServiceImpl extends ServiceImpl().eq(OrderDetail::getOrderId, orderId), false); + } } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/OrderSwapBatteryPreServiceImpl.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/OrderSwapBatteryPreServiceImpl.java index fc0ef90..fdca8eb 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/OrderSwapBatteryPreServiceImpl.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/OrderSwapBatteryPreServiceImpl.java @@ -149,8 +149,10 @@ public class OrderSwapBatteryPreServiceImpl extends ServiceImpl().success(true); } return new Result().error("添加预约换电订单出错！", false); diff --git a/wechat-server/src/main/java/com/evotech/hd/wechat/controller/SendGzhController.java b/wechat-server/src/main/java/com/evotech/hd/wechat/controller/SendGzhController.java index a6ba6c2..b879aae 100644 --- a/wechat-server/src/main/java/com/evotech/hd/wechat/controller/SendGzhController.java +++ b/wechat-server/src/main/java/com/evotech/hd/wechat/controller/SendGzhController.java @@ -43,7 +43,7 @@ public class SendGzhController { return gzhMessageTemplateService.sendOrderToBeSettled(order); } - @Operation(summary = "推送公众号待结算订单消息") + @Operation(summary = "推送站端报警消息") @PostMapping("/alarm/message") @ApiOperationSupport(order = 2) public Result sendAlarmToMessage(@RequestBody AlarmTemplate alarmTemplate) { diff --git a/wechat-server/src/main/java/com/evotech/hd/wechat/service/gzh/GZHMessageTemplateService.java b/wechat-server/src/main/java/com/evotech/hd/wechat/service/gzh/GZHMessageTemplateService.java index cacbe0b..af4adf4 100644 --- a/wechat-server/src/main/java/com/evotech/hd/wechat/service/gzh/GZHMessageTemplateService.java +++ b/wechat-server/src/main/java/com/evotech/hd/wechat/service/gzh/GZHMessageTemplateService.java @@ -126,6 +126,8 @@ public class GZHMessageTemplateService { * @return */ public com.evotech.hd.common.core.Dto.Result sendAlarmToMessage(AlarmTemplate alarmTemplate){ + + log.info("接收到的站端异常报警====>>>>>"+ com.alibaba.fastjson.JSONObject.toJSONString(alarmTemplate)); if(alarmTemplate.getMessage().length() > 20){ alarmTemplate.setMessage(alarmTemplate.getMessage().substring(0,19)); } @@ -140,7 +142,9 @@ public class GZHMessageTemplateService { return Result.getInstance().build(String.class).error("当前错误接口没有绑定微信通知人"); } for (WechatUser wechatUser : wechatUsers){ - result.put(wechatUser.getName(), sendTemplateMessage(wechatUser.getGzhOpenid(), gzhProperties.getDeviceAlarmTemplateId(),JSONUtil.parseObj(alarmData), false).getData()); + String resultMessage = sendTemplateMessage(wechatUser.getGzhOpenid(), gzhProperties.getDeviceAlarmTemplateId(),JSONUtil.parseObj(alarmData), false).getData(); + log.info("接收到的站端异常报警====>>>>> 通知人:{}---->>>> 通知结果:{}", wechatUser.getName(), resultMessage); + result.put(wechatUser.getName(), resultMessage); } } return Result.getInstance().build(String.class).success(com.alibaba.fastjson.JSONObject.toJSONString(result));