|
|
@@ -55,9 +55,21 @@ public class AppVersionManagementServiceImpl implements IAppVersionManagementSer
|
|
|
public TableDataInfo<AppVersionManagementVo> queryPageList(AppVersionManagementBo bo, PageQuery pageQuery) {
|
|
|
LambdaQueryWrapper<AppVersionManagement> lqw = buildQueryWrapper(bo);
|
|
|
Page<AppVersionManagementVo> result = baseMapper.selectAllAppVersions(pageQuery.build(), lqw);
|
|
|
+ List<AppVersionManagementVo> appVersionManagementVoList = result.getRecords();
|
|
|
+ for (AppVersionManagementVo appVersionManagementVo : appVersionManagementVoList) {
|
|
|
+ appVersionManagementVo.setUpdateContent(replaceHtml(appVersionManagementVo.getUpdateContent()));
|
|
|
+ }
|
|
|
return TableDataInfo.build(result);
|
|
|
}
|
|
|
|
|
|
+ public static String replaceHtml(String html) {
|
|
|
+ if (html == null || html.isEmpty()) {
|
|
|
+ return "";
|
|
|
+ }
|
|
|
+ // 正则表达式移除所有的HTML标签
|
|
|
+ return html.replaceAll("<[^>]*>", "");
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 查询符合条件的App版本管理列表
|
|
|
*
|
|
|
@@ -73,7 +85,7 @@ public class AppVersionManagementServiceImpl implements IAppVersionManagementSer
|
|
|
private LambdaQueryWrapper<AppVersionManagement> buildQueryWrapper(AppVersionManagementBo bo) {
|
|
|
Map<String, Object> params = bo.getParams();
|
|
|
LambdaQueryWrapper<AppVersionManagement> lqw = Wrappers.lambdaQuery();
|
|
|
- lqw.orderByAsc(AppVersionManagement::getId);
|
|
|
+ lqw.orderByDesc(AppVersionManagement::getCreatedAt);
|
|
|
lqw.eq(bo.getVersionCode() != null, AppVersionManagement::getVersionCode, bo.getVersionCode());
|
|
|
lqw.like(StringUtils.isNotBlank(bo.getVersionName()), AppVersionManagement::getVersionName, bo.getVersionName());
|
|
|
lqw.eq(bo.getReleaseDate() != null, AppVersionManagement::getReleaseDate, bo.getReleaseDate());
|
|
|
@@ -100,6 +112,7 @@ public class AppVersionManagementServiceImpl implements IAppVersionManagementSer
|
|
|
public Boolean insertByBo(AppVersionManagementBo bo) {
|
|
|
AppVersionManagement add = MapstructUtils.convert(bo, AppVersionManagement.class);
|
|
|
validEntityBeforeSave(add);
|
|
|
+ baseMapper.updateAppVersionByType(bo.getOsType());
|
|
|
boolean flag = baseMapper.insertAppVersion(add) > 0;
|
|
|
if (flag) {
|
|
|
bo.setId(add.getId());
|