From 096296cd7485c5583c8194d88cca700e3c4d84a0 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 01 十二月 2025 16:50:42 +0800
Subject: [PATCH] 调整基础配置信息查询方式，取消jpa
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/DicAreaPR.java | 39 ++++++---------------------------------
1 files changed, 6 insertions(+), 33 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DicAreaPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DicAreaPR.java
index 834a3b8..982766c 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DicAreaPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DicAreaPR.java
@@ -6,20 +6,10 @@
import com.bstek.dorado.data.provider.Page;
import com.fzzy.igds.domain.DicArea;
import com.fzzy.igds.service.DicAreaService;
-import com.ruoyi.common.utils.StringUtils;
import org.springframework.beans.BeanUtils;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -40,31 +30,14 @@
*/
@DataProvider
public void pageList(Page<DicArea> page, String key) {
- //澶氬弬鏁板垎椤垫煡璇�
- Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.ASC, DicArea.SORT_PROP);
- if (StringUtils.isEmpty(key)) {
- org.springframework.data.domain.Page<DicArea> japPage = dicAreaService.findAll(pageable);
- page.setEntityCount((int) japPage.getTotalElements());
- page.setEntities(japPage.getContent());
+ com.baomidou.mybatisplus.extension.plugins.pagination.Page<DicArea> corePage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page.getPageNo(), page.getPageSize());
- return;
- }
- Specification<DicArea> specification = new Specification<DicArea>() {
- private static final long serialVersionUID = 1L;
+ dicAreaService.listPageData(corePage, key);
- public Predicate toPredicate(Root<DicArea> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
- List<Predicate> predicates = new ArrayList<Predicate>(); //鎵�鏈夌殑鏂█
-
- Predicate predicate1 = cb.like(root.get("name"), "%" + key + "%");
- predicates.add(predicate1);
-
- return cb.and(predicates.toArray(new Predicate[0]));
- }
- };
- org.springframework.data.domain.Page<DicArea> japPage = dicAreaService.findAll(specification, pageable);
- page.setEntityCount((int) japPage.getTotalElements());
- page.setEntities(japPage.getContent());
+ // 閲嶆柊灏佽
+ page.setEntities(corePage.getRecords());
+ page.setEntityCount(Integer.parseInt(String.valueOf(corePage.getTotal())));
}
/**
@@ -72,7 +45,7 @@
*/
@DataProvider
public List<DicArea> getDicAreaByParentCode(String parentCode) {
- return dicAreaService.getDicAreaByParentCode(parentCode);
+ return dicAreaService.listData(parentCode, null, null);
}
/**
--
Gitblit v1.9.3