ycl-common/src/main/java/com/ycl/config/ExceptionConfiguration.java
New file @@ -0,0 +1,48 @@ package com.ycl.config; import com.ycl.api.CommonResult; import com.ycl.enums.common.ResultCode; import com.ycl.exception.ApiException; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Controller; import org.springframework.validation.FieldError; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @Configuration @ControllerAdvice(annotations = {RestController.class, Controller.class}) @ResponseBody public class ExceptionConfiguration { // 捕获自定义异常数据 @ExceptionHandler(value = ApiException.class) public CommonResult HandlePubException(ApiException pubExceptions) { System.out.println(String.format("错误：%d： %s", pubExceptions.getErrorCode().getCode(), pubExceptions.getErrorCode().getMessage())); return CommonResult.failed(pubExceptions.getErrorCode()); } @ExceptionHandler(value = MethodArgumentNotValidException.class) public CommonResult HandleParamsException(HttpServletRequest request, MethodArgumentNotValidException exception) { StringBuffer buffer = new StringBuffer(); for (FieldError error : exception.getBindingResult().getFieldErrors()) { buffer.append(String.format("参数:%s,值为:%s, 原因:%s。", error.getField(), error.getRejectedValue(), error.getDefaultMessage())); } return CommonResult.failed(ResultCode.VALIDATE_FAILED, buffer.toString()); } // 捕获其他异常 @ExceptionHandler// 直接返回500 public CommonResult HandleAllException(Exception exception) { exception.printStackTrace(); // todo 记录日志 return CommonResult.failed(ResultCode.FAILED, "系统错误"); } } ycl-common/src/main/java/com/ycl/entity/user/AdminMenuRelation.java
@@ -45,5 +45,10 @@ @TableField("is_start") private Integer isStart; /** * 菜单序号 */ @TableField("sort") private Integer sort; } ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java
@@ -36,7 +36,7 @@ private String name; @ApiModelProperty(value = "角色类型") private String type; private Long type; @ApiModelProperty(value = "描述") private String description; ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java
@@ -168,7 +168,7 @@ List<AdminDepartDTO.UserInfoDTO> userInfoDTOS = umsAdminDeparts.stream().map(a -> { AdminDepartDTO.UserInfoDTO userInfoDTO = new AdminDepartDTO.UserInfoDTO(); userInfoDTO.setUserId(a.getUserId()); userInfoDTO.setUsername(umsAdminService.getById(a.getUserId()).getUsername()); // userInfoDTO.setUsername(umsAdminService.getById(a.getUserId()).getUsername()); return userInfoDTO; }).collect(Collectors.toList()); record.setUserInfoDTOS(userInfoDTOS); ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -81,6 +81,8 @@ UmsRoleMenuRelationMapper umsRoleMenuRelationMapper; @Resource AdminMenuRelationMapper adminMenuRelationMapper; @Resource UmsMenuMapper umsMenuMapper; @Override public UmsAdmin getAdminByUsername(String username) { @@ -148,10 +150,11 @@ .selectList(new LambdaQueryWrapper<UmsRoleMenuRelation>() .eq(UmsRoleMenuRelation::getRoleId, maxId)) .stream() .forEach(item->{ .forEach(item -> { AdminMenuRelation adminMenuRelation = new AdminMenuRelation(); adminMenuRelation.setAdminId(umsAdmin.getId()); adminMenuRelation.setMenuId(item.getMenuId()); adminMenuRelation.setSort(umsMenuMapper.selectOne(new LambdaQueryWrapper<UmsMenu>().eq(UmsMenu::getId, item.getMenuId())).getSort()); adminMenuRelationMapper.insert(adminMenuRelation); }); } @@ -416,11 +419,11 @@ QueryWrapper<UmsAdmin> wrapperUser = new QueryWrapper<>(); wrapperUser.in("id", arr); List<UmsAdmin> adminList = baseMapper.selectList(wrapperUser); if (adminList == null||adminList.isEmpty()) { if (adminList == null || adminList.isEmpty()) { throw new ApiException("未查询到用户"); } if ("02".equals(sendType)) { str = adminList.stream().map(UmsAdmin::getEmail).collect(Collectors.joining(",")); str = adminList.stream().map(UmsAdmin::getEmail).collect(Collectors.joining(",")); } else { str = adminList.stream().map(UmsAdmin::getMobile).collect(Collectors.joining(",")); } ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
@@ -62,7 +62,16 @@ SELECT amr.id AS relationId, amr.is_start AS isStart, m.* amr.sort, m.id, m.parent_id AS parentId, m.title, m.url, m.`level`, m.description, m.create_time as createTime, m.hidden, m.icon FROM `ums_admin_menu_relation` AS amr JOIN ums_menu AS m ON amr.menu_id = m.id ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java
@@ -110,7 +110,6 @@ @ApiOperation("菜单权限-个人菜单查询") @GetMapping("/menu/search_myself") @LogSave(contain = "登录拿到个人菜单",operationType = "个人操作") public CommonResult searchMenusMyself() { AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); return CommonResult.success(umsMenuService.ListTreeMyself(user.getUserId())); ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ycl.api.CommonPage; import com.ycl.api.CommonResult; import com.ycl.common.util.UtilNumber; import com.ycl.dto.UmsStoreInfoParam; import com.ycl.entity.store.StoreInfo; import com.ycl.service.store.StoreInfoService; @@ -27,6 +28,9 @@ @Api(tags = "门店管理") public class StoreInfoController { private StoreInfoService storeInfoService; @Autowired UtilNumber utilNumber; @Autowired public void setUmsStoreInfoService(StoreInfoService umsStoreInfoService) { @@ -62,6 +66,7 @@ .storeAddress(umsStoreInfoParam.getStoreaddr()) .storePhoto(umsStoreInfoParam.getStorephoto()) .idCardInfo(umsStoreInfoParam.getIdcardinfo()) .storeNumber(utilNumber.createShopCode()) .storeScore(umsStoreInfoParam.getStorescore()).build(); boolean success = storeInfoService.save(storeInfo); if (success) {
