Source/BladeX/blade-service/blade-code/src/main/java/org/springblade/code/controller/CodeDuckingController.java

@@ -1,18 +1,27 @@
package org.springblade.code.controller;

import com.vci.mdm.dto.*;
import com.vci.mdm.model.*;
import com.vci.mdm.pagemodel.*;
import com.vci.mdm.service.CodeDuckingServiceI;
import com.vci.mdm.service.CodeDuckingSyncServiceI;
import com.vci.mdm.service.DockingPreApplyDataServiceI;
import com.vci.mdm.service.DockingPreAttrMappingSeviceI;

import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.util.ControllerUtil;
import org.springblade.code.dto.CodeOrderDTO;
import org.springblade.code.dto.DockingPreApplyDataDTO;
import org.springblade.code.dto.DockingPreAttrMappingDTO;
import org.springblade.code.dto.PreApplyCodeOrderDTO;
import org.springblade.code.model.DockingDataDO;
import org.springblade.code.model.DockingLogeDO;
import org.springblade.code.model.DockingTaskDO;
import org.springblade.code.model.SysIntHeaderDO;
import org.springblade.code.service.CodeDuckingServiceI;
import org.springblade.code.service.CodeDuckingSyncServiceI;
import org.springblade.code.service.DockingPreApplyDataServiceI;
import org.springblade.code.service.DockingPreAttrMappingSeviceI;
import org.springblade.code.vo.pagemodel.DockingPreApplyDataVO;
import org.springblade.code.vo.pagemodel.DockingPreAttrMappingVO;
import org.springblade.code.vo.pagemodel.DockingPreAttrRangeVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -21,8 +30,7 @@
import java.util.List;
import java.util.Map;

import static com.vci.mdm.constant.MdmDuckingConstant.DATA_LOGE_OUT;

import static org.springblade.code.constant.MdmDuckingConstant.DATA_LOGE_OUT;

/**
 * 主数据编码通用集成控制器
@@ -83,7 +91,7 @@
     * @return
     */
    @GetMapping("/gridApplyData")
    public DataGrid<Map<String,String>> gridApplyData(String codeClassifyOid,String templateOid,String btmType,String dataOids){
    public DataGrid<Map<String,String>> gridApplyData(String codeClassifyOid, String templateOid, String btmType, String dataOids){
        return  dockingPreApplyDataServiceI.gridApplyData(codeClassifyOid,templateOid,btmType,dataOids);
    }

@@ -201,7 +209,7 @@
    public DataGrid<DockingLogeDO> gridLoge(BaseQueryObject baseQueryObject){
        if(baseQueryObject == null){
            baseQueryObject = new BaseQueryObject();
            Map<String, String>  queryMap = baseQueryObject.getConditionMap();
            Map<String, String> queryMap = baseQueryObject.getConditionMap();
            queryMap.put("type",DATA_LOGE_OUT);
        }
        return codeDuckingServiceI.gridLoge(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
@@ -241,7 +249,7 @@
     * @return
     */
    @GetMapping("/gridAttrMapping")
    public DataGrid<DockingPreAttrMappingVO> gridAttrMappings(String sourceClsfId,String templateOid,int type, BaseQueryObject baseQueryObject){
    public DataGrid<DockingPreAttrMappingVO> gridAttrMappings(String sourceClsfId, String templateOid, int type, BaseQueryObject baseQueryObject){
        if(baseQueryObject == null){
            baseQueryObject = new BaseQueryObject();
        }
@@ -256,7 +264,7 @@
     * @return
     */
    @GetMapping("/gridAttrRanges")
    public DataGrid<DockingPreAttrRangeVO> gridAttrRanges(String attrOid,int type,BaseQueryObject baseQueryObject){
    public DataGrid<DockingPreAttrRangeVO> gridAttrRanges(String attrOid, int type, BaseQueryObject baseQueryObject){
        if(baseQueryObject == null){
            baseQueryObject = new BaseQueryObject();
        }