From 5b983ea27aa307a4f1396b09c06312b5c34f5d42 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 六月 2024 15:20:40 +0800
Subject: [PATCH] 修改系统初始化功能部分,增加了省级行政区划

---
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java |   33 ++++++++++++++++++++++-----------
 1 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
index 724f737..89f37a1 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
@@ -1,17 +1,16 @@
 package com.dy.pipIrrBase.block;
 
-import com.alibaba.fastjson2.JSON;
 import com.dy.common.webUtil.QueryResultVo;
 import com.dy.pipIrrGlobal.daoBa.BaBlockMapper;
 import com.dy.pipIrrGlobal.pojoBa.BaBlock;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.common.utils.PojoUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.apache.commons.beanutils.BeanUtils ;
+import org.springframework.transaction.annotation.Transactional;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @Service
@@ -33,24 +32,33 @@
         return this.dao.selectByPrimaryKey(id) ;
     }
 
+
+    /**
+     * 寰楀埌鎵�鏈夌墖鍖�
+     * @return 鎵�鏈夌墖鍖洪泦鍚�
+     */
+    public QueryResultVo<List<BaBlock>> selectAll(){
+        QueryResultVo<List<BaBlock>> rsVo = new QueryResultVo<>() ;
+        rsVo.obj = this.dao.selectAll() ;
+        return rsVo ;
+    }    
     /**
      * 寰楀埌涓�涓墖鍖�
      * @param vo 鏌ヨ鏉′欢鍊煎璞�
      * @return 鐗囧尯瀹炰綋
      */
-    public QueryResultVo<List<BaBlock>> selectSome(QueryVo vo) throws Exception{
-        Map<String, Object> params = new HashMap<>();
-        BeanUtils.populate(vo, params);
+    @SuppressWarnings("unchecked")
+    public QueryResultVo<List<BaBlock>> selectSome(QueryVo vo){
+        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo) ;
         Long itemTotal = this.dao.selectTotal(params) ;
 
         QueryResultVo<List<BaBlock>> rsVo = new QueryResultVo<>() ;
         rsVo.pageSize = vo.pageSize ;
         rsVo.pageCurr = vo.pageCurr ;
         rsVo.calculateAndSet(itemTotal, params);
+        rsVo.obj = this.dao.selectSome(params) ;
 
-        List<BaBlock> list = this.dao.selectSome(params) ;
-
-        return (QueryResultVo.<List<BaBlock>>builder().content(list)).build() ;
+        return rsVo ;
     }
 
     /**
@@ -58,8 +66,9 @@
      * @param po 瀹炰綋
      * @return 鏁伴噺
      */
+    @Transactional
     public int save(BaBlock po){
-        return this.dao.insert(po) ;
+        return this.dao.putin(po) ;
     }
 
     /**
@@ -67,6 +76,7 @@
      * @param po 瀹炰綋
      * @return 鏁伴噺
      */
+    @Transactional
     public int update(BaBlock po){
         return this.dao.updateByPrimaryKeySelective(po) ;
     }
@@ -76,6 +86,7 @@
      * @param id 瀹炰綋ID
      * @return 鏁伴噺
      */
+    @Transactional
     public int delete(Long id){
         return this.dao.deleteLogicById(id) ;
     }

--
Gitblit v1.8.0