tongtong/youlai-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/youlaiorg/youlai-boot into feature/noticews

Browse Source 
# Conflicts:
#	sql/mysql5/youlai_boot.sql
#	src/main/java/com/youlai/boot/module/websocket/service/MessageService.java
#	src/main/java/com/youlai/boot/module/websocket/service/WebsocketService.java
#	src/main/java/com/youlai/boot/module/websocket/service/impl/WebsocketServiceImpl.java
#	src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java
This commit is contained in:
胡少翔
2024-09-12 09:36:04 +08:00
parent f5977783ff c7b593d85e
commit fa77b5cb8c
71 changed files with 1040 additions and 1066 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/youlai/boot/system/model/query/MenuQuery.java
View File

@@ -9,7 +9,7 @@ import lombok.Data;
* @author haoxr
* @since 2022/10/28
*/
@Schema(description ="部门分页查询对象")
@Schema(description ="菜单查询对象")
@Data
public class MenuQuery {

6
src/main/java/com/youlai/boot/system/service/MenuService.java
View File

@@ -1,7 +1,7 @@
package com.youlai.boot.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.youlai.boot.platform.generator.model.entity.GenConfig;
import com.youlai.boot.module.codegen.model.entity.GenConfig;
import com.youlai.boot.system.model.form.MenuForm;
import com.youlai.boot.common.model.Option;
import com.youlai.boot.system.model.entity.Menu;
@@ -67,10 +67,10 @@ public interface MenuService extends IService<Menu> {
boolean deleteMenu(Long id);
/**
* 为代码生成添加菜单
* 代码生成时添加菜单
*
* @param parentMenuId 父菜单ID
* @param genConfig 实体名
*/
void saveMenu(Long parentMenuId, GenConfig genConfig);
void addMenuForCodegen(Long parentMenuId, GenConfig genConfig);
}

7
src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java
View File

@@ -13,7 +13,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.youlai.boot.system.converter.MenuConverter;
import com.youlai.boot.system.mapper.MenuMapper;
import com.youlai.boot.system.model.bo.RouteBO;
import com.youlai.boot.platform.generator.model.entity.GenConfig;
import com.youlai.boot.module.codegen.model.entity.GenConfig;
import com.youlai.boot.system.model.entity.Menu;
import com.youlai.boot.system.model.form.MenuForm;
import com.youlai.boot.system.model.query.MenuQuery;
@@ -362,13 +362,13 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
}
/**
* 为代码生成添加菜单
* 代码生成时添加菜单
*
* @param parentMenuId 父菜单ID
* @param genConfig 实体名称
*/
@Override
public void saveMenu(Long parentMenuId, GenConfig genConfig) {
public void addMenuForCodegen(Long parentMenuId, GenConfig genConfig) {
Menu parentMenu = this.getById(parentMenuId);
Assert.notNull(parentMenu, "上级菜单不存在");
@@ -389,7 +389,6 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
sort = maxSortMenu.getSort() + 1;
}
Menu menu = new Menu();
menu.setParentId(parentMenuId);
menu.setName(genConfig.getBusinessName());

2
src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java
View File

@@ -14,6 +14,8 @@ import com.youlai.boot.common.enums.ContactType;
import com.youlai.boot.common.model.Option;
import com.youlai.boot.platform.mail.service.MailService;
import com.youlai.boot.platform.sms.service.SmsService;
import com.youlai.boot.module.mail.service.MailService;
import com.youlai.boot.module.sms.service.SmsService;
import com.youlai.boot.system.model.entity.User;
import com.youlai.boot.system.model.form.*;
import com.youlai.boot.config.property.AliyunSmsProperties;