Merge remote-tracking branch 'origin/master'

This commit is contained in:
2024-09-13 21:27:12 +08:00
72 changed files with 2783 additions and 626 deletions

View File

@@ -45,6 +45,8 @@ public class AppAutoDataConsumer extends EnhanceConsumerMessageHandler<AppAutoDa
@Resource
private RocketMqLogFeignClient rocketMqLogFeignClient;
// @Resource
// private WlRecordFeignClient wlRecordFeignClient;
@Override
protected void handleMessage(AppAutoDataMessage appAutoDataMessage) {

View File

@@ -11,6 +11,7 @@ import com.njcn.system.api.RocketMqLogFeignClient;
import com.njcn.system.pojo.po.RocketmqMsgErrorLog;
import com.njcn.zlevent.api.AlarmFeignClient;
import com.njcn.zlevent.api.EventFeignClient;
import com.njcn.zlevent.api.EvtErrorFeignClient;
import com.njcn.zlevent.api.WaveFeignClient;
import lombok.extern.slf4j.Slf4j;
import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
@@ -40,17 +41,16 @@ public class AppEventConsumer extends EnhanceConsumerMessageHandler<AppEventMess
@Resource
private RedisUtil redisUtil;
@Resource
private RocketMqLogFeignClient rocketMqLogFeignClient;
@Resource
private EventFeignClient eventFeignClient;
@Resource
private WaveFeignClient waveFeignClient;
@Resource
private AlarmFeignClient alarmFeignClient;
@Resource
private EvtErrorFeignClient evtErrorFeignClient;
@Override
protected void handleMessage(AppEventMessage appEventMessage) {
@@ -68,6 +68,13 @@ public class AppEventConsumer extends EnhanceConsumerMessageHandler<AppEventMess
log.info("分发至录波报文处理");
waveFeignClient.analysis(appEventMessage);
break;
case 32:
log.info("分发至便携式基础数据处理");
break;
case 241:
log.info("分发装置异常事件统计");
evtErrorFeignClient.insertErrorEvent(appEventMessage);
break;
default:
break;
}