From c007f0ca1785db093d48f4846cda82fe8e955765 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 27 五月 2020 09:59:29 +0800
Subject: [PATCH] merage
---
src/main/java/com/highdatas/mdm/service/impl/SysDispenseLogsServiceImpl.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/service/impl/SysDispenseLogsServiceImpl.java b/src/main/java/com/highdatas/mdm/service/impl/SysDispenseLogsServiceImpl.java
index bd650d1..b33bdb4 100644
--- a/src/main/java/com/highdatas/mdm/service/impl/SysDispenseLogsServiceImpl.java
+++ b/src/main/java/com/highdatas/mdm/service/impl/SysDispenseLogsServiceImpl.java
@@ -5,9 +5,12 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.highdatas.mdm.entity.SysDispenseLogs;
import com.highdatas.mdm.mapper.SysDispenseLogsMapper;
+import com.highdatas.mdm.service.IMaintainService;
import com.highdatas.mdm.service.ISysDispenseLogsService;
+import com.highdatas.mdm.util.Constant;
import com.highdatas.mdm.util.DbUtils;
import com.highdatas.mdm.util.pool.MqEntity;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
@@ -23,14 +26,21 @@
*/
@Service
public class SysDispenseLogsServiceImpl extends ServiceImpl<SysDispenseLogsMapper, SysDispenseLogs> implements ISysDispenseLogsService {
+ @Autowired
+ IMaintainService maintainService;
@Override
public SysDispenseLogs getLogByMqEntity(MqEntity mqEntity) {
+ String type = mqEntity.getType();
Wrapper<SysDispenseLogs> sysDispenseLogsWrapper = new EntityWrapper<SysDispenseLogs>()
.eq("topic_id", mqEntity.getMsgTopicName())
.eq("tag_id", mqEntity.getMsgTagName())
.eq("key_id", mqEntity.getMsgKey())
.orderBy("create_time desc");
+ if (Constant.Master.equalsIgnoreCase(type)) {
+ sysDispenseLogsWrapper.eq("maintain_id", mqEntity.getMaintainId());
+ }
+
SysDispenseLogs sysDispenseLogs = selectOne(sysDispenseLogsWrapper);
@@ -42,6 +52,8 @@
Wrapper<SysDispenseLogs> sysDispenseLogsWrapper = new EntityWrapper<SysDispenseLogs>()
.eq("topic_id", mqEntity.getMsgTopicName())
.eq("tag_id", mqEntity.getMsgTagName())
+ .eq("user_id", mqEntity.getUserId())
+ .isNotNull("pages")
.eq("status", "fail")
.orderBy("create_time desc");
@@ -55,6 +67,8 @@
SysDispenseLogs sysDispenseLogs = new SysDispenseLogs()
.setId(DbUtils.getUUID())
.setCreateTime(new Date())
+ .setUserId(mqEntity.getUserId())
+ .setMaintainId(mqEntity.getMaintainId())
.setDataType(mqEntity.getType())
.setTopicId(mqEntity.getMsgTopicName())
.setTagId(mqEntity.getMsgTagName())
--
Gitblit v1.8.0