no message

kimi42345

2020-03-23 5bac93baf5659ce013163f884c9dce41990a860e

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

@@ -14,7 +14,6 @@
import com.highdatas.mdm.mapper.MenuMappingMapper;
import com.highdatas.mdm.mapper.TableInfoMapper;
import com.highdatas.mdm.pojo.CodeMsg;
import com.highdatas.mdm.pojo.MaintainDataType;
import com.highdatas.mdm.pojo.Result;
import com.highdatas.mdm.service.ActivitiService;
import com.highdatas.mdm.service.IMaintainService;
@@ -84,6 +83,14 @@
            e.printStackTrace();
            return null;
        }
        String menuId = menuMapping.getMenuId();
        if (StringUtils.isEmpty(menuId)) {
            return null;
        }
        int cnt = selectCount(new EntityWrapper<MenuMapping>().eq("menu_id", menuId));
        if (cnt != 0)  {
            return null;
        }
        //menuMapping.setMaintainFieldId(maintainId);
        return  create(menuMapping);
    }
@@ -149,42 +156,36 @@
    @Override
    public Result getMapping(HttpSession session, String id) {
        SysMenu sysMenu = menuService.selectById(id);
        MaintainDataType dataType = sysMenu.getDataType();
        if (sysMenu == null) {
            return Result.error(CodeMsg.SELECT_ERROR);
        }
        String menuType = sysMenu.getMenuType();
        if (!StringUtils.isEmpty(menuType) && menuType.equalsIgnoreCase("DataMenu")) {
            Map mapping = menuMappingMapper.getMapping(id);
            return Result.success(mapping);
        }else if (!StringUtils.isEmpty(menuType) && menuType.equalsIgnoreCase("StructureMenu")) {
        if (StringUtils.isEmpty(menuType)) {
            return Result.error(CodeMsg.SELECT_ERROR);
        }

        if (menuType.equalsIgnoreCase("StructureMenu")) {
            return Result.success(null);
        }
        Wrapper<MenuMapping> menuWrapper = new EntityWrapper<MenuMapping>().eq("menu_id", sysMenu.getParentId());

        Map mapping = menuMappingMapper.getMapping(id);

        Wrapper<MenuMapping> menuWrapper = new EntityWrapper<MenuMapping>().eq("menu_id", sysMenu.getId());
        MenuMapping menuMapping = selectOne(menuWrapper);
        if (menuMapping == null) {
            return Result.error(new CodeMsg(10008,"当前主题无版本数据"));
        }
        String tableName = menuMapping.getTableName();
        Maintain resultMaintain = null;
        switch (dataType) {
            case beforeData:
                resultMaintain = maintainService.getRecentHistoryVersion(tableName);
                break;
            case afterData:
               break;
            case currentData:
                resultMaintain = maintainService.getNowVersion(tableName);
                break;
            default:
                Result.error(new CodeMsg(10008,"当前主题无版本数据"));
                break;
        }

        Map<String, Object> mapping = menuMappingMapper.getMapping(sysMenu.getParentId());
        String tableName = menuMapping.getTableName();
        Maintain resultMaintain = maintainService.getNowVersion(tableName);

        if (resultMaintain != null) {
            mapping.put("version", resultMaintain.getVersion());
            mapping.put("maintainId", resultMaintain.getId());
        }
        mapping.put("dataType", sysMenu.getDataType());

        return Result.success(mapping);


    }
}