From b8ca2ad7e570ab9986be3ea603ed49c9a6fe15af Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 13 May 2022 11:14:11 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/mapper/MallNewsCategoryMapper.java | 12 +++++++++++-
src/main/java/cc/mrbird/febs/mall/service/impl/MallNewsInfoServiceImpl.java | 10 ++++++++++
src/main/java/cc/mrbird/febs/mall/controller/AdminNewsInfoController.java | 9 +++++++++
src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java | 6 ++++++
src/main/resources/templates/febs/views/modules/news/newsCategory.html | 6 +++---
src/main/java/cc/mrbird/febs/mall/service/IMallNewsInfoService.java | 3 +++
6 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminNewsInfoController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminNewsInfoController.java
index 3240f05..49e56c3 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminNewsInfoController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminNewsInfoController.java
@@ -5,6 +5,7 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.mall.dto.MallNewsInfoDto;
+import cc.mrbird.febs.mall.entity.MallNewsCategory;
import cc.mrbird.febs.mall.entity.MallNewsInfo;
import cc.mrbird.febs.mall.service.IMallNewsInfoService;
import lombok.RequiredArgsConstructor;
@@ -12,6 +13,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.management.Query;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.util.Map;
@@ -68,4 +70,11 @@
return mallNewsInfoService.updateNewsInfo(mallNewsInfoDto);
}
+
+ @GetMapping("findNewsCategoryList")
+ @ControllerEndpoint(operation = "")
+ public FebsResponse findNewsCategoryList(MallNewsCategory mallNewsCategory, QueryRequest request) {
+ return null;
+ }
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java
index 8e36c43..7135d9b 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java
@@ -56,4 +56,10 @@
model.addAttribute("newsInfo", data);
return FebsUtil.view("modules/news/newsInfoUpdate");
}
+
+ @GetMapping("newsCategory")
+ @RequiresPermissions("news:category:view")
+ public String newsCategory() {
+ return FebsUtil.view("modules/news/newsCategory");
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallNewsCategoryMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallNewsCategoryMapper.java
index c70ceb9..e953e09 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallNewsCategoryMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallNewsCategoryMapper.java
@@ -1,2 +1,12 @@
-package cc.mrbird.febs.mall.mapper;public interface MallNewsCategoryMapper {
+package cc.mrbird.febs.mall.mapper;
+
+import cc.mrbird.febs.mall.entity.MallNewsCategory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+public interface MallNewsCategoryMapper extends BaseMapper<MallNewsCategory> {
+
+ IPage<MallNewsCategory> selectInPage(@Param("record") MallNewsCategory mallNewsCategory, Page<MallNewsCategory> page);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IMallNewsInfoService.java b/src/main/java/cc/mrbird/febs/mall/service/IMallNewsInfoService.java
index 8609249..8e5af3f 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IMallNewsInfoService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IMallNewsInfoService.java
@@ -3,6 +3,7 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.mall.dto.MallNewsInfoDto;
+import cc.mrbird.febs.mall.entity.MallNewsCategory;
import cc.mrbird.febs.mall.entity.MallNewsInfo;
import cc.mrbird.febs.mall.vo.AdminMallNewsInfoVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -19,4 +20,6 @@
FebsResponse updateNewsInfo(MallNewsInfoDto mallNewsInfoDto);
MallNewsInfo getNewsInfoById(long id);
+
+ IPage<MallNewsCategory> findNewsCategoryInPage(MallNewsCategory mallNewsCategory, QueryRequest request);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MallNewsInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MallNewsInfoServiceImpl.java
index 2dd07ea..76868ad 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MallNewsInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MallNewsInfoServiceImpl.java
@@ -3,7 +3,9 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.mall.dto.MallNewsInfoDto;
+import cc.mrbird.febs.mall.entity.MallNewsCategory;
import cc.mrbird.febs.mall.entity.MallNewsInfo;
+import cc.mrbird.febs.mall.mapper.MallNewsCategoryMapper;
import cc.mrbird.febs.mall.mapper.MallNewsInfoMapper;
import cc.mrbird.febs.mall.service.IMallNewsInfoService;
import cc.mrbird.febs.mall.vo.AdminMallNewsInfoVo;
@@ -23,6 +25,8 @@
@Service
@RequiredArgsConstructor
public class MallNewsInfoServiceImpl extends ServiceImpl<MallNewsInfoMapper, MallNewsInfo> implements IMallNewsInfoService {
+
+ private final MallNewsCategoryMapper mallNewsCategoryMapper;
@Override
public IPage<AdminMallNewsInfoVo> getNewInfoList(MallNewsInfo mallNewsInfo, QueryRequest request) {
@@ -90,4 +94,10 @@
public MallNewsInfo getNewsInfoById(long id) {
return this.baseMapper.selectById(id);
}
+
+ @Override
+ public IPage<MallNewsCategory> findNewsCategoryInPage(MallNewsCategory mallNewsCategory, QueryRequest request) {
+ Page<MallNewsCategory> page = new Page<>(request.getPageNum(), request.getPageNum());
+ return mallNewsCategoryMapper.selectInPage(mallNewsCategory, page);
+ }
}
diff --git a/src/main/resources/templates/febs/views/modules/news/newsCategory.html b/src/main/resources/templates/febs/views/modules/news/newsCategory.html
index 7675466..b97910f 100644
--- a/src/main/resources/templates/febs/views/modules/news/newsCategory.html
+++ b/src/main/resources/templates/febs/views/modules/news/newsCategory.html
@@ -1,9 +1,9 @@
-<div class="layui-fluid layui-anim febs-anim" id="febs-newInfo" lay-title="新闻中心">
+<div class="layui-fluid layui-anim febs-anim" id="febs-new-category" lay-title="新闻分类">
<div class="layui-row febs-container">
<div class="layui-col-md12">
<div class="layui-card">
<div class="layui-card-body febs-table-full">
- <form class="layui-form layui-table-form" lay-filter="user-table-form">
+ <form class="layui-form layui-table-form" lay-filter="news-category-table-form">
<div class="layui-row">
<div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
<div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="add">
@@ -40,7 +40,7 @@
febs = layui.febs,
form = layui.form,
table = layui.table,
- $view = $('#febs-newInfo'),
+ $view = $('#febs-new-category'),
$query = $view.find('#query'),
$add = $view.find('#add'),
$reset = $view.find('#reset'),
--
Gitblit v1.9.1