From 516197978b596027e031dd2776eeed687bb193e9 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Tue, 2 Jul 2024 17:01:00 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/UserCategoryRelationMapper.java | 17 ++++++++ .../system/dao/UserSiteRelationMapper.java | 17 ++++++++ .../mapping/UserCategoryRelationMapper.xml | 7 +++ .../dao/mapping/UserSiteRelationMapper.xml | 8 ++++ .../system/model/UserCategoryRelation.java | 43 +++++++++++++++++++ .../system/model/UserSiteRelation.java | 43 +++++++++++++++++++ .../service/UserCategoryRelationService.java | 13 ++++++ .../service/UserSiteRelationService.java | 13 ++++++ .../impl/UserCategoryRelationServiceImpl.java | 19 ++++++++ .../impl/UserSiteRelationServiceImpl.java | 19 ++++++++ 10 files changed, 199 insertions(+) create mode 100644 src/main/java/com/jsnjfz/manage/modular/system/dao/UserCategoryRelationMapper.java create mode 100644 src/main/java/com/jsnjfz/manage/modular/system/dao/UserSiteRelationMapper.java create mode 100644 src/main/java/com/jsnjfz/manage/modular/system/dao/mapping/UserCategoryRelationMapper.xml create mode 100644 src/main/java/com/jsnjfz/manage/modular/system/dao/mapping/UserSiteRelationMapper.xml create mode 100644 src/main/java/com/jsnjfz/manage/modular/system/model/UserCategoryRelation.java create mode 100644 src/main/java/com/jsnjfz/manage/modular/system/model/UserSiteRelation.java create mode 100644 src/main/java/com/jsnjfz/manage/modular/system/service/UserCategoryRelationService.java create mode 100644 src/main/java/com/jsnjfz/manage/modular/system/service/UserSiteRelationService.java create mode 100644 src/main/java/com/jsnjfz/manage/modular/system/service/impl/UserCategoryRelationServiceImpl.java create mode 100644 src/main/java/com/jsnjfz/manage/modular/system/service/impl/UserSiteRelationServiceImpl.java diff --git a/src/main/java/com/jsnjfz/manage/modular/system/dao/UserCategoryRelationMapper.java b/src/main/java/com/jsnjfz/manage/modular/system/dao/UserCategoryRelationMapper.java new file mode 100644 index 0000000..8b7548d --- /dev/null +++ b/src/main/java/com/jsnjfz/manage/modular/system/dao/UserCategoryRelationMapper.java @@ -0,0 +1,17 @@ +package com.jsnjfz.manage.modular.system.dao; + +import com.jsnjfz.manage.modular.system.model.UserCategoryRelation; + +/** +* @author Administrator +* @description 针对表【user_category_relation】的数据库操作Mapper +* @createDate 2024-07-02 16:52:21 +* @Entity com.jsnjfz.manage.modular.system.model.UserCategoryRelation +*/ +public interface UserCategoryRelationMapper extends BaseDao { + +} + + + + diff --git a/src/main/java/com/jsnjfz/manage/modular/system/dao/UserSiteRelationMapper.java b/src/main/java/com/jsnjfz/manage/modular/system/dao/UserSiteRelationMapper.java new file mode 100644 index 0000000..b49d370 --- /dev/null +++ b/src/main/java/com/jsnjfz/manage/modular/system/dao/UserSiteRelationMapper.java @@ -0,0 +1,17 @@ +package com.jsnjfz.manage.modular.system.dao; + +import com.jsnjfz.manage.modular.system.model.UserSiteRelation; + +/** +* @author Administrator +* @description 针对表【user_site_relation】的数据库操作Mapper +* @createDate 2024-07-02 16:52:21 +* @Entity com.jsnjfz.manage.modular.system.model.UserSiteRelation +*/ +public interface UserSiteRelationMapper extends BaseDao { + +} + + + + diff --git a/src/main/java/com/jsnjfz/manage/modular/system/dao/mapping/UserCategoryRelationMapper.xml b/src/main/java/com/jsnjfz/manage/modular/system/dao/mapping/UserCategoryRelationMapper.xml new file mode 100644 index 0000000..8121e6f --- /dev/null +++ b/src/main/java/com/jsnjfz/manage/modular/system/dao/mapping/UserCategoryRelationMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/src/main/java/com/jsnjfz/manage/modular/system/dao/mapping/UserSiteRelationMapper.xml b/src/main/java/com/jsnjfz/manage/modular/system/dao/mapping/UserSiteRelationMapper.xml new file mode 100644 index 0000000..04c984d --- /dev/null +++ b/src/main/java/com/jsnjfz/manage/modular/system/dao/mapping/UserSiteRelationMapper.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/src/main/java/com/jsnjfz/manage/modular/system/model/UserCategoryRelation.java b/src/main/java/com/jsnjfz/manage/modular/system/model/UserCategoryRelation.java new file mode 100644 index 0000000..af32fe3 --- /dev/null +++ b/src/main/java/com/jsnjfz/manage/modular/system/model/UserCategoryRelation.java @@ -0,0 +1,43 @@ +package com.jsnjfz.manage.modular.system.model; + +import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.annotations.TableId; +import java.io.Serializable; +import java.util.Date; + +import lombok.Data; + +/** + * + * @TableName user_category_relation + */ +@TableName(value ="user_category_relation") +@Data +public class UserCategoryRelation implements Serializable { + /** + * 主键 + */ + @TableId + private Integer id; + + /** + * 用户id + */ + private Integer userId; + + /** + * 网站id + */ + private Integer categoryId; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + +} \ No newline at end of file diff --git a/src/main/java/com/jsnjfz/manage/modular/system/model/UserSiteRelation.java b/src/main/java/com/jsnjfz/manage/modular/system/model/UserSiteRelation.java new file mode 100644 index 0000000..2229a11 --- /dev/null +++ b/src/main/java/com/jsnjfz/manage/modular/system/model/UserSiteRelation.java @@ -0,0 +1,43 @@ +package com.jsnjfz.manage.modular.system.model; + +import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.annotations.TableId; +import java.io.Serializable; +import java.util.Date; + +import lombok.Data; + +/** + * + * @TableName user_site_relation + */ +@TableName(value ="user_site_relation") +@Data +public class UserSiteRelation implements Serializable { + /** + * 主键 + */ + @TableId + private Integer id; + + /** + * 用户id + */ + private Integer userId; + + /** + * 网站id + */ + private Integer siteId; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + +} \ No newline at end of file diff --git a/src/main/java/com/jsnjfz/manage/modular/system/service/UserCategoryRelationService.java b/src/main/java/com/jsnjfz/manage/modular/system/service/UserCategoryRelationService.java new file mode 100644 index 0000000..e6ac7b6 --- /dev/null +++ b/src/main/java/com/jsnjfz/manage/modular/system/service/UserCategoryRelationService.java @@ -0,0 +1,13 @@ +package com.jsnjfz.manage.modular.system.service; + +import com.jsnjfz.manage.modular.system.model.UserCategoryRelation; +import com.baomidou.mybatisplus.service.IService; + +/** +* @author Administrator +* @description 针对表【user_category_relation】的数据库操作Service +* @createDate 2024-07-02 16:52:21 +*/ +public interface UserCategoryRelationService extends IService { + +} diff --git a/src/main/java/com/jsnjfz/manage/modular/system/service/UserSiteRelationService.java b/src/main/java/com/jsnjfz/manage/modular/system/service/UserSiteRelationService.java new file mode 100644 index 0000000..f52a749 --- /dev/null +++ b/src/main/java/com/jsnjfz/manage/modular/system/service/UserSiteRelationService.java @@ -0,0 +1,13 @@ +package com.jsnjfz.manage.modular.system.service; + +import com.jsnjfz.manage.modular.system.model.UserSiteRelation; +import com.baomidou.mybatisplus.service.IService; + +/** +* @author Administrator +* @description 针对表【user_site_relation】的数据库操作Service +* @createDate 2024-07-02 16:52:21 +*/ +public interface UserSiteRelationService extends IService { + +} diff --git a/src/main/java/com/jsnjfz/manage/modular/system/service/impl/UserCategoryRelationServiceImpl.java b/src/main/java/com/jsnjfz/manage/modular/system/service/impl/UserCategoryRelationServiceImpl.java new file mode 100644 index 0000000..16e36c1 --- /dev/null +++ b/src/main/java/com/jsnjfz/manage/modular/system/service/impl/UserCategoryRelationServiceImpl.java @@ -0,0 +1,19 @@ +package com.jsnjfz.manage.modular.system.service.impl; + +import com.jsnjfz.manage.modular.system.service.BaseService; +import com.jsnjfz.manage.modular.system.model.UserCategoryRelation; +import org.springframework.stereotype.Service; + +/** +* @author Administrator +* @description 针对表【user_category_relation】的数据库操作Service实现 +* @createDate 2024-07-02 16:52:21 +*/ +@Service +public class UserCategoryRelationServiceImpl extends BaseService{ + +} + + + + diff --git a/src/main/java/com/jsnjfz/manage/modular/system/service/impl/UserSiteRelationServiceImpl.java b/src/main/java/com/jsnjfz/manage/modular/system/service/impl/UserSiteRelationServiceImpl.java new file mode 100644 index 0000000..c4c434a --- /dev/null +++ b/src/main/java/com/jsnjfz/manage/modular/system/service/impl/UserSiteRelationServiceImpl.java @@ -0,0 +1,19 @@ +package com.jsnjfz.manage.modular.system.service.impl; + +import com.jsnjfz.manage.modular.system.service.BaseService; +import com.jsnjfz.manage.modular.system.model.UserSiteRelation; +import org.springframework.stereotype.Service; + +/** +* @author Administrator +* @description 针对表【user_site_relation】的数据库操作Service实现 +* @createDate 2024-07-02 16:52:21 +*/ +@Service +public class UserSiteRelationServiceImpl extends BaseService{ + +} + + + + From 50634f767899bcc98b7ed6a9278d2c63a692b2d7 Mon Sep 17 00:00:00 2001 From: xianyuxm Date: Tue, 2 Jul 2024 17:45:02 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=BD=91=E5=9D=80=E4=B8=8E=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/IndexController.java | 13 ++++++-- .../system/dao/mapping/CategoryMapper.xml | 31 ++++++++++++++----- .../modular/system/dao/mapping/SiteMapper.xml | 4 +++ .../service/impl/CategoryServiceImpl.java | 11 +++---- 4 files changed, 43 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/jsnjfz/manage/modular/system/controller/IndexController.java b/src/main/java/com/jsnjfz/manage/modular/system/controller/IndexController.java index 1f982b3..feefba3 100644 --- a/src/main/java/com/jsnjfz/manage/modular/system/controller/IndexController.java +++ b/src/main/java/com/jsnjfz/manage/modular/system/controller/IndexController.java @@ -17,6 +17,8 @@ import cn.stylefeng.roses.core.base.controller.BaseController; import com.jsnjfz.manage.core.common.node.MenuNode; +import com.jsnjfz.manage.core.shiro.ShiroKit; +import com.jsnjfz.manage.core.shiro.ShiroUser; import com.jsnjfz.manage.modular.system.model.Category; import com.jsnjfz.manage.modular.system.service.IOperationLogService; import com.jsnjfz.manage.modular.system.service.impl.CategoryServiceImpl; @@ -27,6 +29,8 @@ import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.Objects; /** @@ -45,9 +49,14 @@ public class IndexController extends BaseController { */ @RequestMapping("/") public String index(Model model) { - List menus = categoryService.getCatogryNode(new HashMap<>()); + ShiroUser shiroUser = ShiroKit.getUser(); + Map params = new HashMap<>(); + if (Objects.nonNull(shiroUser)){ + params.put("userId", shiroUser.getId()); + } + List menus = categoryService.getCatogryNode(params); List titles = MenuNode.buildTitle(menus); - List categorySiteList = categoryService.getCatogrySite(null); + List categorySiteList = categoryService.getCatogrySite(params); model.addAttribute("categorySiteList", categorySiteList); model.addAttribute("titles", titles); System.out.println(titles); diff --git a/src/main/java/com/jsnjfz/manage/modular/system/dao/mapping/CategoryMapper.xml b/src/main/java/com/jsnjfz/manage/modular/system/dao/mapping/CategoryMapper.xml index 1b38828..9cf34fe 100644 --- a/src/main/java/com/jsnjfz/manage/modular/system/dao/mapping/CategoryMapper.xml +++ b/src/main/java/com/jsnjfz/manage/modular/system/dao/mapping/CategoryMapper.xml @@ -28,9 +28,13 @@ @@ -76,10 +80,23 @@ diff --git a/src/main/java/com/jsnjfz/manage/modular/system/dao/mapping/SiteMapper.xml b/src/main/java/com/jsnjfz/manage/modular/system/dao/mapping/SiteMapper.xml index 7f3306e..e45be91 100644 --- a/src/main/java/com/jsnjfz/manage/modular/system/dao/mapping/SiteMapper.xml +++ b/src/main/java/com/jsnjfz/manage/modular/system/dao/mapping/SiteMapper.xml @@ -13,7 +13,11 @@ select id,title,sort,icon,create_time createTime,parent_id parentId,levels - from category + from category left join user_category_relation ur on c.id = ur.category_id where 1=1 + + and ur.user_id = #{userId} + and title like CONCAT('%',#{title},'%')