merage

kimi

2020-05-27 c007f0ca1785db093d48f4846cda82fe8e955765

 src/main/java/com/highdatas/mdm/util/pool/MqMessage.java

@@ -7,6 +7,7 @@
import com.highdatas.mdm.util.Constant;

import com.highdatas.mdm.util.DbUtils;

import lombok.extern.slf4j.Slf4j;

import org.apache.commons.lang3.StringUtils;



import java.util.Date;

import java.util.List;

@@ -87,6 +88,9 @@
        String fields = fieldByMaintain.stream().map(sysField -> sysField.getField()).collect(Collectors.joining(Constant.COMMA));



        String filter = DbUtils.masterAuthorService.getFilter(user, maintain.getId());

        if (StringUtils.isEmpty(filter)) {

            filter = Constant.WHERE_DEFAULT;

        }

        String content;

        if (increment) {

            String maintainTableName = maintain.getTableName();

@@ -95,6 +99,10 @@
            page.setPageSize(mqEntity.getPageSize().get());

            page.setPageNo(mqEntity.getPageNo().get());

            List<Map<String, Object>> maps = DbUtils.maintainDetailMapper.selectMaintainDetail(fields, tempTableName, maintain.getId(), filter, page.getLimitSQL());



            Map<String, AntianaphylaxisResult> helpfulField = DbUtils.antianaphylaxisClient.getHelpfulField(fields, maintainTableName);

            DbUtils.antianaphylaxisClient.fixMasterData(maps,helpfulField);



            JSONObject object = new JSONObject();

            object.fluentPut("total", page.getRecordCount());

            object.fluentPut("size", page.getPageSize());