init

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserGreetController.java

@@ -0,0 +1,96 @@
+package com.ruoyi.cai.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.cai.domain.UserGreet;
+import com.ruoyi.cai.service.UserGreetService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.enums.BusinessType;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+/**
+ * 群发审核
+ *
+ * @author 77
+ * @date 2024-01-01
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/cai/userGreet")
+public class UserGreetController extends BaseController {
+
+    private final UserGreetService userGreetService;
+
+    /**
+     * 查询群发审核列表
+     */
+    @SaCheckPermission("cai:userGreet:list")
+    @GetMapping("/list")
+    public TableDataInfo<UserGreet> list(UserGreet bo, PageQuery pageQuery) {
+        Page<UserGreet> page = userGreetService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        return TableDataInfo.build(page);
+    }
+
+
+    /**
+     * 获取群发审核详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("cai:userGreet:query")
+    @GetMapping("/{id}")
+    public R<UserGreet> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Integer id) {
+        return R.ok(userGreetService.getById(id));
+    }
+
+    /**
+     * 新增群发审核
+     */
+    @SaCheckPermission("cai:userGreet:add")
+    @Log(title = "群发审核", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody UserGreet bo) {
+        return toAjax(userGreetService.save(bo));
+    }
+
+    /**
+     * 修改群发审核
+     */
+    @SaCheckPermission("cai:userGreet:edit")
+    @Log(title = "群发审核", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserGreet bo) {
+        return toAjax(userGreetService.updateById(bo));
+    }
+
+    /**
+     * 删除群发审核
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("cai:userGreet:remove")
+    @Log(title = "群发审核", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Integer[] ids) {
+        return toAjax(userGreetService.removeBatchByIds(Arrays.asList(ids)));
+    }
+}

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java

@@ -2,8 +2,9 @@ package com.ruoyi.cai.controller.app;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.Banner;
-import com.ruoyi.cai.dto.app.query.AnchorListQuery;
-import com.ruoyi.cai.dto.app.query.UserQuery;
+import com.ruoyi.cai.dto.app.query.index.AnchorListQuery;
+import com.ruoyi.cai.dto.app.query.index.GreetQuery;
+import com.ruoyi.cai.dto.app.query.index.UserQuery;
 import com.ruoyi.cai.dto.app.vo.AnchorListVo;
 import com.ruoyi.cai.dto.app.vo.IndexBannerVo;
 import com.ruoyi.cai.dto.app.vo.user.UserInfoVo;
@@ -49,19 +50,26 @@ public class IndexController {
     }
 
     @GetMapping("/anchor/page")
-    @Operation(summary = "查询主播-分页")
+    @Operation(summary = "首页查询主播接口-分页")
     public TableDataInfo<AnchorListVo> page(PageQuery page, AnchorListQuery query){
         Page<AnchorListVo> res = anchorService.pageApp(page,query);
         return TableDataInfo.build(res);
     }
 
     @GetMapping("/user/page")
-    @Operation(summary = "用户全局查询-分页")
+    @Operation(summary = "首页用户搜索接口-分页")
     public TableDataInfo<UserListVo> page(PageQuery page, UserQuery query){
         Page<UserListVo> res = userService.pageApp(page,query);
         return TableDataInfo.build(res);
     }
 
+    @GetMapping("/user/greet/page")
+    @Operation(summary = "群打招呼界面-用户搜索接口")
+    public TableDataInfo<UserListVo> greetQuery(PageQuery page, GreetQuery query){
+        Page<UserListVo> res = userService.greetPageApp(page,query);
+        return TableDataInfo.build(res);
+    }
+
     @GetMapping("/home/info")
     @Operation(summary = "获取指定用户主页信息")
     public R<UserInfoVo> info(Long userId){