区域管理懒加载

kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Address.java

@@ -4,13 +4,11 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.cloud.kicc.common.data.entity.CommonEntity;
-import com.cloud.kicc.common.data.entity.TreeEntity;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.apache.poi.ss.formula.functions.T;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,7 +22,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName(value="sys_area")
+@TableName(value="sys_address")
 public class Address extends CommonEntity {
     /** 编号 **/
     @ApiModelProperty("id")
@@ -49,6 +47,9 @@ public class Address extends CommonEntity {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     protected List<Address> children = new ArrayList();
 
+    @ApiModelProperty("标识字段")
+    @TableField(exist = false)
+    private String fooLevel;
 //    @ApiModelProperty("层级")
 //    private Integer level;
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/AddressController.java

@@ -1,30 +1,15 @@
 package com.cloud.kicc.system.controller;
 
-import cn.hutool.core.lang.tree.Tree;
-import cn.hutool.core.lang.tree.TreeNode;
-import cn.hutool.core.lang.tree.TreeNodeConfig;
-import cn.hutool.core.lang.tree.TreeUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.system.api.entity.Address;
-import com.cloud.kicc.system.api.entity.Dept;
-import com.cloud.kicc.system.api.entity.User;
 import com.cloud.kicc.system.service.AddressService;
 import com.cloud.kicc.system.service.UserService;
-import com.sun.org.apache.bcel.internal.generic.NEW;
 import io.swagger.annotations.Api;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 /**
  * @Author: TangSheng
  * @Description: 地址管理
@@ -85,81 +70,22 @@ public class AddressController {
         return R.ok(addressService.getById(id));
     }
 
-
     /**
-     * 查询根据条件
+     * 查询地址列表
      * @return
      */
-//    @GetMapping("/list")
-//    public R list(Address address) {
-//        List<Address> addressList = addressService.queryList(address);
-//        return R.ok(addressList, addressList.size());
-//    }
     @GetMapping("/list")
     public R list(Address address){
-        List<Address> addressList = addressService.list(getQueryWrapper(address));
-        //配置
-        TreeNodeConfig treeNodeConfig = new TreeNodeConfig();
-        treeNodeConfig.setIdKey("id");
-        treeNodeConfig.setParentIdKey("parent_id");
-        treeNodeConfig.setNameKey("name");
-        treeNodeConfig.setWeightKey("sort");
-        //最大递归深度
-        treeNodeConfig.setDeep(3);
-        //转换器
-        List<Tree<String>> treeNodes = TreeUtil.build(addressList,"0",treeNodeConfig,(treeNode,tree)->{
-            tree.setId(treeNode.getId());
-            tree.setParentId(treeNode.getParentId());
-            tree.setName(treeNode.getName());
-            tree.setWeight(treeNode.getSort());
-        });
-        return R.ok(addressList,addressList.size());
-    }
-    /**
-     * 加载地址机构树
-     * */
-    @GetMapping("/addrTree")
-    public R addrTree(){
-        List<Address> addrList = addressService.list(new LambdaQueryWrapper<Address>().orderByAsc(Address::getSort));
-        return R.ok(addressService.buildTree(addrList,"0"));
+        return R.ok(addressService.queryList(address));
     }
+
     /**
-     * 根据parentIds列表查询list
-     * @param parentIds
+     * 查询地址列表
      * @return
      */
-    @GetMapping("/queryByParentIds/{ids}")
-    public R queryByParentIds(@PathVariable("ids") String[] parentIds) {
-        if (ObjectUtil.isEmpty(parentIds)) {
-            return R.ok(new ArrayList<>(), 0);
-        }
-        List<Address> addressList = addressService.queryListByParentIds(Arrays.asList(parentIds));
-        return R.ok(addressList, addressList.size());
+    @GetMapping("/lazyList")
+    public R lazyList(String parentId){
+        return R.ok(addressService.lazyList(parentId));
     }
 
-
-    private LambdaQueryWrapper<Address> getQueryWrapper(Address address) {
-
-        return  Wrappers.<Address>lambdaQuery()
-                .like(StrUtil.isNotBlank(address.getName()), Address::getName,address.getName())
-                .eq(StrUtil.isNotBlank(address.getParentId()), Address::getParentId, address.getParentId())
-                .between(StrUtil.isNotBlank(address.getBeginTime()) && StrUtil.isNotBlank(address.getEndTime()), Address::getCreateTime, address.getBeginTime(), address.getEndTime())
-                .like(StrUtil.isNotBlank(address.getCode()),Address::getCode, address.getCode())
-                .like(StrUtil.isNotBlank(address.getId()),Address::getId,address.getId())
-                .orderByAsc(Address::getSort);
-
-    }
-
-//    /**
-//     * 根据parentIds列表查询list
-//     * @return
-//     */
-//    @ApiOperation(value = "根据parentId列表查询list")
-//    @GetMapping("/list")
-//    public R queryByParentId( Address address) {
-//        List<Address> addressList = addressService.list(Wrappers.<Address>lambdaQuery().eq(Address::getParentId, address.getParentId()));
-//        return R.ok(addressList, addressList.size());
-//    }
-
-
 }

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/AddressMapper.java

@@ -2,7 +2,6 @@ package com.cloud.kicc.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cloud.kicc.system.api.entity.Address;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,18 +13,8 @@ import java.util.List;
  */
 public interface AddressMapper extends BaseMapper<Address> {
 
-    /**
-     * 分页条件查询
-     * @param param
-     * @return
-     */
-    List<Address> queryList(@Param("param") Address param);
+    List<Address> lazyList(String parentId);
 
-    /**
-     * 查询根据parentId列表
-     * @param list
-     * @return
-     */
-    List<Address> queryListByParentIds(@Param("list") List<String> list);
+    List<Address> queryList(Address address);
 
 }

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/AddressService.java

@@ -2,33 +2,16 @@ package com.cloud.kicc.system.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.system.api.entity.Address;
-import com.cloud.kicc.system.api.entity.Dept;
 
 import java.util.List;
 
-/**
- * @Author: TangSheng
- * @Description:
- * @Since 1.0
- * @Date Created in 10:23 2022/3/21
- */
+
 public interface AddressService extends IService<Address> {
 
-    /**
-     * 查询list
-     * @param address
-     * @return
-     */
-    List<Address> queryList(Address address);
 
-    /**
-     * 查询根据parentId列表
-     * @param list
-     * @return
-     */
-    List<Address> queryListByParentIds(List<String> list);
-    List<Address> buildTree(List<Address> list, String parentId);
+    List<Address> lazyList(String parentId);
+
+    List<Address> queryList(Address address);
 
 }

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/AddressServiceImpl.java

@@ -1,27 +1,18 @@
 package com.cloud.kicc.system.service.impl;
 
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cloud.kicc.system.api.entity.Address;
-import com.cloud.kicc.system.api.entity.Dept;
 import com.cloud.kicc.system.mapper.AddressMapper;
 import com.cloud.kicc.system.service.AddressService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
-/**
- * @Author: TangSheng
- * @Description: 地址管理业务实现
- * @Since 1.0
- * @Date Created in 10:24 2022/3/21
- */
 @Service
 @RequiredArgsConstructor
 @Slf4j
@@ -30,62 +21,27 @@ public class AddressServiceImpl extends ServiceImpl<AddressMapper, Address> impl
 
     @Override
     public List<Address> queryList(Address address) {
-        return this.baseMapper.queryList(address);
+        List<Address> addressList = this.baseMapper.queryList(address);
+        return addressList.stream().filter(item ->"1".equals(item.getFooLevel()))
+                .map(item -> {
+                    List<Address> addresses = addressList.stream().filter(e -> "1".equals(item.getFooLevel())).collect(Collectors.toList());
+                    if(addresses.size() != 0) {
+                        item.setChildren(addresses);
                     }
-
-    @Override
-    public List<Address> queryListByParentIds(List<String> list) {
-        return this.baseMapper.queryListByParentIds(list);
+                    return item;
+                }).collect(Collectors.toList());
     }
 
     @Override
-    public List<Address> buildTree(List<Address> list, String parentId){
-        List<Address> addrList = new ArrayList();
-        for (Iterator<Address> iterator = list.iterator(); iterator.hasNext(); ) {
-            Address t = iterator.next();
-            if (StrUtil.equals(t.getParentId(), parentId)) {
-                recursion(list, t);
-                addrList.add(t);
-            }
+    public List<Address> lazyList(String parentId) {
+        List<Address> addressList = this.baseMapper.lazyList(parentId);
+        return addressList.stream().filter(item -> item.getParentId().equals(parentId))
+                .map(item -> {
+                    List<Address> address = addressList.stream().filter(e -> e.getParentId().equals(item.getId())).collect(Collectors.toList());
+                    if(address.size() != 0) {
+                        item.setChildren(address);
                     }
-        return addrList;
-    }
-
-    /** 递归列表 */
-    private void recursion(List<Address> list, Address addr) {
-        // 得到子节点列表
-        List<Address> childList = getChildList(list, addr);
-        addr.setChildren(childList);
-        for (Address tChild : childList) {
-            if (hasChild(list, tChild)) {
-                // 判断是否有子节点
-                Iterator<Address> it = childList.iterator();
-                while (it.hasNext()) {
-                    Address n = (Address) it.next();
-                    recursion(list, n);
+                    return item;
+                }).collect(Collectors.toList());
     }
-            }
-        }
-    }
-
-    /** 得到子节点列表 */
-    private List<Address> getChildList(List<Address> list, Address addr) {
-        List<Address> addrList = new ArrayList() ;
-        Iterator<Address> it = list.iterator();
-        while (it.hasNext()) {
-            Address n = it.next();
-            if (StrUtil.equals(n.getParentId(), addr.getId())) {
-                addrList.add(n);
-            }
-        }
-        return addrList;
-    }
-
-    /** 判断是否有子节点 */
-    private boolean hasChild(List<Address> list, Address t) {
-        return getChildList(list, t).size() > 0 ? true : false;
-    }
-
-
-
 }

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/Address.xml

@@ -18,63 +18,57 @@
         <result column="update_by_name" property="updateByName"/>
         <result column="update_time" property="updateTime"/>
         <result column="remarks" property="remarks"/>
+        <result column="del_flag" property="delFlag" />
+        <result column="begin_time" property="beginTime"/>
+        <result column="end_time" property="endTime"/>
     </resultMap>
 
 
     <select id="queryList" resultType="com.cloud.kicc.system.api.entity.Address">
-        SELECT code,  (select count(code)=0 from sys_area a2 where a2.parent_id = a.code) , parent_id,
-        name, sort, create_by_id,
-        create_by_name, create_time,
-        update_by_id, update_by_name, update_time,
-        remarks, tenant_id
-        FROM sys_area a
-        <where>
-            <if test="param.code != null">
-                AND a.code = #{param.code}
+
+                SELECT * FROM
+                (
+                SELECT *, '1' as 'fooLevel' FROM sys_address
+                    where
+                    <if test="name!=null and name!=''">
+                        name like concat('%',#{name},'%')
+                    </if>
+                    <if test="id!=null and id!=''">
+                       and id like concat('%',#{id},'%')
+                    </if>
+                    <if test="createTime!= null and createTime!=''">
+                        and createTime between #{beginTime} and #{endTime}
+                    </if>
+
+                UNION ALL
+                SELECT T2.*, '2' as 'fooLevel'  FROM
+                (SELECT id FROM sys_address where
+                    <if test="name!=null and name!=''">
+                        name like concat('%',#{name},'%')
                     </if>
-<!--            <if test="param.level != null and param.level != 0">-->
-<!--                AND a.level = #{param.level}-->
-<!--            </if>-->
-            <if test="param.name != null">
-                AND a.name = #{param.name}
+                    <if test="id!=null and id!=''">
+                        and id like concat('%',#{id},'%')
                     </if>
-            <if test="param.parentId != null">
-                AND a.parent_id = #{param.parentId}
+                    <if test="createTime!= null and createTime!=''">
+                        and createTime between #{beginTime} and #{endTime}
                     </if>
-        </where>
+
+                ) T1,
+                sys_address T2
+                WHERE T1.id = T2.parent_id
+            ) result where del_flag ='0'
         ORDER BY sort ASC
     </select>
-<!--<select id="queryList" resultType="com.cloud.kicc.system.api.entity.Address">-->
-<!--    select parent_id,name,code,level,sort,(select count(code)=0 from sys_address a2 where a2.parent_id = a.code) from sys_address a-->
-<!--            <where>-->
-<!--                <if test="param.code != null">-->
-<!--                    AND a.code = #{param.code}-->
-<!--                </if>-->
-<!--                <if test="param.level != null and param.level != 0">-->
-<!--                    AND a.level = #{param.level}-->
-<!--                </if>-->
-<!--                <if test="param.name != null">-->
-<!--                    AND a.name = #{param.name}-->
-<!--                </if>-->
-<!--                <if test="param.parentId != null">-->
-<!--                    AND a.parent_id = #{param.parentId}-->
-<!--                </if>-->
-<!--            </where>-->
-<!--            ORDER BY sort ASC-->
 
-<!--</select>-->
-    <select id="queryListByParentIds" resultType="com.cloud.kicc.system.api.entity.Address">
-        SELECT code,  (select count(code)=0 from sys_area a2 where a2.parent_id = a.code), parent_id,
-        name, sort, create_by_id,
-        create_by_name, create_time,
-        update_by_id, update_by_name, update_time,
-        remarks, tenant_id
-        FROM sys_area a
-        <where>
-            <foreach item="item" index="index" collection="list"
-                     open="parent_id in (" separator="," close=")" nullable="true">
-                #{item}
-            </foreach>
-        </where>
+    <select id="lazyList" resultType="com.cloud.kicc.system.api.entity.Address">
+        SELECT * FROM
+        (
+         SELECT * FROM sys_address where parent_id = #{parent_id}
+         UNION ALL
+         SELECT T2.* FROM (SELECT id FROM sys_address where parent_id = #{parent_id}) T1, sys_address T2
+         WHERE T1.id = T2.parent_id
+        )result where  del_flag ='0'
+        ORDER BY sort ASC
     </select>
+
 </mapper>

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/test/testDemo.java

@@ -1,9 +1,3 @@
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.IdcardUtil;
-
-
 /**
  * @Author: lizhi
  * @Description:
@@ -12,11 +6,6 @@ import cn.hutool.core.util.IdcardUtil;
  */
 public class testDemo {
     public static void main(String[] args) {
-      String IdCard18 = "523485241251412521";
-      String IdCard15 = "135248524214562";
-      boolean valid18 = IdcardUtil.isValidCard(IdCard18);
-      boolean valid15 = IdcardUtil.isValidCard(IdCard15);
-        System.out.println(valid18);
-        System.out.println(valid15);
+
     }
 }