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-core/src/main/java/com/fzzy/igds/service/DicAreaService.java |   91 +++++++++++++++++++++++----------------------
 1 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DicAreaService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DicAreaService.java
index 897a806..8504f54 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DicAreaService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DicAreaService.java
@@ -3,11 +3,8 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fzzy.igds.domain.DicArea;
 import com.fzzy.igds.mapper.DicAreaMapper;
-import com.fzzy.igds.repository.DicAreaRepository;
 import com.ruoyi.common.utils.StringUtils;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.domain.Specification;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
@@ -17,67 +14,62 @@
  * @Author CZT
  * @Date 2025/11/25 16:23
  */
-@Service("sys.dicAreaService")
+@Service
 public class DicAreaService {
 
     @Resource
-    private DicAreaRepository dicAreaRepository;
-    @Resource
     private DicAreaMapper dicAreaMapper;
 
-    /**
-     * JPA鍒嗛〉鏌ヨ鏁版嵁
-     *
-     * @param pageable
-     */
-    public Page<DicArea> findAll(Pageable pageable) {
-        return dicAreaRepository.findAll(pageable);
+    public void listPageData(Page<DicArea> page, String key) {
+
+        QueryWrapper<DicArea> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(key)) {
+            queryWrapper.like("name", key);
+        }
+
+        dicAreaMapper.selectPage(page, queryWrapper);
     }
 
     /**
-     * JPA鍒嗛〉鏌ヨ鏁版嵁
-     *
-     * @param specification
-     * @param pageable
-     * @return
-     */
-    public Page<DicArea> findAll(Specification<DicArea> specification, Pageable pageable) {
-        return dicAreaRepository.findAll(specification, pageable);
-    }
-
-    /**
-     * JPA鏍规嵁鐖剁紪鐮佹煡璇㈠尯鍩熶俊鎭�
+     * 鏍规嵁鐖剁紪鐮佹煡璇㈠尯鍩熶俊鎭�
      *
      * @param parentCode
      * @return
      */
-    public List<DicArea> getDicAreaByParentCode(String parentCode) {
-        if(StringUtils.isEmpty(parentCode)){
-            return dicAreaRepository.findAll();
+    public List<DicArea> listData(String parentCode, String name, String code) {
+
+        QueryWrapper<DicArea> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(parentCode)) {
+            queryWrapper.like("parent_code", parentCode);
         }
-        return dicAreaRepository.getDicAreaByParentCode(parentCode);
+        if (StringUtils.isNotBlank(name)) {
+            queryWrapper.like("name", name);
+        }
+        if (StringUtils.isNotBlank(code)) {
+            queryWrapper.like("code", code);
+        }
+        return dicAreaMapper.selectList(queryWrapper);
     }
 
     /**
-     * JPA淇濆瓨鏁版嵁
+     * 淇濆瓨鏁版嵁
      *
      * @param data
      * @return
      */
     public String saveDicArea(DicArea data) {
-        dicAreaRepository.save(data);
+        dicAreaMapper.insert( data);
         return null;
     }
 
-
     /**
-     * JPA鍒犻櫎鏁版嵁
+     * 鍒犻櫎鏁版嵁
      *
      * @param data
      * @return
      */
     public String delDicArea(DicArea data) {
-        dicAreaRepository.delete(data);
+        dicAreaMapper.deleteById(data);
         return null;
     }
 
@@ -88,7 +80,11 @@
      * @return
      */
     public DicArea listDicAreaByName(String name) {
-        return dicAreaRepository.listDicAreaByName(name);
+        List<DicArea> list = this.listData(null, name, null);
+        if(null == list || list.isEmpty()){
+            return null;
+        }
+        return list.get(0);
     }
 
     /**
@@ -98,9 +94,12 @@
      * @return
      */
     public DicArea listDicAreaByCode(String code) {
-        return dicAreaRepository.listDicAreaByCode(code);
+        List<DicArea> list = this.listData(null, null, code);
+        if(null == list || list.isEmpty()){
+            return null;
+        }
+        return list.get(0);
     }
-
 
     /**
      * 妯＄硦鏌ヨ
@@ -109,16 +108,18 @@
      * @return
      */
     public List<DicArea> listDicArea(String key) {
-        if(null == key){
-            return dicAreaMapper.selectList(null);
-        }
-
 
         QueryWrapper<DicArea> queryWrapper = new QueryWrapper<>();
-        if(StringUtils.isNotEmpty(key)){
+        if (StringUtils.isNotBlank(key)) {
             queryWrapper.like("name", key);
-            queryWrapper.like("code", key);
         }
-        return dicAreaMapper.selectList(queryWrapper);
+        List<DicArea> dicAreas = dicAreaMapper.selectList(queryWrapper);
+
+        if (null == dicAreas || dicAreas.isEmpty()) {
+            queryWrapper = new QueryWrapper<>();
+            queryWrapper.like("code", key);
+            dicAreas = dicAreaMapper.selectList(queryWrapper);
+        }
+        return dicAreas;
     }
 }

--
Gitblit v1.9.3