|
@@ -3,14 +3,18 @@ package com.yonge.cooleshow.admin.controller;
|
|
|
|
|
|
import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
|
|
|
import com.yonge.cooleshow.auth.api.entity.SysUser;
|
|
|
+import com.yonge.cooleshow.biz.dal.dto.ImGroupSearchDto;
|
|
|
import com.yonge.cooleshow.biz.dal.entity.ImGroup;
|
|
|
import com.yonge.cooleshow.biz.dal.service.ImGroupService;
|
|
|
import com.yonge.cooleshow.common.controller.BaseController;
|
|
|
import com.yonge.cooleshow.common.entity.HttpResponseResult;
|
|
|
+import com.yonge.toolset.utils.validator.ValidationKit;
|
|
|
import io.swagger.annotations.*;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
+import org.springframework.validation.BindingResult;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import javax.annotation.Resource;
|
|
|
+import javax.validation.Valid;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
@@ -39,16 +43,14 @@ public class ImGroupController extends BaseController {
|
|
|
return succeed(imGroupService.getById(groupId));
|
|
|
}
|
|
|
|
|
|
- @ApiImplicitParams({
|
|
|
- @ApiImplicitParam(name = "search", dataType = "String", value = "根据群名称、编号、简介模糊查询"),
|
|
|
- })
|
|
|
@ApiOperation("群列表")
|
|
|
@PostMapping(value = "/queryAll")
|
|
|
@PreAuthorize("@pcs.hasPermissions('imGroup/queryAll')")
|
|
|
- public HttpResponseResult<List<ImGroup>> queryAll(@RequestBody Map<String,Object> params) throws Exception {
|
|
|
+ public HttpResponseResult<List<ImGroup>> queryAll(@Valid @RequestBody ImGroupSearchDto imGroupSearchDto, BindingResult bindingResult) throws Exception {
|
|
|
+ ValidationKit.ignoreFields(bindingResult,"createUserId");
|
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
- params.put("userId",sysUser.getId());
|
|
|
- return succeed(imGroupService.queryAll(params));
|
|
|
+ imGroupSearchDto.setUserId(sysUser.getId());
|
|
|
+ return succeed(imGroupService.queryAll(imGroupSearchDto));
|
|
|
}
|
|
|
}
|
|
|
|