From 2b82b773a168c5773bac53b7fc0132da62aab5b4 Mon Sep 17 00:00:00 2001 From: guo Date: Thu, 10 Aug 2023 10:50:29 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../java/com/zhgd/config/SwaggerConfig.java | 59 ++-- .../com/zhgd/xmgl/entity/RequestPage.java | 12 + .../controller/BaseModuleController.java | 255 +++++++++--------- .../controller/dto/ModuleListPageDto.java | 13 + .../basicdata/mapper/BaseModuleMapper.java | 5 + .../basicdata/mapper/xml/BaseModuleMapper.xml | 18 +- .../basicdata/service/IBaseModuleService.java | 4 + .../service/impl/BaseModuleServiceImpl.java | 44 +-- 9 files changed, 255 insertions(+), 157 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/entity/RequestPage.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/basicdata/controller/dto/ModuleListPageDto.java diff --git a/pom.xml b/pom.xml index ec8ee02cc..3df5400be 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 1.1.10 0.9.1 2.6 - 1.8.7 + 1.9.6 9.0.12 diff --git a/src/main/java/com/zhgd/config/SwaggerConfig.java b/src/main/java/com/zhgd/config/SwaggerConfig.java index 47c16aaca..42560d1bf 100644 --- a/src/main/java/com/zhgd/config/SwaggerConfig.java +++ b/src/main/java/com/zhgd/config/SwaggerConfig.java @@ -10,10 +10,17 @@ import springfox.documentation.RequestHandler; import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.PathSelectors; import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.ApiKey; +import springfox.documentation.service.AuthorizationScope; +import springfox.documentation.service.SecurityReference; import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spi.service.contexts.SecurityContext; import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.swagger2.annotations.EnableSwagger2; +import java.util.ArrayList; +import java.util.List; + /** * @program: Iot @@ -30,38 +37,28 @@ public class SwaggerConfig { @Bean public Docket createZwRestApi() { - return new Docket(DocumentationType.SWAGGER_2) - .groupName("政务接口") - .apiInfo(apiInfo("政务管理API", "政务前后端联调api文档", "1.0")) - .select() + return new Docket(DocumentationType.SWAGGER_2).groupName("2政务接口").apiInfo(apiInfo("政务管理API", "政务前后端联调api文档", "1.0")).select() //.apis(RequestHandlerSelectors.basePackage("com.zhgd.xmgl")) - .apis(basePackage("com.zhwl.zw")) - .paths(PathSelectors.any()) + .apis(basePackage("com.zhwl.zw")).paths(PathSelectors.any()) //.paths(PathSelectors.regex("/zw.*")) .build(); } @Bean public Docket createRestApi() { - return new Docket(DocumentationType.SWAGGER_2) - .groupName("项目接口") - .apiInfo(apiInfo("项目管理API", "项目前后端联调api文档", "1.0")) - .select() + return new Docket(DocumentationType.SWAGGER_2).groupName("1项目接口").apiInfo(apiInfo("项目管理API", "项目前后端联调api文档", "1.0")).select() //.apis(RequestHandlerSelectors.basePackage("com.zhgd.xmgl")) .apis(basePackage("com.zhgd.xmgl")) //.apis(basePackage("com.zhgd.xmgl"+splitor+"com.zhgd.xmgl.device")) .paths(PathSelectors.any()) //.paths(PathSelectors.regex("/xmgl.*")) - .build(); + .build() + /* 设置安全模式，swagger可以设置访问token */.securitySchemes(securitySchemes()).securityContexts(securityContexts()); } private ApiInfo apiInfo(String titleName, String description, String version) { - return new ApiInfoBuilder() - .title(titleName) - .description(description) - .version(version) - .build(); + return new ApiInfoBuilder().title(titleName).description(description).version(version).build(); } public static Predicate basePackage(final String basePackage) { @@ -84,4 +81,34 @@ public class SwaggerConfig { private static Optional> declaringClass(RequestHandler input) { return Optional.fromNullable(input.declaringClass()); } + + /** + * 安全模式，这里指定token通过Authorization头请求头传递 + */ + private List securitySchemes() { + List apiKeyList = new ArrayList(); + apiKeyList.add(new ApiKey("Authorization", "Authorization", "header")); + return apiKeyList; + } + + /** + * 安全上下文 + */ + private List securityContexts() { + List securityContexts = new ArrayList<>(); + securityContexts.add(SecurityContext.builder().securityReferences(defaultAuth()).forPaths(PathSelectors.regex("^(?!auth).*$")).build()); + return securityContexts; + } + + /** + * 默认的安全上引用 + */ + private List defaultAuth() { + AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything"); + AuthorizationScope[] authorizationScopes = new AuthorizationScope[1]; + authorizationScopes[0] = authorizationScope; + List securityReferences = new ArrayList<>(); + securityReferences.add(new SecurityReference("Authorization", authorizationScopes)); + return securityReferences; + } } diff --git a/src/main/java/com/zhgd/xmgl/entity/RequestPage.java b/src/main/java/com/zhgd/xmgl/entity/RequestPage.java new file mode 100644 index 000000000..f1a5c97dc --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/entity/RequestPage.java @@ -0,0 +1,12 @@ +package com.zhgd.xmgl.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class RequestPage { + @ApiModelProperty(value = "第几页", example = "1") + private Integer current = 1; + @ApiModelProperty(value = "每页显示条数", example = "10") + private Integer size = 10; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseModuleController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseModuleController.java index 9fdc07ce2..eb60201bc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseModuleController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseModuleController.java @@ -1,6 +1,8 @@ package com.zhgd.xmgl.modules.basicdata.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.xmgl.modules.basicdata.controller.dto.ModuleListPageDto; import com.zhgd.xmgl.modules.basicdata.entity.BaseModule; import com.zhgd.xmgl.modules.basicdata.service.IBaseModuleService; import com.zhgd.xmgl.util.MessageUtil; @@ -20,11 +22,11 @@ import java.util.List; import java.util.Map; - /** +/** * @Title: Controller * @Description: 模块 * @author： pds - * @date： 2020-10-12 + * @date： 2020-10-12 * @version： V1.0 */ @RestController @@ -32,137 +34,148 @@ import java.util.Map; @Slf4j @Api(tags = "模块") public class BaseModuleController { - @Autowired - private IBaseModuleService baseModuleService; - - /** - * 分页列表查询 - * @return - */ - @ApiOperation(value = "列表查询所有模块信息", notes = "列表查询所有模块信息", httpMethod="POST") + @Autowired + private IBaseModuleService baseModuleService; + + /** + * 列表查询 + * + * @return + */ + @ApiOperation(value = "列表查询所有模块信息", notes = "列表查询所有模块信息", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "moduleType", value = "模块类型，1企业模块，2项目后台模块，3企业后台，4项目看板", paramType = "query", required = false, dataType = "String"), @ApiImplicitParam(name = "styleType", value = "样式类型，默认查1样式", paramType = "query", required = false, dataType = "String"), }) - @PostMapping(value = "/list") - public Result> getModuleList(@RequestBody Map map) { + @PostMapping(value = "/list") + public Result> getModuleList(@RequestBody Map map) { List pageList = baseModuleService.getModuleList(map); - return Result.success(pageList); - } + return Result.success(pageList); + } - @ApiOperation(value = "查询总企业默认的模块列表", notes = "查询总企业默认的模块列表", httpMethod="POST") - @ApiImplicitParams({ - @ApiImplicitParam(name = "headquartersSn", value = "总公司sn", paramType = "query", required = true, dataType = "String"), - }) - @PostMapping(value = "/getCompanyModuleList") - public Result> getCompanyModuleList(@RequestBody Map map) { - return Result.success(baseModuleService.getCompanyModuleList(map)); - } + @ApiOperation(value = "分页列表查询所有模块信息", notes = "列表查询所有模块信息", httpMethod = "POST") + @PostMapping(value = "/page") + public Result> getModuleListByPage(@RequestBody ModuleListPageDto dto) { + Page pageList = baseModuleService.getModuleListByPage(dto); + return Result.success(pageList); + } - @ApiOperation(value = "查询企业下项目默认的模块列表", notes = "查询企业下项目默认的模块列表", httpMethod="POST") - @ApiImplicitParams({ - @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "query", required = true, dataType = "String"), - }) - @PostMapping(value = "/getProjectModuleList") - public Result> getProjectModuleList(@RequestBody Map map) { - return Result.success(baseModuleService.getProjectModuleList(map)); - } + @ApiOperation(value = "查询总企业默认的模块列表", notes = "查询总企业默认的模块列表", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "headquartersSn", value = "总公司sn", paramType = "query", required = true, dataType = "String"), + }) + @PostMapping(value = "/getCompanyModuleList") + public Result> getCompanyModuleList(@RequestBody Map map) { + return Result.success(baseModuleService.getCompanyModuleList(map)); + } - @ApiOperation(value = "查询企业用户配置的模块列表", notes = "查询企业用户配置的模块列表", httpMethod="POST") - @ApiImplicitParams({ - @ApiImplicitParam(name = "userId", value = "人员ID", paramType = "query", required = true, dataType = "String"), - @ApiImplicitParam(name = "styleType", value = "样式类型", paramType = "query", required = true, dataType = "String"), - }) - @PostMapping(value = "/getUserModuleList") - public Result> getUserModuleList(@RequestBody Map map) { - return Result.success(baseModuleService.getUserModuleList(map)); - } - /** - * 添加 - * @param baseModule - * @return - */ - @ApiOperation(value = " 添加模块信息", notes = "添加模块信息" , httpMethod="POST") - @PostMapping(value = "/add") - public Result add(@RequestBody BaseModule baseModule) { - Result result = new Result(); - try { - baseModuleService.save(baseModule); + @ApiOperation(value = "查询企业下项目默认的模块列表", notes = "查询企业下项目默认的模块列表", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "query", required = true, dataType = "String"), + }) + @PostMapping(value = "/getProjectModuleList") + public Result> getProjectModuleList(@RequestBody Map map) { + return Result.success(baseModuleService.getProjectModuleList(map)); + } + + @ApiOperation(value = "查询企业用户配置的模块列表", notes = "查询企业用户配置的模块列表", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "userId", value = "人员ID", paramType = "query", required = true, dataType = "String"), + @ApiImplicitParam(name = "styleType", value = "样式类型", paramType = "query", required = true, dataType = "String"), + }) + @PostMapping(value = "/getUserModuleList") + public Result> getUserModuleList(@RequestBody Map map) { + return Result.success(baseModuleService.getUserModuleList(map)); + } + + /** + * 添加 + * + * @param baseModule + * @return + */ + @ApiOperation(value = " 添加模块信息", notes = "添加模块信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody BaseModule baseModule) { + Result result = new Result(); + try { + baseModuleService.save(baseModule); result.successMsg(MessageUtil.get("addSucess")); - } catch (Exception e) { - e.printStackTrace(); - log.info(e.getMessage()); + } catch (Exception e) { + e.printStackTrace(); + log.info(e.getMessage()); result.error500(MessageUtil.get("failErr")); - } - return result; - } - - /** - * 编辑 - * @param baseModule - * @return - */ - @ApiOperation(value = "编辑模块信息", notes = "编辑模块信息" , httpMethod="POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody BaseModule baseModule) { - Result result = new Result(); - BaseModule baseModuleEntity = baseModuleService.getById(baseModule.getModuleId()); - if(baseModuleEntity==null) { - result.error500(MessageUtil.get("notFindErr")); - }else { - boolean ok = baseModuleService.updateById(baseModule); - //TODO 返回false说明什么？ - if(ok) { - result.successMsg(MessageUtil.get("editSucess")); - } - } - return result; - } - - /** - * 通过id删除 - * @param - * @return - */ - @ApiOperation(value = "删除模块信息", notes = "删除模块信息" , httpMethod="POST") - @ApiImplicitParam(name = "moduleId", value = "模块ID", paramType = "query", required = true, dataType = "Integer") - @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { - Result result = new Result(); - BaseModule baseModule = baseModuleService.getById(MapUtils.getString(map,"moduleId")); - if(baseModule==null) { - result.error500(MessageUtil.get("notFindErr")); - }else { - boolean ok = baseModuleService.removeById(MapUtils.getString(map,"moduleId")); - if(ok) { - result.successMsg(MessageUtil.get("deleteSucess")); - } - } - - return result; - } - + } + return result; + } - - /** - * 通过id查询 - * @param - * @return - */ - @ApiOperation(value = "通过id查询模块信息", notes = "通过id查询模块信息" , httpMethod="POST") - @ApiImplicitParam(name = "moduleId", value = "模块ID", paramType = "query", required = true, dataType = "Integer") - @PostMapping(value = "/queryById") - public Result queryById(@RequestBody Map map) { - Result result = new Result(); - BaseModule baseModule = baseModuleService.getById(MapUtils.getString(map,"moduleId")); - if(baseModule==null) { + /** + * 编辑 + * + * @param baseModule + * @return + */ + @ApiOperation(value = "编辑模块信息", notes = "编辑模块信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody BaseModule baseModule) { + Result result = new Result(); + BaseModule baseModuleEntity = baseModuleService.getById(baseModule.getModuleId()); + if (baseModuleEntity == null) { result.error500(MessageUtil.get("notFindErr")); - }else { - result.setResult(baseModule); - result.setSuccess(true); - } - return result; - } + } else { + boolean ok = baseModuleService.updateById(baseModule); + if (ok) { + result.successMsg(MessageUtil.get("editSucess")); + } + } + return result; + } + + /** + * 通过id删除 + * + * @param + * @return + */ + @ApiOperation(value = "删除模块信息", notes = "删除模块信息", httpMethod = "POST") + @ApiImplicitParam(name = "moduleId", value = "模块ID", paramType = "query", required = true, dataType = "Integer") + @PostMapping(value = "/delete") + public Result delete(@RequestBody Map map) { + Result result = new Result(); + BaseModule baseModule = baseModuleService.getById(MapUtils.getString(map, "moduleId")); + if (baseModule == null) { + result.error500(MessageUtil.get("notFindErr")); + } else { + boolean ok = baseModuleService.removeById(MapUtils.getString(map, "moduleId")); + if (ok) { + result.successMsg(MessageUtil.get("deleteSucess")); + } + } + + return result; + } + + + /** + * 通过id查询 + * + * @param + * @return + */ + @ApiOperation(value = "通过id查询模块信息", notes = "通过id查询模块信息", httpMethod = "POST") + @ApiImplicitParam(name = "moduleId", value = "模块ID", paramType = "query", required = true, dataType = "Integer") + @PostMapping(value = "/queryById") + public Result queryById(@RequestBody Map map) { + Result result = new Result(); + BaseModule baseModule = baseModuleService.getById(MapUtils.getString(map, "moduleId")); + if (baseModule == null) { + result.error500(MessageUtil.get("notFindErr")); + } else { + result.setResult(baseModule); + result.setSuccess(true); + } + return result; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/dto/ModuleListPageDto.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/dto/ModuleListPageDto.java new file mode 100644 index 000000000..d84d2d9e1 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/dto/ModuleListPageDto.java @@ -0,0 +1,13 @@ +package com.zhgd.xmgl.modules.basicdata.controller.dto; + +import com.zhgd.xmgl.entity.RequestPage; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class ModuleListPageDto extends RequestPage { + @ApiModelProperty("模块类型，1企业模块，2项目后台模块，3企业后台，4项目看板") + private String moduleType; + @ApiModelProperty("样式类型，默认查1样式") + private String styleType; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseModuleMapper.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseModuleMapper.java index 6077d88fc..5a08f75e8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseModuleMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseModuleMapper.java @@ -3,9 +3,12 @@ package com.zhgd.xmgl.modules.basicdata.mapper; import java.util.List; import java.util.Map; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.xmgl.modules.basicdata.controller.dto.ModuleListPageDto; import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.basicdata.entity.BaseModule; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** * @Description: 模块 @@ -25,4 +28,6 @@ public interface BaseModuleMapper extends BaseMapper { List getProjectUserModuleList(Map param); List getModuleList(Map map); + + Page getModuleListByPage(Page page, @Param("dto") ModuleListPageDto dto); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml index 09ce883de..36613c0d1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml @@ -45,13 +45,27 @@ SELECT a.* from base_module a - + and a.module_type=#{moduleType} - + and a.style_type=#{styleType} ORDER BY a.module_type,a.label_sort_num,a.label_name,a.module_id + + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseModuleService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseModuleService.java index 909db91ef..3dc155406 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseModuleService.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseModuleService.java @@ -1,5 +1,7 @@ package com.zhgd.xmgl.modules.basicdata.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.xmgl.modules.basicdata.controller.dto.ModuleListPageDto; import com.zhgd.xmgl.modules.basicdata.entity.BaseModule; import com.baomidou.mybatisplus.extension.service.IService; @@ -21,4 +23,6 @@ public interface IBaseModuleService extends IService { List getUserModuleList(Map map); List getModuleList(Map map); + + Page getModuleListByPage(ModuleListPageDto dto); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java index a3dfa64ae..013bd9349 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java @@ -1,6 +1,9 @@ package com.zhgd.xmgl.modules.basicdata.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhgd.xmgl.modules.basicdata.controller.dto.ModuleListPageDto; import com.zhgd.xmgl.modules.basicdata.entity.BaseModule; import com.zhgd.xmgl.modules.basicdata.entity.CompanyConfig; import com.zhgd.xmgl.modules.basicdata.mapper.BaseModuleMapper; @@ -9,8 +12,6 @@ import com.zhgd.xmgl.modules.basicdata.service.IBaseModuleService; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -19,7 +20,7 @@ import java.util.Map; /** * @Description: 模块 * @author： pds - * @date： 2020-10-12 + * @date： 2020-10-12 * @version： V1.0 */ @Service @@ -32,24 +33,24 @@ public class BaseModuleServiceImpl extends ServiceImpl getCompanyModuleList(Map map) { - QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.lambda().eq(CompanyConfig::getCompanySn,MapUtils.getString(map,"headquartersSn")); - CompanyConfig companyConfig=companyConfigMapper.selectOne(queryWrapper); - if(companyConfig!=null&&companyConfig.getStyleType()!=null){ - map.put("styleType",companyConfig.getStyleType()); - }else{ - map.put("styleType",1); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(CompanyConfig::getCompanySn, MapUtils.getString(map, "headquartersSn")); + CompanyConfig companyConfig = companyConfigMapper.selectOne(queryWrapper); + if (companyConfig != null && companyConfig.getStyleType() != null) { + map.put("styleType", companyConfig.getStyleType()); + } else { + map.put("styleType", 1); } return baseModuleMapper.getCompanyModuleList(map); } @Override public List getProjectModuleList(Map map) { - CompanyConfig companyConfig=companyConfigMapper.selectConfigByProject(MapUtils.getString(map,"projectSn")); - if(companyConfig!=null&&companyConfig.getStyleType()!=null){ - map.put("styleType",companyConfig.getStyleType()); - }else{ - map.put("styleType",1); + CompanyConfig companyConfig = companyConfigMapper.selectConfigByProject(MapUtils.getString(map, "projectSn")); + if (companyConfig != null && companyConfig.getStyleType() != null) { + map.put("styleType", companyConfig.getStyleType()); + } else { + map.put("styleType", 1); } return baseModuleMapper.getProjectModuleList(map); } @@ -61,8 +62,17 @@ public class BaseModuleServiceImpl extends ServiceImpl getModuleList(Map map) { - Integer styleType= MapUtils.getInteger(map,"styleType",1); - map.put("styleType",styleType); + Integer styleType = MapUtils.getInteger(map, "styleType", 1); + map.put("styleType", styleType); return baseModuleMapper.getModuleList(map); } + + @Override + public Page getModuleListByPage(ModuleListPageDto dto) { + Page page = new Page<>(dto.getCurrent(), dto.getSize()); + if (dto.getStyleType() == null) { + dto.setStyleType("1"); + } + return baseModuleMapper.getModuleListByPage(page, dto); + } }