bak 修改 获取版本数据前

kimi

2020-05-18 c8aee7b9bfd79cfd741d7e5692520f4f51a31a86

 src/main/java/com/highdatas/mdm/service/impl/DispenseServiceImpl.java

@@ -1,14 +1,12 @@
package com.highdatas.mdm.service.impl;



import com.highdatas.mdm.entity.Maintain;

import com.highdatas.mdm.entity.MasterAuthor;

import com.highdatas.mdm.entity.SysDispenseLogs;

import com.highdatas.mdm.entity.TUser;

import com.highdatas.mdm.entity.*;

import com.highdatas.mdm.pojo.CodeMsg;

import com.highdatas.mdm.pojo.Page;

import com.highdatas.mdm.pojo.Result;

import com.highdatas.mdm.service.*;

import com.highdatas.mdm.util.Constant;

import com.highdatas.mdm.util.DbUtils;

import com.highdatas.mdm.util.pool.MqEntity;

import com.highdatas.mdm.util.pool.MqMessage;

import com.highdatas.mdm.util.pool.PassiveMqThreadPoolExecutor;

@@ -127,26 +125,53 @@
    private MqMessage createNextSubMq(MqEntity mqEntity) {

        String type = mqEntity.getType();

        AtomicInteger pageNoAI = mqEntity.getPageNo();

        String logId = mqEntity.getLogId();

        SysDispenseLogs logs = dispenseLogsService.selectById(logId);



        if(pageNoAI == null) {

            String userId = mqEntity.getUserId();

            TUser user = DbUtils.getUserById(userId);

            if (user == null && logs != null) {

                logs.setErrorInfo(CodeMsg.USER_NOT_MATHED.getMsg()).updateById();

            } else if (logs != null) {

                logs.setUserName(user.getUserName());

                logs.updateById();

            }

            if (type.equalsIgnoreCase(Constant.Master)) {

                String dataId = mqEntity.getDataId();

                String tableNameByMenu = menuMappingService.getTableNameByMenu(dataId);

                String userId = mqEntity.getUserId();

                TUser user = new TUser().setUserId(userId);

                Maintain maintain = maintainService.selectById(mqEntity.getMaintainId());

                MasterAuthor masterAuthor = new MasterAuthor().setTableName(tableNameByMenu);

                masterAuthor.setIncrement(mqEntity.getIncrement());

                Page initPageInfo = masterAuthorService.getInitPageInfo(masterAuthor, maintain, user, mqEntity.getIncrement());

                AtomicInteger pagesAI = new AtomicInteger(initPageInfo.getPages());

                mqEntity.setPages(pagesAI);

                mqEntity.setTotalSize(new AtomicInteger(Long.valueOf(initPageInfo.getRecordCount()).intValue()));

                AtomicInteger pageSizeAI = new AtomicInteger(initPageInfo.getPageSize());

                mqEntity.setPageSize(pageSizeAI);

                if (logs != null) {

                    SysMenu menuByTableName = menuMappingService.getMenuByTableName(maintain.getTableName());

                    if (menuByTableName != null) {

                        logs.setName(menuByTableName.getName());

                    }

                    logs.setVersion(maintain.getVersion());

                    logs.updateById();

                }



            } else {

                Page initPageInfo = viewService.getInitPageInfo(mqEntity.getDataId());

                AtomicInteger pagesAI = new AtomicInteger(initPageInfo.getPages());

                mqEntity.setPages(pagesAI);

                AtomicInteger pageSizeAI = new AtomicInteger(initPageInfo.getPageSize());

                mqEntity.setPageSize(pageSizeAI);

                mqEntity.setTotalSize(new AtomicInteger(Long.valueOf(initPageInfo.getRecordCount()).intValue()));

                if (logs != null) {

                    SysView sysView = viewService.selectById(mqEntity.getDataId());

                    if (sysView != null) {

                        logs.setName(sysView.getName());

                        logs.updateById();

                    }

                }

            }

            pageNoAI = new AtomicInteger();

            mqEntity.setPageNo(pageNoAI);

@@ -158,12 +183,27 @@


    @Override

    public boolean pushActiveMq(MqMessage message) {

        return pushActiveMq(message, null);

    }

    @Override

    public boolean pushActiveMq(MqMessage message, String touchType) {

        MqEntity mqEntity = message.getMqEntity();

        SysDispenseLogs preUnSuccessByMqEntity = dispenseLogsService.getPreUnSuccessByMqEntity(mqEntity);

        if (preUnSuccessByMqEntity == null) {

            SysDispenseLogs logByMqEntity = dispenseLogsService.createLogByMqEntity(mqEntity);

            logByMqEntity.setTouchType("sys").updateById();

            if (StringUtils.isEmpty(touchType)) {

                logByMqEntity.setTouchType(touchType);

            } else {

                logByMqEntity.setTouchType("sys");

            }





            logByMqEntity.updateById();



            mqEntity.setLogId(logByMqEntity.getId());



        } else {

            mqEntity.setLogId(preUnSuccessByMqEntity.getId());

            mqEntity.setMsgKey(preUnSuccessByMqEntity.getKeyId());

            mqEntity.setPageNo(new AtomicInteger(preUnSuccessByMqEntity.getPageNo()));

            mqEntity.setPageSize(new AtomicInteger(preUnSuccessByMqEntity.getPageSize()));

@@ -176,10 +216,11 @@
    }



    @Override

    public Result pushPassiveMq(MqMessage message, String touchType) {

    public Result pushPassiveMq(MqMessage message, String touchType, SysDispenseLogs logs) {

        try{

            MqMessage preMsg = null;

            if (queueSize.equals(priorityQueue.size())) {

                logs.setResult(CodeMsg.ADDQUEUE_OVER.getMsg()).updateById();

                return Result.error(CodeMsg.ADDQUEUE_OVER);

            }

            MqEntity mqEntity = message.getMqEntity();

@@ -200,6 +241,7 @@
            if (preMsg != null) {

                int cnt = preMsg.getCnt();

                preMsg.setCnt(cnt + 1);

                logs.setResult(CodeMsg.REPEAT_ERROR.getMsg()).updateById();

                return Result.error(CodeMsg.REPEAT_ERROR);



            }else {

@@ -209,8 +251,7 @@
            priorityExecutorService.execute(message);

            SysDispenseLogs preUnSuccessByMqEntity = dispenseLogsService.getPreUnSuccessByMqEntity(mqEntity);

            if (preUnSuccessByMqEntity == null) {

                SysDispenseLogs logByMqEntity = dispenseLogsService.createLogByMqEntity(mqEntity);

                logByMqEntity.setTouchType(touchType).updateById();

               logs.setResult(CodeMsg.ADDQUEUE_SUCCESS.getMsg()).updateById();

            } else {

                mqEntity.setMsgKey(preUnSuccessByMqEntity.getKeyId());

                mqEntity.setPageNo(new AtomicInteger(preUnSuccessByMqEntity.getPageNo()));

@@ -221,6 +262,7 @@
            return Result.success(CodeMsg.ADDQUEUE_SUCCESS);

        }catch (Exception e) {

            log.error(e.getMessage());

            logs.setErrorInfo(e.getMessage());

            return Result.success(CodeMsg.ADDQUEUE_FAIL);

        }

    }