czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangw
2025-02-19 17:16:00 +08:00
parent 1ef28891a5 b29eb348e5
commit 7b48b64ef0
11 changed files with 230 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
cash-api/account-server/src/main/java/com/czg/AccountApplication.java
View File

@@ -1,29 +1,12 @@
package com.czg;
import com.czg.account.entity.SysMenu;
import com.czg.account.entity.SysRolesMenus;
import com.czg.account.service.SysMenuService;
import com.czg.account.service.SysRolesMenusService;
import com.czg.annotation.SaAdminCheckPermission;
import com.mybatisflex.core.dialect.DbType;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.context.annotation.Bean;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
import java.lang.reflect.Method;
import java.util.Map;
/**
* @author ww
@@ -34,51 +17,9 @@ import java.util.Map;
@MapperScan("com.czg.service.account.mapper")
@EnableDubbo
@Slf4j
public class AccountApplication implements CommandLineRunner {
public class AccountApplication{
public static void main(String[] args) {
SpringApplication.run(AccountApplication.class, args);
}
@Autowired
private RequestMappingHandlerMapping requestMappingHandlerMapping;
@Autowired
private SysMenuService sysMenuService;
@Autowired
private SysRolesMenusService sysRolesMenusService;
public void run(String... args) {
Map<RequestMappingInfo, HandlerMethod> handlerMethods = this.requestMappingHandlerMapping.getHandlerMethods();
handlerMethods.forEach((key, value) -> {
Method method = value.getMethod();
SaAdminCheckPermission annotation = AnnotationUtils.getAnnotation(method, SaAdminCheckPermission.class);
if (annotation == null) return;
for (String s : annotation.value()) {
SysMenu menu1 = sysMenuService.queryChain().eq(SysMenu::getPermission, s).one();
if (menu1 !=null) {
long count1 = sysRolesMenusService.queryChain().eq(SysRolesMenus::getMenuId, menu1.getMenuId()).eq(SysRolesMenus::getRoleId, 1L).count();
if (count1 == 0) {
SysRolesMenus sysRolesMenus = new SysRolesMenus();
sysRolesMenus.setMenuId(menu1.getMenuId());
sysRolesMenus.setRoleId(1L);
sysRolesMenusService.save(sysRolesMenus);
log.info("接口菜单添加成功, 菜单名称: {}, 菜单权限: {}", menu1.getName(), menu1.getPermission());
}
continue;
}
SysMenu sysMenu = new SysMenu();
sysMenu.setPermission(s);
sysMenu.setName(s);
sysMenu.setType(2);
sysMenuService.save(sysMenu);
SysRolesMenus sysRolesMenus = new SysRolesMenus();
sysRolesMenus.setMenuId(sysMenu.getMenuId());
sysRolesMenus.setRoleId(1L);
sysRolesMenusService.save(sysRolesMenus);
log.info("接口菜单添加成功, 菜单名称: {}, 菜单权限: {}", sysMenu.getName(), sysMenu.getPermission());
}
});
}
}

2
cash-api/account-server/src/main/java/com/czg/controller/admin/MerchantRegisterController.java
View File

@@ -33,7 +33,7 @@ public class MerchantRegisterController {
* @return 激活码列表
*/
@SaAdminCheckRole("管理员")
@SaAdminCheckPermission("merchantRegister:list")
@SaAdminCheckPermission(value = "merchantRegister:list", name = "激活码列表")
@GetMapping
public CzgResult<Page<MerchantRegister>> get(PageDTO pageDTO, Integer state, String startTime, String endTime) {
return CzgResult.success(merchantRegisterService.get(pageDTO, state, startTime, endTime));

19
cash-api/product-server/src/main/java/com/czg/controller/user/UProductController.java
View File

@@ -3,8 +3,9 @@ package com.czg.controller.user;
import com.czg.log.annotation.OperationLog;
import com.czg.product.param.MiniHomeProductParam;
import com.czg.product.service.UProductService;
import com.czg.product.vo.HotsProductVo;
import com.czg.product.vo.MiniAppHomeProductVo;
import com.czg.product.vo.ShopGroupProductVo;
import com.czg.product.vo.ShopProductVo;
import com.czg.resp.CzgResult;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
@@ -38,12 +39,22 @@ public class UProductController {
}
/**
* 小程序点餐-热销商品查询
* 小程序点餐-热销商品列表
*/
@GetMapping("/miniApp/hots/query")
@OperationLog("小程序点餐-热销商品列表")
public CzgResult<List<HotsProductVo>> queryProductForMiniAppHome() {
List<HotsProductVo> list = uProductService.queryHotsProductList();
public CzgResult<List<ShopProductVo>> queryHotsProductList() {
List<ShopProductVo> list = uProductService.queryHotsProductList();
return CzgResult.success(list);
}
/**
* 小程序点餐-分组商品列表
*/
@GetMapping("/miniApp/group/query")
@OperationLog("小程序点餐-分组商品列表")
public CzgResult<List<ShopGroupProductVo>> queryGroupProductList() {
List<ShopGroupProductVo> list = uProductService.queryGroupProductList();
return CzgResult.success(list);
}