1.食堂人流量

2.消费记录
3.优化修改角色菜单慢

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/domain/DmOrderRecord.java

@@ -51,7 +51,7 @@ public class DmOrderRecord implements Serializable {
 //    @ManyToOne(fetch=FetchType.LAZY)
 //    @ApiModelProperty(value = "订单编号", hidden = true)
     @OneToMany
-    @JoinColumn(name = "bh")
+    @JoinColumn(name = "bh",referencedColumnName = "bh")
     @ApiModelProperty(value = "订单编号")
     private List<DmOrderItem> orderItems;
 

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/service/dto/DmOrderRecordQueryCriteria.java

@@ -35,6 +35,9 @@ public class DmOrderRecordQueryCriteria{
     @Query
     private Long id;
 
+    @Query
+    private String card;
+
     @Query(propName = "bh", type = Query.Type.INNER_LIKE, joinName = "orderItem")
     private String bh;
     /** 模糊 */

eladmin-system/src/main/java/me/zhengjie/modules/system/repository/UserRepository.java

@@ -24,6 +24,7 @@ import org.springframework.data.repository.query.Param;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -81,6 +82,15 @@ public interface UserRepository extends JpaRepository<User, String>, JpaSpecific
             " u.user_id = r.user_id AND r.role_id = ?1", nativeQuery = true)
     List<User> findByRoleId(String roleId);
 
+    /**
+     * 根据角色查询用户
+     * @param roleId /
+     * @return /
+     */
+    @Query(value = "SELECT u.user_id as userId,u.username FROM sys_user u, sys_users_roles r WHERE" +
+            " u.user_id = r.user_id AND r.role_id = ?1", nativeQuery = true)
+    List<Map<String,Object>> findByRoleId2(String roleId);
+
     /**
      * 根据角色中的部门查询
      * @param deptId /

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java

@@ -128,7 +128,14 @@ public class RoleServiceImpl implements RoleService {
     @Override
     public void updateMenu(Role resources, RoleDto roleDTO) {
         Role role = roleMapper.toEntity(roleDTO);
-        List<User> users = userRepository.findByRoleId(role.getId());
+        List<User> users = new ArrayList<>();
+        List<Map<String,Object>> userMap = userRepository.findByRoleId2(role.getId());
+        for(Map<String,Object> map : userMap){
+            User user = new User();
+            user.setId(map.get("userId").toString());
+            user.setUsername(map.get("username").toString());
+            users.add(user);
+        }
         // 更新菜单
         role.setMenus(resources.getMenus());
         delCaches(resources.getId(), users);

eladmin-system/src/main/java/me/zhengjie/modules/thirdparty/v1/OpenApiController.java

@@ -10,7 +10,6 @@ import me.zhengjie.annotation.rest.AnonymousGetMapping;
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
 import me.zhengjie.base.BaseResponse;
 import me.zhengjie.base.QueryPageParams;
-import me.zhengjie.config.rabbitmq.test.SendTemplate;
 import me.zhengjie.domain.LocalStorage;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.modules.dm.daypc.domain.DmDayPc;
@@ -24,6 +23,8 @@ import me.zhengjie.modules.dm.order.domain.DmOrderItem;
 import me.zhengjie.modules.dm.order.domain.DmOrderRecord;
 import me.zhengjie.modules.dm.order.repository.DmOrderItemRepository;
 import me.zhengjie.modules.dm.order.repository.DmOrderRecordRepository;
+import me.zhengjie.modules.dm.order.service.DmOrderRecordService;
+import me.zhengjie.modules.dm.order.service.dto.DmOrderRecordQueryCriteria;
 import me.zhengjie.modules.dm.service.domain.DmServicePj;
 import me.zhengjie.modules.dm.service.repository.DmServicePjRepository;
 import me.zhengjie.modules.dm.service.service.DmServicePjService;
@@ -58,6 +59,7 @@ public class OpenApiController {
     private final DmOrderItemRepository orderItemRepository;
     private final DmFoodCateRepository dmFoodCateRepository;
     private final DmServicePjRepository dmServicePjRepository;
+    private final DmOrderRecordService dmOrderRecordService;
 
     @Log("获取今日菜品-App")
     @ApiOperation("获取今日菜品-App")
@@ -260,5 +262,20 @@ public class OpenApiController {
         return new BaseResponse<>(jsonObjectList);
     }
 
+    @AnonymousPostMapping(value = "/expenseFlow")
+    @Log("食堂人流量")
+    @ApiOperation("食堂人流量")
+    public BaseResponse<Object> expenseFlow(@RequestBody QueryPageParams<DmOrderRecordQueryCriteria> criteria){
+        SecurityUtils.CheckApiAuth(criteria);
+        return new BaseResponse<>(dmOrderRecordService.queryAll(criteria.getQuery()).size());
+    }
+
+    @AnonymousPostMapping(value = "/orderRecord")
+    @Log("消费记录")
+    @ApiOperation("消费记录")
+    public BaseResponse<Object> orderRecord(@RequestBody QueryPageParams<DmOrderRecordQueryCriteria> criteria,Pageable pageable){
+        SecurityUtils.CheckApiAuth(criteria);
+        return new BaseResponse<>(dmOrderRecordService.queryAll(criteria.getQuery(),pageable));
+    }
 
 }