add 分发 master_author 添加字段 subscribe increment， 添加7个表 master_author...

kimi

2020-04-22 5268a2b7dfa556bd6f5a2d5e446cea3ea9940c10

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

@@ -545,7 +545,38 @@

        return result;
    }
    @Override
    public Long getCountByVersion(Character character, String tableName, String whereSegment,  String version, boolean findMax) {
        Maintain maintainFromVersion = maintainService.getMaintainFromVersion(tableName, version);
        Maintain nowVersionMaintain = maintainService.getNowVersion(tableName);
        boolean isMax = maintainService.checkdMaxVersion(maintainFromVersion.getId());
        boolean isNow = maintainService.checkNowVersion(maintainFromVersion.getId());
        boolean isFirst = maintainService.checkFirstVersion(maintainFromVersion.getId());

        Integer fromVersionOrderNo = maintainFromVersion.getOrderNo();
        Integer nowVersionOrderNo = 0;
        if (nowVersionMaintain != null) {
            nowVersionOrderNo = nowVersionMaintain.getOrderNo();
        }

        String tableTempName = tableName + Constant.RECORD;

        Long count;

        if (isNow && !findMax){
            count = getCount(tableName, whereSegment);
        }
        else if (isMax && findMax) {
            if (isFirst && nowVersionMaintain == null) {
                nowVersionOrderNo = nowVersionOrderNo - 1;
            }

            count = getCountByMaxVersion(character, maintainFromVersion.getId(), tableName, tableTempName, fromVersionOrderNo, nowVersionOrderNo,  whereSegment);
        }else {
            count = getCountByVersion(character, maintainFromVersion.getId(), tableName, tableTempName, nowVersionOrderNo, fromVersionOrderNo, whereSegment);
        }
        return count;
    }
    @Override
    public Result selectListByPageByVersion(Character character, String tableName, List<String> fieldList, String whereSegment, Integer pageNo, Integer pageSize, String version, boolean findMax) {
        Maintain maintainFromVersion = maintainService.getMaintainFromVersion(tableName, version);
@@ -576,7 +607,7 @@
        }else {
            count = getCountByVersion(character, maintainFromVersion.getId(), tableName, tableTempName, nowVersionOrderNo, fromVersionOrderNo, whereSegment);
        }
        if (count == 0) {
        if (count == null || count == 0) {
            return Result.success(null);
        }
        //mapper.selectByPageByVersion(tableName, tableTempName, fieldList, whereSegment,);
@@ -652,7 +683,7 @@
        JSONObject object = new JSONObject();

        object.fluentPut("total", page.getRecordCount());
        object.fluentPut("passiveQueueSize", page.getPageSize());
        object.fluentPut("size", page.getPageSize());
        object.fluentPut("pages", page.getPageCount());
        object.fluentPut("current", page.getPageNo());
        object.fluentPut("record", result);
@@ -831,7 +862,7 @@
        JSONObject object = new JSONObject();

        object.fluentPut("total", page.getRecordCount());
        object.fluentPut("passiveQueueSize", page.getPageSize());
        object.fluentPut("size", page.getPageSize());
        object.fluentPut("pages", page.getPageCount());
        object.fluentPut("current", page.getPageNo());
        object.fluentPut("record", result);