init

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

@@ -7,6 +7,7 @@ import com.ruoyi.cai.domain.User;
 import com.ruoyi.cai.domain.UserOnline;
 import com.ruoyi.cai.dto.admin.vo.AnchorAdminVo;
 import com.ruoyi.cai.dto.admin.vo.AnchorFullAdminVo;
+import com.ruoyi.cai.notice.YunxinHttpService;
 import com.ruoyi.cai.service.AnchorService;
 import com.ruoyi.cai.service.UserInfoService;
 import com.ruoyi.cai.service.UserOnlineService;
@@ -20,6 +21,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -97,13 +99,18 @@ public class AnchorController extends BaseController {
         return toAjax(anchorService.updateById(bo));
     }
 
+    @Autowired
+    private YunxinHttpService yunxinHttpService;
+
     @SaCheckPermission("cai:anchor:remove")
     @Log(title = "女神列表", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userId}")
     public R<Void> remove(@NotNull(message = "主键不能为空")
                           @PathVariable Long userId) {
-
-        anchorService.closeAnchor(userId);
+        boolean boo = anchorService.closeAnchor(userId);
+        if(boo){
+            yunxinHttpService.cancelAnchorMessage(userId);
+        }
         return R.ok();
     }
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.Dynamic;
 import com.ruoyi.cai.dto.admin.query.BatchAuditReq;
 import com.ruoyi.cai.dto.admin.vo.DynamicAdminVo;
+import com.ruoyi.cai.dto.app.query.IdRes;
 import com.ruoyi.cai.enums.AuditStatusEnum;
 import com.ruoyi.cai.service.DynamicService;
 import com.ruoyi.common.annotation.Log;
@@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -74,26 +76,32 @@ public class DynamicController extends BaseController {
         return toAjax(dynamicService.save(bo));
     }
 
-    /**
-     * 修改主播动态
-     */
     @SaCheckPermission("cai:dynamic:edit")
-    @Log(title = "主播动态", businessType = BusinessType.UPDATE)
+    @Log(title = "主播动态修改成功", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody Dynamic bo) {
-        return toAjax(dynamicService.updateById(bo));
+    @PutMapping("/audit/success")
+    public R<Void> auditSuccess(@RequestBody IdRes bo) {
+        boolean success = dynamicService.auditSuccess(Collections.singletonList(bo.getId()));
+        return R.ok();
+    }
+
+
+    @SaCheckPermission("cai:dynamic:edit")
+    @Log(title = "主播动态修改失败", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("/audit/fail")
+    public R<Void> auditFail(@RequestBody IdRes bo) {
+        dynamicService.auditFail(bo.getId());
+        return R.ok();
     }
 
     @SaCheckPermission("cai:dynamic:edit")
     @RepeatSubmit()
     @PostMapping("/batch/audit")
-    public R<Void> edit(@RequestBody BatchAuditReq bo) {
-        dynamicService.update(Wrappers.lambdaUpdate(Dynamic.class)
-                .in(Dynamic::getId,bo.getIds())
-                .set(Dynamic::getAuditStatus,bo.getAuditStatus())
-                .eq(Dynamic::getAuditStatus,1));
-        return R.ok();
+    @Log(title = "批量审核通过动态", businessType = BusinessType.UPDATE)
+    public R<Boolean> edit(@RequestBody BatchAuditReq bo) {
+        boolean success = dynamicService.auditSuccess(bo.getIds());
+        return R.ok(success);
     }
 
     @SaCheckPermission("cai:dynamic:edit")

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

@@ -86,6 +86,14 @@ public class UserController extends BaseController {
         return R.ok();
     }
 
+    @PostMapping("/resetNickname")
+    @SaCheckPermission("cai:user:resetNickname")
+    @Log(title = "重置用户昵称", businessType = BusinessType.UPDATE)
+    public R<Void> resetNickname(@RequestBody IdRes res){
+        userService.resetNickname(res.getId());
+        return R.ok();
+    }
+
     @PostMapping("/userForbid")
     @SaCheckPermission("cai:user:lock")
     @Log(title = "封禁用户", businessType = BusinessType.UPDATE)

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

@@ -96,7 +96,7 @@ public class AuthAppController {
         vo.setToken(token);
         vo.setUserInfo(currentUserManager.currentInfo());
         // 异步调用通知
-        loginAfterManager.loginAfter(LoginHelper.getUserId());
+//        loginAfterManager.loginAfter(LoginHelper.getUserId());
         return R.ok(vo);
     }