修改路由地址排重规则
This commit is contained in:
@@ -95,7 +95,13 @@ public class ArticleCategoryController extends BaseController {
|
||||
@PutMapping()
|
||||
public ApiResult<?> update(@RequestBody ArticleCategory articleCategory) {
|
||||
if (articleCategoryService.updateById(articleCategory)) {
|
||||
return success("修改成功");
|
||||
// 同步分类状态
|
||||
final List<ArticleCategory> list = articleCategoryService.list(new LambdaQueryWrapper<ArticleCategory>().eq(ArticleCategory::getParentId, articleCategory.getCategoryId()));
|
||||
list.forEach(d -> {
|
||||
d.setStatus(articleCategory.getStatus());
|
||||
});
|
||||
articleCategoryService.updateBatchById(list);
|
||||
return success("修改成功");
|
||||
}
|
||||
return fail("修改失败");
|
||||
}
|
||||
|
||||
@@ -56,9 +56,9 @@ public class NavigationController extends BaseController {
|
||||
if (loginUser != null) {
|
||||
navigation.setUserId(loginUser.getUserId());
|
||||
}
|
||||
if (navigationService.count(new LambdaQueryWrapper<Navigation>().eq(Navigation::getPath,navigation.getPath())) > 0) {
|
||||
return fail("路由地址已存在");
|
||||
}
|
||||
// if (navigationService.count(new LambdaQueryWrapper<Navigation>().eq(Navigation::getPath,navigation.getPath())) > 0) {
|
||||
// return fail("路由地址已存在");
|
||||
// }
|
||||
if (navigationService.save(navigation)) {
|
||||
return success("添加成功");
|
||||
}
|
||||
@@ -68,10 +68,22 @@ public class NavigationController extends BaseController {
|
||||
@ApiOperation("修改网站导航记录表")
|
||||
@PutMapping()
|
||||
public ApiResult<?> update(@RequestBody Navigation navigation) {
|
||||
if (navigationService.count(new LambdaQueryWrapper<Navigation>().ne(Navigation::getNavigationId,navigation.getNavigationId()).eq(Navigation::getPath,navigation.getPath())) > 0) {
|
||||
if (navigationService.count(new LambdaQueryWrapper<Navigation>()
|
||||
.ne(Navigation::getNavigationId,navigation.getNavigationId())
|
||||
.eq(Navigation::getPosition,navigation.getPosition())
|
||||
.eq(Navigation::getPath,navigation.getPath())) > 0) {
|
||||
return fail("路由地址已存在");
|
||||
}
|
||||
if (navigationService.updateById(navigation)) {
|
||||
// 同步导航状态及位置
|
||||
final List<Navigation> list = navigationService.list(new LambdaQueryWrapper<Navigation>().eq(Navigation::getParentId, navigation.getNavigationId()));
|
||||
list.forEach(d -> {
|
||||
d.setStatus(navigation.getStatus());
|
||||
d.setPosition(navigation.getPosition());
|
||||
d.setHide(navigation.getHide());
|
||||
d.setComponent(navigation.getComponent());
|
||||
});
|
||||
navigationService.updateBatchById(list);
|
||||
return success("修改成功");
|
||||
}
|
||||
return fail("修改失败");
|
||||
|
||||
@@ -7,6 +7,8 @@ import cn.hutool.http.HttpRequest;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.gxwebsoft.cms.entity.*;
|
||||
import com.gxwebsoft.cms.param.AdParam;
|
||||
import com.gxwebsoft.cms.param.ArticleCategoryParam;
|
||||
import com.gxwebsoft.cms.param.NavigationParam;
|
||||
import com.gxwebsoft.cms.param.WebsiteParam;
|
||||
import com.gxwebsoft.cms.service.*;
|
||||
@@ -64,7 +66,7 @@ public class WebsiteController extends BaseController {
|
||||
|
||||
// 从缓存读取信息
|
||||
if(StrUtil.isNotBlank(siteInfo)){
|
||||
return success(JSONObject.parseObject(siteInfo,Website.class));
|
||||
// return success(JSONObject.parseObject(siteInfo,Website.class));
|
||||
}
|
||||
|
||||
// 获取站点信息
|
||||
@@ -119,6 +121,8 @@ public class WebsiteController extends BaseController {
|
||||
navigation.setHome(design.getHome());
|
||||
navigation.setPageId(design.getPageId());
|
||||
navigation.setSortNumber(0);
|
||||
navigation.setType(1);
|
||||
navigation.setPosition(1);
|
||||
navigationService.save(navigation);
|
||||
// 2.关于我们
|
||||
design.setName("关于我们");
|
||||
@@ -131,6 +135,7 @@ public class WebsiteController extends BaseController {
|
||||
navigation.setComponent(design.getComponent());
|
||||
navigation.setPageId(design.getPageId());
|
||||
navigation.setSortNumber(1);
|
||||
navigation.setType(1);
|
||||
navigationService.save(navigation);
|
||||
// 3.产品展示
|
||||
final ArticleCategory articleCategory = new ArticleCategory();
|
||||
@@ -144,6 +149,7 @@ public class WebsiteController extends BaseController {
|
||||
navigation.setComponent(articleCategory.getComponent());
|
||||
navigation.setArticleCategoryId(articleCategory.getCategoryId());
|
||||
navigation.setSortNumber(2);
|
||||
navigation.setType(2);
|
||||
navigationService.save(navigation);
|
||||
// 4.新闻资讯
|
||||
articleCategory.setTitle("新闻资讯");
|
||||
@@ -153,6 +159,8 @@ public class WebsiteController extends BaseController {
|
||||
navigation.setComponent("/article/index");
|
||||
navigation.setArticleCategoryId(articleCategory.getCategoryId());
|
||||
navigation.setSortNumber(3);
|
||||
navigation.setType(2);
|
||||
navigation.setPosition(1);
|
||||
navigationService.save(navigation);
|
||||
// 5.表单页面
|
||||
final Form form = new Form();
|
||||
@@ -165,11 +173,13 @@ public class WebsiteController extends BaseController {
|
||||
navigation.setComponent("/form/index");
|
||||
navigation.setFormId(form.getFormId());
|
||||
navigation.setSortNumber(4);
|
||||
navigation.setType(4);
|
||||
navigation.setPosition(1);
|
||||
navigationService.save(navigation);
|
||||
// 6.联系我们
|
||||
design.setName("联系我们");
|
||||
design.setPath("/contact");
|
||||
design.setComponent("/contact/index");
|
||||
design.setComponent("/about/index");
|
||||
design.setSortNumber(5);
|
||||
designService.save(design);
|
||||
navigation.setTitle(design.getName());
|
||||
@@ -177,6 +187,8 @@ public class WebsiteController extends BaseController {
|
||||
navigation.setComponent(design.getComponent());
|
||||
navigation.setPageId(design.getPageId());
|
||||
navigation.setSortNumber(5);
|
||||
navigation.setType(1);
|
||||
navigation.setPosition(1);
|
||||
navigationService.save(navigation);
|
||||
}
|
||||
|
||||
@@ -193,7 +205,9 @@ public class WebsiteController extends BaseController {
|
||||
website.setNavigations(navigationService.listRel(navigationParam));
|
||||
|
||||
// 读取幻灯片广告
|
||||
website.setAds(adService.list(new LambdaQueryWrapper<Ad>().like(Ad::getAdType,"幻灯片").last("limit 1")));
|
||||
final AdParam adParam = new AdParam();
|
||||
final PageResult<Ad> adPageResult = adService.pageRel(adParam);
|
||||
website.setAds(adPageResult.getList());
|
||||
|
||||
// 首页布局
|
||||
final Design design = designService.getOne(new LambdaQueryWrapper<Design>().eq(Design::getHome, 1).last("limit 1"));
|
||||
@@ -201,11 +215,11 @@ public class WebsiteController extends BaseController {
|
||||
website.setLayout(design.getLayout());
|
||||
}
|
||||
|
||||
// 提取文章分类作为网站导航(废弃)
|
||||
// final ArticleCategoryParam param = new ArticleCategoryParam();
|
||||
// param.setDeleted(0);
|
||||
// param.setStatus(0);
|
||||
// website.setCategoryList(articleCategoryService.listRel(param));
|
||||
// 提取文章分类作为网站导航
|
||||
final ArticleCategoryParam param = new ArticleCategoryParam();
|
||||
param.setDeleted(0);
|
||||
param.setStatus(0);
|
||||
website.setCategoryList(articleCategoryService.listRel(param));
|
||||
// 读取友情链接
|
||||
final LinkParam linkParam = new LinkParam();
|
||||
linkParam.setLinkType("友情链接");
|
||||
|
||||
Reference in New Issue
Block a user