diff --git a/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseConfigController.java index 4cdfcc2..d090869 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseConfigController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseConfigController.java @@ -4,12 +4,19 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletResponse; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -35,18 +42,21 @@ public class BaseConfigController extends BaseController /** * 查询基础配置-账户配置、小程序配置的内容列表 */ + @PreAuthorize("@ss.hasPermi('base:config:list')") @GetMapping("/list") public AjaxResult list(BaseConfig baseConfig, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) + @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { - Page page = new Page<>(pageNo, pageSize); - return success(baseConfigService.queryListPage(baseConfig,page)); + Page page = new Page<>(pageNum, pageSize); + IPage list = baseConfigService.queryListPage(baseConfig,page); + return success(list); } /** * 导出基础配置-账户配置、小程序配置的内容列表 */ + @PreAuthorize("@ss.hasPermi('base:config:export')") @Log(title = "基础配置-账户配置、小程序配置的内容", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, BaseConfig baseConfig) @@ -59,6 +69,7 @@ public class BaseConfigController extends BaseController /** * 获取基础配置-账户配置、小程序配置的内容详细信息 */ + @PreAuthorize("@ss.hasPermi('base:config:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { @@ -68,6 +79,7 @@ public class BaseConfigController extends BaseController /** * 新增基础配置-账户配置、小程序配置的内容 */ + @PreAuthorize("@ss.hasPermi('base:config:add')") @Log(title = "基础配置-账户配置、小程序配置的内容", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody BaseConfig baseConfig) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/base/mapper/BaseConfigMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/base/mapper/BaseConfigMapper.java index dc9a609..89cd558 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/base/mapper/BaseConfigMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/base/mapper/BaseConfigMapper.java @@ -1,13 +1,12 @@ package com.ruoyi.base.mapper; import java.util.List; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.base.domain.BaseConfig; +import org.apache.ibatis.annotations.Param; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; /** * 基础配置-账户配置、小程序配置的内容Mapper接口 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseConfigService.java b/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseConfigService.java index fbbcfd6..acd7fb3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseConfigService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseConfigService.java @@ -1,7 +1,6 @@ package com.ruoyi.base.service; import java.util.List; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseConfigServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseConfigServiceImpl.java index e7e626c..a0e98a8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseConfigServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseConfigServiceImpl.java @@ -1,10 +1,9 @@ package com.ruoyi.base.service.impl; import java.util.List; - +import com.ruoyi.common.utils.DateUtils; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/ruoyi-admin/src/main/resources/mapper/base/BaseConfigMapper.xml b/ruoyi-admin/src/main/resources/mapper/base/BaseConfigMapper.xml index cd75d0e..b285e37 100644 --- a/ruoyi-admin/src/main/resources/mapper/base/BaseConfigMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/base/BaseConfigMapper.xml @@ -18,9 +18,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, code, json_str, creator, create_time, updater, update_time, del_flag from dl_base_config - + + + and code = #{entity.code} + and json_str = #{entity.jsonStr} + - - \ No newline at end of file diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm index ddd0c27..d176f03 100644 --- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm @@ -4,8 +4,11 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; @@ -45,10 +48,12 @@ public class ${ClassName}Controller extends BaseController @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')") @GetMapping("/list") #if($table.crud || $table.sub) - public AjaxResult list(${ClassName} ${className}) + public AjaxResult list(${ClassName} ${className}, + @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { - - List<${ClassName}> list = ${className}Service.list(); + Page<${ClassName}> page = new Page<>(pageNum, pageSize); + IPage<${ClassName}> list = ${className}Service.queryListPage(${className},page); return success(list); } #elseif($table.tree) @@ -113,6 +118,6 @@ public class ${ClassName}Controller extends BaseController public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) { List<${pkColumn.javaType}> list = new ArrayList<>(Arrays.asList(${pkColumn.javaField}s)); - return toAjax(${className}Service.removeBatchByIds(list)); + return toAjax(${className}Service.removeByIds(list)); } } diff --git a/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm index 2f1996c..7eb8ddc 100644 --- a/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm @@ -1,7 +1,10 @@ package ${packageName}.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import ${packageName}.domain.${ClassName}; +import org.apache.ibatis.annotations.Param; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; #if($table.sub) @@ -17,5 +20,5 @@ import ${packageName}.domain.${subClassName}; @Mapper public interface ${ClassName}Mapper extends BaseMapper<${ClassName}> { - + IPage<${ClassName}> queryListPage(@Param("entity") ${ClassName} entity, Page<${ClassName}> page); } diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-generator/src/main/resources/vm/java/service.java.vm index 0db15de..ac1d1b1 100644 --- a/ruoyi-generator/src/main/resources/vm/java/service.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/service.java.vm @@ -1,6 +1,8 @@ package ${packageName}.service; import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import ${packageName}.domain.${ClassName}; @@ -12,5 +14,5 @@ import ${packageName}.domain.${ClassName}; */ public interface I${ClassName}Service extends IService<${ClassName}> { - + IPage<${ClassName}> queryListPage(${ClassName} pageReqVO, Page<${ClassName}> page); } diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm index ec11e9f..04b1e77 100644 --- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -7,6 +7,8 @@ import com.ruoyi.common.utils.DateUtils; #break #end #end +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -32,5 +34,8 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper,${Cl @Autowired private ${ClassName}Mapper ${className}Mapper; - + @Override + public IPage<${ClassName}> queryListPage(${ClassName} pageReqVO, Page<${ClassName}> page) { + return ${className}Mapper.queryListPage(pageReqVO, page); + } } diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm index 07bd9b8..cdce0b3 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -448,8 +448,8 @@ export default { #end #end list${BusinessName}(this.queryParams).then(response => { - this.${businessName}List = response.rows; - this.total = response.total; + this.${businessName}List = response.data.records; + this.total = response.data.total; this.loading = false; }); }, diff --git a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm index 5a6f3db..76ba7f0 100644 --- a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm +++ b/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm @@ -26,5 +26,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName} - + \ No newline at end of file