merage

kimi

2020-05-27 c007f0ca1785db093d48f4846cda82fe8e955765

 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())