bak 修改 获取版本数据前

kimi

2020-05-18 c8aee7b9bfd79cfd741d7e5692520f4f51a31a86

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

@@ -12,6 +12,7 @@
import com.highdatas.mdm.service.*;
import com.highdatas.mdm.util.Constant;
import com.highdatas.mdm.util.DbUtils;
import com.highdatas.mdm.util.RedisClient;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -42,6 +43,9 @@
    IMasterAuthorService masterAuthorService;
    @Autowired
    IMasterAuthorDetailService masterAuthorDetailService;
    @Autowired
    RedisClient redisClient;

    @Override
    public MaintainField getNextMaintain(String tableName, String userId) {
        MaintainField maintain = this.getMaxVersion(tableName);
@@ -103,6 +107,18 @@
        HashMap<String, List<Maintain>> resultMap = getMaintainFieldMapByTable(tableName);
        if (resultMap == null) {
            return null;
        }
        if (maintainFieldId == null) {
            return null;
        }
        if (maintainFieldId.equalsIgnoreCase(Constant.All)) {
            Collection<List<Maintain>> values = resultMap.values();
            HashSet<Maintain> maintains = new HashSet<>();
            for (List<Maintain> value : values) {
                maintains.addAll(value);
            }

            return new ArrayList<>(maintains);
        }
        return resultMap.get(maintainFieldId);
    }
@@ -194,12 +210,15 @@

            Integer orderNo = maintainField.getOrderNo();
            int preNo = orderNo - 1;
            if (preNo< 0) {
                return;
            MaintainField preMaintainField;
            if (preNo < 0 ) {
               preMaintainField = new MaintainField().setId(Constant.Default);
            }else {
                preMaintainField = selectOne(new EntityWrapper<MaintainField>()
                        .eq("table_name", maintainField.getTableName())
                        .eq("order_no", preNo));
            }
            MaintainField preMaintainField = selectOne(new EntityWrapper<MaintainField>()
                    .eq("table_name", maintainField.getTableName())
                    .eq("order_no", preNo));

            if (preMaintainField == null){
                return;
            }
@@ -208,9 +227,7 @@
                            .eq("maintain_auto", true)
                            .eq("table_name", maintainField.getTableName())
                            .eq("maintain_field_id", preMaintainField.getId()));
            if (masterAuthors.isEmpty()) {
                return;
            }

            List<SysField> fieldList = fieldService.selectList(new EntityWrapper<SysField>().eq("maintain_field_id", maintainField.getId()));

            List<SysField> deleteList = fieldList.stream().filter(sysField -> Operate.delete.equals(sysField.getOperate())).collect(Collectors.toList());
@@ -222,20 +239,26 @@

            for (MasterAuthor masterAuthor : masterAuthors) {
                Boolean fieldAuto = masterAuthor.getFieldAuto();

                List<MasterAuthorDetail> masterAuthorDetails = masterAuthorDetailService.selectList(new EntityWrapper<MasterAuthorDetail>().eq(Constant.PARENT_ID, masterAuthor.getId()));

                masterAuthor.setMaintainFieldId(maintainField.getId())
                        .setCreateTime(new Date())
                        .setUpdateTime(null)
                        .setId(DbUtils.getUUID())
                        .insert();
                List<MasterAuthorDetail> masterAuthorDetails = masterAuthorDetailService.selectList(new EntityWrapper<MasterAuthorDetail>().eq(Constant.PARENT_ID, preMaintainField.getId()));

                for (MasterAuthorDetail masterAuthorDetail : masterAuthorDetails) {
                    masterAuthorDetail.setParentId(maintainField.getId()).setId(DbUtils.getUUID()).insert();
                    long count = deleteList.stream().filter(sysField -> sysField.getField().equalsIgnoreCase(masterAuthorDetail.getField())).count();
                    if (count > 0) {
                        continue;
                    }
                    masterAuthorDetail.setParentId(masterAuthor.getId()).setId(DbUtils.getUUID()).insert();
                }

                if (fieldAuto) {
                    for (String s : createFieldList) {
                        new MasterAuthorDetail().setField(s).setVal(Constant.z_AllVal).setAll(true).setParentId(maintainField.getId()).setId(DbUtils.getUUID()).insert();
                        new MasterAuthorDetail().setField(s).setVal(Constant.z_AllVal).setAll(true).setParentId(masterAuthor.getId()).setId(DbUtils.getUUID()).insert();
                    }
                }
            }
@@ -271,6 +294,8 @@
                maintainFieldMapper.addCloumn(tableName, field.getField(), fieldTypeStr);

                field.setOperate(null).updateById();

               redisClient.delByField();
            }


@@ -353,10 +378,10 @@
    public List<Maintain> getMaintainListByMaintainField(String id, String tableName) {
        MaintainField maintainField = selectById(id);
        if (maintainField == null) {
            if (!id.equalsIgnoreCase(Constant.Default)){
            if (!id.equalsIgnoreCase(Constant.Default) && !id.equalsIgnoreCase(Constant.All)){
                return null;
            }else {
                maintainField = new MaintainField().setId(Constant.Default).setTableName(tableName);
                maintainField = new MaintainField().setId(id).setTableName(tableName);
            }

        }
@@ -369,7 +394,7 @@
        HashMap<String, List<Maintain>> resultMap = new HashMap<>();
        for (Maintain maintain : maintainList) {
            ActivitiStatus status = flowsService.getStatusByBusinessId(maintain.getId());
            if (!status.equals(ActivitiStatus.open)) {
            if (!ActivitiStatus.open.equals(status)) {
                continue;
            }
            MaintainField maintainFieldByMaintain = fieldService.getMaintainFieldByMaintain(maintain.getId());