接口管理模块添加

 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/poi/util/ExcelUtil.java

@@ -321,7 +321,6 @@
                    throw new VciBaseException(LangBaseUtil.getErrorMsg(var13), new String[0], var13);
                } finally {
                    IOUtils.closeQuietly(os);

                    try {
                        wb.close();
                    } catch (Throwable var12) {

 Source/UBCS/ubcs-service/ubcs-code/pom.xml

@@ -123,10 +123,10 @@
                    <groupId>javax.servlet</groupId>
                    <artifactId>servlet-api</artifactId>
                </exclusion>
                <exclusion>
                <!--<exclusion>
                    <artifactId>commons-io</artifactId>
                    <groupId>commons-io</groupId>
                </exclusion>
                </exclusion>-->
                <exclusion>
                    <artifactId>geronimo-activation_1.1_spec</artifactId>
                    <groupId>org.apache.geronimo.specs</groupId>

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java

@@ -4,19 +4,14 @@
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.dto.DockingSystemConfigDTO;
import com.vci.ubcs.code.dto.DockingSystemDTO;
import com.vci.ubcs.code.dto.DockingTaskDTO;
import com.vci.ubcs.code.dto.UpdateSysInfoStatusDTO;
import com.vci.ubcs.code.entity.DockingData;
import com.vci.ubcs.code.entity.DockingSystem;
import com.vci.ubcs.code.entity.DockingSystemConfig;
import com.vci.ubcs.code.service.IDockingDataService;
import com.vci.ubcs.code.service.IDockingSystemConfigService;
import com.vci.ubcs.code.service.IDockingSystemService;
import com.vci.ubcs.code.vo.pagemodel.DockingDataVO;
import com.vci.ubcs.code.vo.pagemodel.DockingSystemConfigVO;
import com.vci.ubcs.code.vo.pagemodel.DockingSystemVO;
import com.vci.ubcs.code.wrapper.DockingDataWrapper;
import com.vci.ubcs.code.wrapper.DockingSystemWrapper;
import com.vci.ubcs.code.entity.*;
import com.vci.ubcs.code.service.*;
import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.code.wrapper.*;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -24,6 +19,8 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;

import java.util.Map;

/**
 * ç æ®µåŸºç¡€ä¿¡æ¯æŽ§åˆ¶å™¨
@@ -45,13 +42,10 @@
     * é›†æˆæŽ¥å£é…ç½®æœåŠ¡
     */
    private  final IDockingSystemConfigService dockingSystemConfigService;


    /***
     * å¾…集成数据服务
     * å¾…集管理配置服务
     */
    private final IDockingDataService dockingDataService;

    private final IDokingSysManaentService dokingSysManaentService;

    /**系统集成的系统信息列表
     * @param dockingSystem åŸºç¡€æŸ¥è¯¢å¯¹è±¡ï¼ŒåŒ…含查询条件，分页，排序等
@@ -188,7 +182,73 @@
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "DockingDataVO")
    public R<IPage<DockingDataVO>> gridDockingData(DockingData dockingData, Query query){
        IPage<DockingData> pages = dockingDataService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingData));
        return R.data(DockingDataWrapper.build().pageVO(pages));
        IPage<DockingDataVO> pages = dokingSysManaentService.gridDockingData(dockingData,query);
        return R.data(pages);
    }


    /**
     * data列表
     * @param dockingTask åŸºç¡€æŸ¥è¯¢å¯¹è±¡ï¼ŒåŒ…含查询条件，分页，排序等
     * @return ç³»ç»Ÿé›†æˆçš„系统信息显示对象列表
     */
    @GetMapping("/gridDockingTask")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "DockingTaskVO")
    public R<IPage<DockingTaskVO>> gridDockingTask(DockingTask dockingTask, Query query){
        IPage<DockingTaskVO> pages = dokingSysManaentService.gridDockingTask(dockingTask,query);
        return R.data(pages);
    }

    /**
     * æŽ¨é€æ•°æ®é›†æˆæ—¥å¿—列表
     * @param dockingLog åŸºç¡€æŸ¥è¯¢å¯¹è±¡ï¼ŒåŒ…含查询条件，分页，排序等
     * @return é›†æˆæ—¥å¿—显示对象列表
     */
    @GetMapping("/gridLoge")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "DockingLogeVO")
    public R<IPage<DockingLogeVO>> gridLoge(DockingLog dockingLog, Query query){
        IPage<DockingLogeVO> pages = dokingSysManaentService.gridLoge(dockingLog,query);
        return R.data(pages);
    }

    /**
     * æŽ¥å£param列表
     * @param dockingSysIntParam åŸºç¡€æŸ¥è¯¢å¯¹è±¡ï¼ŒåŒ…含查询条件，分页，排序等
     * @return é›†æˆæ—¥å¿—显示对象列表
     */
    @GetMapping("/gridParam")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "dockingSysIntParam")
    public R<IPage<DockingSysIntParamVO>>gridParam(DockingSysIntParam dockingSysIntParam, Query query){
        IPage<DockingSysIntParamVO> pages = dokingSysManaentService.gridParam(dockingSysIntParam,query);
        return R.data(pages);
    }

    /**
     * æŽ¥å£param列表
     * @param dockingSysIntHeader åŸºç¡€æŸ¥è¯¢å¯¹è±¡ï¼ŒåŒ…含查询条件，分页，排序等
     * @return é›†æˆæ—¥å¿—显示对象列表
     */
    @GetMapping("/gridHeader")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "DockingSysIntHeaderVO")
    public R<IPage<DockingSysIntHeaderVO>>gridHeader(DockingSysIntHeader dockingSysIntHeader, Query query){
        IPage<DockingSysIntHeaderVO>  pages=dokingSysManaentService.gridHeader(dockingSysIntHeader,query);
        return R.data(pages);


    }

//    /**
//     *批量处理
//     * å¿…须要有分类oid和dataoid
//     * @return
//     */
//    @PostMapping("/sendData")
//    public  R sendData(String oid){
//
//        return codeDuckingSyncServiceI.sendData(oid);
//    }
}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java

@@ -1,10 +1,49 @@
package com.vci.ubcs.code.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vci.ubcs.code.entity.*;
import com.vci.ubcs.code.vo.pagemodel.*;
import org.springblade.core.mp.support.Query;

/***
 * ç³»çµ±ç®¡ç†ç›¸å…³æœåŠ¡
 */
public interface IDokingSysManaentService {
    /**
     * data列表
     * @param dockingTask åŸºç¡€æŸ¥è¯¢å¯¹è±¡ï¼ŒåŒ…含查询条件，分页，排序等
     * @return ç³»ç»Ÿé›†æˆçš„系统信息显示对象列表
     */
    IPage<DockingTaskVO>gridDockingTask(DockingTask dockingTask, Query query);
    /**
     * å¾…集成数据
     * @param dockingData åŸºç¡€æŸ¥è¯¢å¯¹è±¡ï¼ŒåŒ…含查询条件，分页，排序等
     * @return ç³»ç»Ÿé›†æˆåŸºç¡€ä¿¡æ¯æ˜¾ç¤ºå¯¹è±¡åˆ—表
     */
    IPage<DockingDataVO>gridDockingData(DockingData dockingData, Query query);



    /**
     * æŽ¨é€æ•°æ®é›†æˆæ—¥å¿—列表
     * @param dockingLog åŸºç¡€æŸ¥è¯¢å¯¹è±¡ï¼ŒåŒ…含查询条件，分页，排序等
     * @return é›†æˆæ—¥å¿—显示对象列表
     */
    IPage<DockingLogeVO>gridLoge(DockingLog dockingLog, Query query);

    /**
     * æŽ¥å£param列表
     * @param dockingSysIntParam åŸºç¡€æŸ¥è¯¢å¯¹è±¡ï¼ŒåŒ…含查询条件，分页，排序等
     * @return é›†æˆæ—¥å¿—显示对象列表
     */
    IPage<DockingSysIntParamVO>gridParam(DockingSysIntParam dockingSysIntParam, Query query);


    /**
     * æŽ¥å£param列表
     * @param dockingSysIntHeader åŸºç¡€æŸ¥è¯¢å¯¹è±¡ï¼ŒåŒ…含查询条件，分页，排序等
     * @return é›†æˆæ—¥å¿—显示对象列表
     */
    IPage<DockingSysIntHeaderVO>gridHeader(DockingSysIntHeader dockingSysIntHeader, Query query);

}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java

@@ -98,7 +98,7 @@
    /***
     * ä»»åŠ¡ç”ŸæˆæœåŠ¡
     */
    @Autowired(required = false)
    @Autowired( required = false)
    private IDockingTaskService dockingTaskService;



 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,91 @@
package com.vci.ubcs.code.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.entity.*;
import com.vci.ubcs.code.mapper.DockingSystemConfigMapper;
import com.vci.ubcs.code.service.*;
import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.code.wrapper.*;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@Service
public class DokingSysManaentServiceImpl extends ServiceImpl<DockingSystemConfigMapper, DockingSystemConfig> implements IDokingSysManaentService {


    /***
     * ä»»åŠ¡ç”ŸæˆæœåŠ¡
     */
    @Autowired( required = false)
    private IDockingTaskService dockingTaskService;


    /***
     * æ—¥å¿—生成服务
     */
    @Autowired( required = false)
    private IDockingLogeService dockingLogeService;

    /***
     * é›†æˆæŽ¥å£å¤´åè®®æœåŠ¡
     */
    @Autowired( required = false)
    private  IDockingSysIntHeaderService dockingSysIntHeaderService;
    /***
     * é›†æˆæŽ¥å£å‚数服务
     */
    @Autowired( required = false)
    private IDockingSysIntParamService dockingSysIntParamService;

    /***
     * å¾…集成数据服务
     */
    @Autowired( required = false)
    private  IDockingDataService dockingDataService;
    /**
     * data列表
     * @param dockingTask åŸºç¡€æŸ¥è¯¢å¯¹è±¡ï¼ŒåŒ…含查询条件，分页，排序等
     * @return ç³»ç»Ÿé›†æˆçš„系统信息显示对象列表
     */
    @Override
    public IPage<DockingTaskVO> gridDockingTask(DockingTask dockingTask, Query query) {
        IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingTask));
        return DockingTaskWrapper.build().pageVO(pages);
    }

    @Override
    public IPage<DockingDataVO> gridDockingData(DockingData dockingData, Query query) {
        IPage<DockingData> pages=dockingDataService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingData));
        return DockingDataWrapper.build().pageVO(pages);
    }

    /**
     * æŽ¨é€æ•°æ®é›†æˆæ—¥å¿—列表
     * @param dockingLog åŸºç¡€æŸ¥è¯¢å¯¹è±¡ï¼ŒåŒ…含查询条件，分页，排序等
     * @return é›†æˆæ—¥å¿—显示对象列表
     */
    @Override
    public IPage<DockingLogeVO> gridLoge(DockingLog dockingLog, Query query) {
        IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingLog));
        return DockingLogeWrapper.build().pageVO(pages);
    }

    @Override
    public IPage<DockingSysIntParamVO> gridParam(DockingSysIntParam dockingSysIntParam, Query query) {
        IPage<DockingSysIntParam> pages=dockingSysIntParamService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingSysIntParam));
        return DockingSysIntParamWrapper.build().pageVO(pages);
    }
    /**
     * æŽ¥å£param列表
     * @param dockingSysIntHeader åŸºç¡€æŸ¥è¯¢å¯¹è±¡ï¼ŒåŒ…含查询条件，分页，排序等
     * @return é›†æˆæ—¥å¿—显示对象列表
     */
    @Override
    public IPage<DockingSysIntHeaderVO> gridHeader(DockingSysIntHeader dockingSysIntHeader , Query query) {
        IPage<DockingSysIntHeader> pages = dockingSysIntHeaderService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingSysIntHeader));
        return DockingSysIntHeaderWrapper.build().pageVO(pages);
    }
}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java

@@ -361,16 +361,23 @@
            //参照的自行输入名称
            //分类注入的不用，都是导入后自动处理的
            //编码，状态等字段不导入
            List<CodeClassifyTemplateAttrVO> templateAttrVOS = codeClassifyTemplateVO.getAttributes().stream().filter(s ->
            List<CodeClassifyTemplateAttrVO> codeClassifyTemplateAttrVOList=codeClassifyTemplateVO.getAttributes();
            if(!CollectionUtils.isEmpty(codeClassifyTemplateAttrVOList)) {
                if (CollectionUtils.isEmpty(codeClassifyTemplateAttrVOList)) {
                    throw new VciBaseException("模板没有配置属性");
                }
            }
            List<CodeClassifyTemplateAttrVO> templateAttrVOS = codeClassifyTemplateAttrVOList.stream().filter(s ->
                !DEFAULT_ATTR_LIST.contains(s.getId())
                    && StringUtils.isBlank(s.getComponentRule())
                    && StringUtils.isBlank(s.getClassifyInvokeAttr())
                    && (isHistory || VciBaseUtil.getBoolean(s.getFormDisplayFlag()))
            ).collect(Collectors.toList());

            if(CollectionUtils.isEmpty(templateAttrVOS)){
                throw new VciBaseException("模板没有配置任何【表单显示】为【是】的属性");
            }
                if (CollectionUtils.isEmpty(templateAttrVOS)) {
                    throw new VciBaseException("模板没有配置任何【表单显示】为【是】的属性");
                }

            List<CodeClassifyTemplateAttrVO> idAttrVOList = codeClassifyTemplateVO.getAttributes().stream().filter(s -> s.getId().equalsIgnoreCase(CODE_FIELD)).collect(Collectors.toList());
            LinkedList<WriteExcelData> excelDataList = new LinkedList<>();
            Workbook workbook = new HSSFWorkbook();

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingTaskWrapper.java

@@ -12,8 +12,8 @@
import java.util.Objects;

public class DockingTaskWrapper extends BaseEntityWrapper<DockingTask, DockingTaskVO> {
    public static DockingSystemWrapper build() {
        return new DockingSystemWrapper();
    public static DockingTaskWrapper build() {
        return new DockingTaskWrapper();
    }
    @Override
    public DockingTaskVO entityVO(DockingTask entity) {