新增角色查找用户

manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/RoleRepository.java

@@ -22,6 +22,7 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -77,4 +78,16 @@ public interface RoleRepository extends JpaRepository<Role, Long>, JpaSpecificat
     @Query(value = "SELECT r.* FROM sys_role r, sys_roles_menus m WHERE " +
             "r.role_id = m.role_id AND m.menu_id in ?1",nativeQuery = true)
     List<Role> findInMenuId(List<Long> menuIds);
+
+
+    /**
+     * 角色查找用户id
+     * @param roleIds
+     * @param flag
+     * @return
+     */
+    @Query(value = "SELECT u.*,u.user_id as id FROM sys_user u, sys_users_roles r WHERE" +
+            " u.user_id = r.user_id AND r.role_id in ?1 AND u.enabled = ?2", nativeQuery = true)
+    List<Map<String, Object>> roleFindUser(List<Long> roleIds, Boolean flag);
+
 }

manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/PayOrderController.java

@@ -36,6 +36,7 @@ public class PayOrderController {
         return new ResponseEntity<>(payOrderService.queryAll(criteria, pageable), HttpStatus.OK);
     }
 
+    @Log("对公打款新增")
     @ApiOperation("新增订单")
     @PostMapping("/create")
     public ResponseEntity<Object> create(@Validated @RequestBody PayOrderDto resources){

manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/RoleController.java

@@ -160,4 +160,11 @@ public class RoleController {
         }
         return min;
     }
+
+
+    @ApiOperation("角色查找用户")
+    @PostMapping(value = "/roleLookupUser")
+    public ResponseEntity<Object> roleLookupUser(@RequestBody List<Long> roleIds) {
+        return new ResponseEntity<>(roleService.roleFindUserId(roleIds), HttpStatus.OK);
+    }
 }

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/RoleService.java

@@ -16,6 +16,7 @@
 package com.baiye.modules.system.service;
 
 import com.baiye.modules.system.domain.Role;
+import com.baiye.modules.system.domain.User;
 import com.baiye.modules.system.service.dto.RoleDto;
 import com.baiye.modules.system.service.dto.RoleQueryCriteria;
 import com.baiye.model.dto.RoleSmallDto;
@@ -148,4 +149,12 @@ public interface RoleService {
      * @return
      */
     Role findRoleById(Long id);
+
+
+    /**
+     * 角色查找用户
+     * @param roleIds
+     * @return
+     */
+    List<User> roleFindUserId(List<Long> roleIds);
 }

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/dto/PayOrderDto.java

@@ -71,4 +71,8 @@ public class PayOrderDto extends BaseDTO implements Serializable {
     @ApiModelProperty(value = "金额")
     private Double amount;
 
+
+    @NotNull
+    @ApiModelProperty(value = "购买人id")
+    private Long userId;
 }

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayOrderServiceImpl.java

@@ -2,6 +2,7 @@ package com.baiye.modules.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.json.JSONUtil;
 import com.baiye.constant.DefaultNumberConstants;
@@ -102,6 +103,10 @@ public class PayOrderServiceImpl implements PayOrderService {
         checkPer();
         PayOrder payOrder = new PayOrder();
         BeanUtil.copyProperties(resources, payOrder);
+        payOrder.setPayTime(DateUtil.date());
+        payOrder.setUserId(resources.getUserId());
+        payOrder.setStatus(DefaultNumberConstants.ONE_NUMBER);
+        payOrder.setPayType(DefaultNumberConstants.TWO_NUMBER);
         payOrderRepository.save(payOrder);
     }
 

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/RoleServiceImpl.java

@@ -16,28 +16,28 @@
 package com.baiye.modules.system.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.convert.Convert;
 import com.baiye.config.CustomAuthorityDeserializer;
 import com.baiye.constant.DefaultNumberConstants;
 import com.baiye.exception.BadRequestException;
 import com.baiye.exception.EntityExistException;
-import com.baiye.modules.system.service.UserService;
-import com.baiye.service.UserCacheClean;
+import com.baiye.model.dto.RoleSmallDto;
+import com.baiye.model.dto.UserDto;
 import com.baiye.modules.system.domain.Menu;
 import com.baiye.modules.system.domain.Role;
 import com.baiye.modules.system.domain.User;
 import com.baiye.modules.system.repository.RoleRepository;
 import com.baiye.modules.system.repository.UserRepository;
 import com.baiye.modules.system.service.RoleService;
+import com.baiye.modules.system.service.UserService;
 import com.baiye.modules.system.service.dto.RoleDto;
 import com.baiye.modules.system.service.dto.RoleQueryCriteria;
-import com.baiye.model.dto.RoleSmallDto;
-import com.baiye.model.dto.UserDto;
 import com.baiye.modules.system.service.mapstruct.RoleMapper;
 import com.baiye.modules.system.service.mapstruct.RoleSmallMapper;
+import com.baiye.service.UserCacheClean;
 import com.baiye.util.*;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import lombok.RequiredArgsConstructor;
-
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
@@ -250,10 +250,10 @@ public class RoleServiceImpl implements RoleService {
         Set<Role> roles = roleRepository.findByUserId(userDto.getId());
         return roles.stream().flatMap
                         (role -> role.getMenus().stream())
-                            .filter(menu ->
-                                    StringUtils.isNotBlank(menu.getPermission()))
-                                .map(Menu::getPermission)
-                            .collect(Collectors.toSet());
+                .filter(menu ->
+                        StringUtils.isNotBlank(menu.getPermission()))
+                .map(Menu::getPermission)
+                .collect(Collectors.toSet());
 
     }
 
@@ -264,6 +264,12 @@ public class RoleServiceImpl implements RoleService {
         return role;
     }
 
+    @Override
+    public List<User> roleFindUserId(List<Long> roleIds) {
+        List<Map<String, Object>> maps = roleRepository.roleFindUser(roleIds, Boolean.TRUE);
+        return Convert.toList(User.class,maps);
+    }
+
     /**
      * 清理缓存
      *

manage/ad-platform-management/src/test/java/com/baiye/OrganizeTest.java

@@ -1,6 +1,10 @@
 package com.baiye;
 
+import com.baiye.model.dto.UserDto;
+import com.baiye.modules.system.domain.User;
 import com.baiye.modules.system.repository.OrganizeUserRepository;
+import com.baiye.modules.system.service.RoleService;
+import com.baiye.modules.system.service.UserService;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,6 +13,8 @@ import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author Enzo
@@ -21,11 +27,16 @@ import javax.annotation.Resource;
 public class OrganizeTest {
     @Resource
     private OrganizeUserRepository organizeUserRepository;
+    @Resource
+    private RoleService roleService;
+
 
     @Test
     @Transactional(rollbackFor = Exception.class)
     public void getSetting() {
-        organizeUserRepository.updateUserId(176L, 50L);
-
+        List<Long> list = new ArrayList<>();
+        list.add(8L);
+        List<User> userDtos = roleService.roleFindUserId(list);
+        log.debug("");
     }
 }