gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【7.1.6】整理代码

pull/25/head
fengshuonan 2021-12-23 17:25:52 +08:00
parent 29aa6996fe
commit b5c2401328
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeController.java
View File

@ -69,7 +69,7 @@ public class SysThemeController {
* @date 2021/12/17 16:58
*/
@GetResource(name = "查询系统主题", path = "/sysTheme/findPage")
public ResponseData findPage(SysThemeRequest sysThemeParam) {
public ResponseData findPage(SysThemeRequest sysThemeParam) {
return new SuccessResponseData(sysThemeService.findPage(sysThemeParam));
}

4
kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeServiceImpl.java
View File

@ -90,7 +90,7 @@ public class SysThemeServiceImpl extends ServiceImpl<SysThemeMapper, SysTheme> i
// 获取图片文件的编码
LambdaQueryWrapper<SysThemeTemplateField> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(SysThemeTemplateField::getFieldName, themeKeys).eq(SysThemeTemplateField::getFieldType, "file")
.select(SysThemeTemplateField::getFieldName);
.select(SysThemeTemplateField::getFieldName);
List<SysThemeTemplateField> sysThemeTemplateFields = sysThemeTemplateFieldService.list(queryWrapper);
List<String> fileNames = sysThemeTemplateFields.stream().map(SysThemeTemplateField::getFieldName).collect(Collectors.toList());
@ -125,7 +125,7 @@ public class SysThemeServiceImpl extends ServiceImpl<SysThemeMapper, SysTheme> i
public PageResult<SysTheme> findPage(SysThemeRequest sysThemeRequest) {
LambdaQueryWrapper<SysTheme> queryWrapper = new LambdaQueryWrapper<>();
// 通过主题名称模糊查询
queryWrapper.like(StrUtil.isNotBlank(sysThemeRequest.getThemeName()),SysTheme::getThemeName, sysThemeRequest.getThemeName());
queryWrapper.like(StrUtil.isNotBlank(sysThemeRequest.getThemeName()), SysTheme::getThemeName, sysThemeRequest.getThemeName());
Page<SysTheme> page = page(PageFactory.defaultPage(), queryWrapper);

14
kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeTemplateServiceImpl.java
View File

@ -116,7 +116,7 @@ public class SysThemeTemplateServiceImpl extends ServiceImpl<SysThemeTemplateMap
public PageResult<SysThemeTemplate> findPage(SysThemeTemplateRequest sysThemeTemplateRequest) {
LambdaQueryWrapper<SysThemeTemplate> queryWrapper = new LambdaQueryWrapper<>();
// 根据系统主题模板名称模糊查询
queryWrapper.like(StrUtil.isNotBlank(sysThemeTemplateRequest.getTemplateName()) ,SysThemeTemplate::getTemplateName, sysThemeTemplateRequest.getTemplateName());
queryWrapper.like(StrUtil.isNotBlank(sysThemeTemplateRequest.getTemplateName()), SysThemeTemplate::getTemplateName, sysThemeTemplateRequest.getTemplateName());
Page<SysThemeTemplate> page = page(PageFactory.defaultPage(), queryWrapper);
@ -145,6 +145,12 @@ public class SysThemeTemplateServiceImpl extends ServiceImpl<SysThemeTemplateMap
this.updateById(sysThemeTemplate);
}
@Override
@Transactional(rollbackFor = Exception.class)
public List<SysThemeTemplateDataDTO> detail(SysThemeTemplateRequest sysThemeTemplateRequest) {
return sysThemeTemplateMapper.sysThemeTemplateDetail(sysThemeTemplateRequest.getTemplateId());
}
/**
* 查询单个系统主题模板
*
@ -158,10 +164,4 @@ public class SysThemeTemplateServiceImpl extends ServiceImpl<SysThemeTemplateMap
}
return sysThemeTemplate;
}
@Override
@Transactional(rollbackFor = Exception.class)
public List<SysThemeTemplateDataDTO> detail(SysThemeTemplateRequest sysThemeTemplateRequest) {
return sysThemeTemplateMapper.sysThemeTemplateDetail(sysThemeTemplateRequest.getTemplateId());
}
}