Merge remote-tracking branch 'origin/master'

linwe

2023-12-19 7b6ad0f09bfc5cd45a1aacfdfe55e69a02b9ff26

Merge remote-tracking branch 'origin/master'

 src/main/java/org/springblade/modules/category/controller/CategoryController.java

@@ -22,8 +22,6 @@
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import javax.validation.Valid;

import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -34,7 +32,6 @@
import org.springblade.modules.category.vo.CategoryVO;
import org.springblade.modules.category.wrapper.CategoryWrapper;
import org.springblade.modules.category.service.ICategoryService;
import org.springblade.core.boot.ctrl.BladeController;

/**
 * 天地图poi 分类表 控制器
@@ -122,5 +119,13 @@
        return R.status(categoryService.removeByIds(Func.toLongList(ids)));
    }

    /**
     * 天地图poi 分类获取
     */
    @GetMapping("/getCategory")
    public R getCategory(CategoryVO category) {
        return R.data(categoryService.getCategory(category));
    }


}

 src/main/java/org/springblade/modules/category/mapper/CategoryMapper.java

@@ -16,6 +16,7 @@
 */
package org.springblade.modules.category.mapper;

import org.apache.ibatis.annotations.Param;
import org.springblade.modules.category.entity.CategoryEntity;
import org.springblade.modules.category.vo.CategoryVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -40,4 +41,8 @@
    List<CategoryVO> selectCategoryPage(IPage page, CategoryVO category);


    /**
     * 天地图poi 分类获取
     */
    List<CategoryVO> getCategory(@Param("category") CategoryVO category);
}

 src/main/java/org/springblade/modules/category/mapper/CategoryMapper.xml

@@ -15,10 +15,22 @@
        <result column="is_deleted" property="isDeleted"/>
    </resultMap>


    <!--自定义分页查询-->
    <select id="selectCategoryPage" resultMap="categoryResultMap">
        select * from jczz_category where is_deleted = 0
    </select>

    <!--天地图poi 分类获取-->
    <select id="getCategory" resultType="org.springblade.modules.category.vo.CategoryVO">
        select * from jczz_category
        where is_deleted = 0
        <if test="category.level!=null">
            and level = #{category.level}
        </if>
        <if test="category.parentNo!=null and category.parentNo!=''">
            and parent_no = #{category.parentNo}
        </if>
    </select>


</mapper>

 src/main/java/org/springblade/modules/category/service/ICategoryService.java

@@ -40,4 +40,8 @@
    IPage<CategoryVO> selectCategoryPage(IPage<CategoryVO> page, CategoryVO category);


    /**
     * 天地图poi 分类获取
     */
    Object getCategory(CategoryVO category);
}

 src/main/java/org/springblade/modules/category/service/impl/CategoryServiceImpl.java

@@ -39,5 +39,11 @@
        return page.setRecords(baseMapper.selectCategoryPage(page, category));
    }


    /**
     * 天地图poi 分类获取
     */
    @Override
    public Object getCategory(CategoryVO category) {
        return baseMapper.getCategory(category);
    }
}