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

@@ -17,10 +17,13 @@
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javafx.scene.control.TableRow;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

@@ -56,6 +59,9 @@
    * 同步集成服务
    */
   private final    ICodeDuckingSyncService codeDuckingSyncService;

   /*@Value("${erp.item.btmName:XHDH}")
   private String ERP_ITEM_BTMNAME;*/

   /**系统集成的系统信息列表
    * @param queryObject 基础查询对象，包含查询条件，分页，排序等
@@ -130,7 +136,7 @@
      }
      query.setCurrent(queryObject.getPage());
      query.setSize(queryObject.getLimit());
      IPage<DockingSystemConfigVO>  pages=dockingSystemConfigService.page(condtionMap,query);
      IPage<DockingSystemConfigVO> pages= dockingSystemConfigService.page(condtionMap,query);
      return R.data(pages);
   }

@@ -254,33 +260,53 @@
      }
      query.setCurrent(queryObject.getPage());
      query.setSize(queryObject.getLimit());
      if(queryObject.getOrder().equals("asc")){
         query.setAscs(queryObject.getSort());
      }else{
         query.setDescs(queryObject.getSort());
      }

      IPage<DockingLogeVO> pages = dokingSysManaentService.gridLoge(condtionMap,query);
      return R.data(pages);
   }

   /**
    * 接口param列表
    * @param dockingSysIntParam 基础查询对象，包含查询条件，分页，排序等
    * @param queryObject 基础查询对象，包含查询条件，分页，排序等
    * @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);
   public R<IPage<DockingSysIntParamVO>>gridParam(BaseQueryObject queryObject){
      Map<String,String> condtionMap=queryObject.getConditionMap();
      Query query=new Query();
      if(CollectionUtils.isEmpty(condtionMap)){
         condtionMap=new HashMap<>();
      }
      query.setCurrent(queryObject.getPage());
      query.setSize(queryObject.getLimit());
      IPage<DockingSysIntParamVO> pages = dokingSysManaentService.gridParam(condtionMap,query);
      return R.data(pages);
   }

   /**
    * 接口param列表
    * @param dockingSysIntHeader 基础查询对象，包含查询条件，分页，排序等
    * @param queryObject 基础查询对象，包含查询条件，分页，排序等
    * @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);
   public R<IPage<DockingSysIntHeaderVO>>gridHeader(BaseQueryObject queryObject){
      Map<String,String> condtionMap=queryObject.getConditionMap();
      Query query=new Query();
      if(CollectionUtils.isEmpty(condtionMap)){
         condtionMap=new HashMap<>();
      }
      query.setCurrent(queryObject.getPage());
      query.setSize(queryObject.getLimit());
      IPage<DockingSysIntHeaderVO>  pages=dokingSysManaentService.gridHeader(condtionMap,query);
      return R.data(pages);


@@ -294,4 +320,18 @@
   public  R sendData(String oid){
      return codeDuckingSyncService.sendData(oid);
   }

   /***
    * 项目型号代号查询同步
    * @return
    */
   @PostMapping("/searchItemDataForERP")
   public R searchItemDataForERP(String endDate){
         try {
            codeDuckingSyncService.saveItemDataSyncScheduing(endDate);
            return R.success("同步成功");
         }catch (Throwable e){
          return   R.fail("同步失败");
         }
   }
}