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

@@ -7,12 +7,15 @@
import com.vci.ubcs.code.service.*;
import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.code.wrapper.*;
import com.vci.ubcs.starter.util.UBCSCondition;
import com.vci.ubcs.starter.util.UBCSSqlKeyword;
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;

import javax.annotation.Resource;
import java.util.Map;

@Service
public class DokingSysManaentServiceImpl extends ServiceImpl<DockingSystemConfigMapper, DockingSystemConfig> implements IDokingSysManaentService {
@@ -55,29 +58,30 @@
   private  IDockingDataService dockingDataService;
   /**
    * data列表
    * @param dockingTask 基础查询对象，包含查询条件，分页，排序等
    * @param condtionMap 基础查询对象，包含查询条件，分页，排序等
    * @return 系统集成的系统信息显示对象列表
    */
   @Override
   public IPage<DockingTaskVO> gridDockingTask(DockingTask dockingTask, Query query) {
      IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingTask));
   public IPage<DockingTaskVO> gridDockingTask(Map<String,String> condtionMap, Query query) {
      IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query),UBCSSqlKeyword.buildConditionByMapString(condtionMap));
      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));
   public IPage<DockingDataVO> gridDockingData(Map<String,String> condtionMap, Query query) {
      IPage<DockingData> pages=dockingDataService.page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(condtionMap));
      return DockingDataWrapper.build().pageVO(pages);
   }

   /**
    * 推送数据集成日志列表
    * @param dockingLog 基础查询对象，包含查询条件，分页，排序等
    * @param condtionMap 基础查询对象，包含查询条件，分页，排序等
    * @return 集成日志显示对象列表
    */
   @Override
   public IPage<DockingLogeVO> gridLoge(DockingLog dockingLog, Query query) {
      IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingLog));
   public IPage<DockingLogeVO> gridLoge(Map<String,String> condtionMap, Query query) {
      //IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingLog));
      IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(condtionMap));
      return DockingLogeWrapper.build().pageVO(pages);
   }