From 2e09d39736c5bf93cdb8c843452e1b3406cbf963 Mon Sep 17 00:00:00 2001 From: linhw <5331581+linhw11@user.noreply.gitee.com> Date: Mon, 24 Jun 2024 10:13:01 +0800 Subject: [PATCH] ~ --- .../AppDynamicCommentController.java | 12 ++++++- .../impl/AppDynamicCommentServiceImpl.java | 3 -- .../impl/AppUserFriendServiceImpl.java | 31 ++++++++++++++----- .../app/service/impl/AppUserServiceImpl.java | 3 +- .../app/utils/aliyun/sms/SendNoteUtil.java | 16 ++++++++-- 5 files changed, 49 insertions(+), 16 deletions(-) diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppDynamicCommentController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppDynamicCommentController.java index d117f49..170b0d4 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppDynamicCommentController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppDynamicCommentController.java @@ -3,9 +3,11 @@ package com.ruoyi.app.controller; import java.util.List; import java.io.IOException; import java.util.Map; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import com.ruoyi.app.domain.vo.AppDynamicCommentVo; +import com.ruoyi.app.mapper.AppDynamicCommentMapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -27,6 +29,8 @@ import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.utils.poi.ExcelUtil; import com.ruoyi.common.core.web.page.TableDataInfo; +import static com.ruoyi.common.core.utils.PageUtils.startPage; + /** * 动态评论Controller * @@ -41,6 +45,9 @@ public class AppDynamicCommentController extends BaseController @Autowired private IAppDynamicCommentService appDynamicCommentService; + @Resource + private AppDynamicCommentMapper appDynamicCommentMapper; + /** * 查询动态评论列表 */ @@ -119,7 +126,10 @@ public class AppDynamicCommentController extends BaseController @GetMapping("/treeList") @ApiOperation(value = "评论树列表", notes = "评论树列表", httpMethod = "GET") public AjaxResult treeList(AppDynamicComment appDynamicComment) { - Map list = appDynamicCommentService.treeList(appDynamicComment); + List list = appDynamicCommentMapper.selectCommentList(appDynamicComment); + startPage(); + Map map = appDynamicCommentService.treeList(appDynamicComment); + map.put("countNum",list.size()); return AjaxResult.success(list); } } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppDynamicCommentServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppDynamicCommentServiceImpl.java index dfba8a1..6fabc9b 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppDynamicCommentServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppDynamicCommentServiceImpl.java @@ -128,12 +128,9 @@ public class AppDynamicCommentServiceImpl implements IAppDynamicCommentService if (appDynamicComment.getDynamicId() == null) { return map; } - List list = appDynamicCommentMapper.selectCommentList(appDynamicComment); - startPage(); List appDynamicComments = appDynamicCommentMapper.selectCommentList(appDynamicComment); List parentList = appDynamicComments.stream().filter(entity -> entity.getParentId() == null).collect(Collectors.toList()); List srcList = appDynamicComments.stream().filter(entity -> entity.getParentId() != null).collect(Collectors.toList()); - map.put("countNum",list.size()); map.put("list",buildList(parentList,srcList)); return map; } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserFriendServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserFriendServiceImpl.java index 7e35a8a..e34c345 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserFriendServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserFriendServiceImpl.java @@ -57,7 +57,7 @@ public class AppUserFriendServiceImpl implements IAppUserFriendService public AjaxResult insertAppUserFriend(AppUserFriend appUserFriend) { appUserFriend.setCreateTime(DateUtils.getNowDate()); - appUserFriend.setStatus(appUserFriend.getStatus() == null ? 0l : appUserFriend.getStatus()); + appUserFriend.setStatus(appUserFriend.getStatus() == null ? 2l : appUserFriend.getStatus()); AppUserFriend entity = new AppUserFriend(); entity.setUserId(appUserFriend.getUserId()); entity.setFriendId(appUserFriend.getFriendId()); @@ -71,12 +71,12 @@ public class AppUserFriendServiceImpl implements IAppUserFriendService if (list != null && list.size() > 0) { return AjaxResult.error(2001,"已添加过好友！"); } - AppUserFriend friend = new AppUserFriend(); + /* AppUserFriend friend = new AppUserFriend(); friend.setStatus(0l); friend.setCreateTime(DateUtils.getNowDate()); friend.setUserId(appUserFriend.getFriendId()); friend.setFriendId(appUserFriend.getUserId()); - appUserFriendMapper.insertAppUserFriend(friend); + appUserFriendMapper.insertAppUserFriend(friend);*/ return AjaxResult.success(appUserFriendMapper.insertAppUserFriend(appUserFriend)); } @@ -87,9 +87,17 @@ public class AppUserFriendServiceImpl implements IAppUserFriendService * @return 结果 */ @Override - public int updateAppUserFriend(AppUserFriend appUserFriend) - { + public int updateAppUserFriend(AppUserFriend appUserFriend) { appUserFriend.setUpdateTime(DateUtils.getNowDate()); + if (appUserFriend.getStatus() == 0) { + AppUserFriend entity = appUserFriendMapper.selectAppUserFriendById(appUserFriend.getId()); + AppUserFriend friend = new AppUserFriend(); + friend.setStatus(0l); + friend.setCreateTime(DateUtils.getNowDate()); + friend.setUserId(entity.getFriendId()); + friend.setFriendId(entity.getUserId()); + appUserFriendMapper.insertAppUserFriend(friend); + } return appUserFriendMapper.updateAppUserFriend(appUserFriend); } @@ -100,8 +108,17 @@ public class AppUserFriendServiceImpl implements IAppUserFriendService * @return 结果 */ @Override - public int deleteAppUserFriendByIds(Long[] ids) - { + public int deleteAppUserFriendByIds(Long[] ids) { + for (Long id : ids) { + AppUserFriend appUserFriend = appUserFriendMapper.selectAppUserFriendById(id); + AppUserFriend entity = new AppUserFriend(); + entity.setUserId(appUserFriend.getFriendId()); + entity.setFriendId(appUserFriend.getUserId()); + List list = appUserFriendMapper.selectAppUserFriendList(entity); + for (AppUserFriend friend : list) { + appUserFriendMapper.deleteAppUserFriendById(friend.getId()); + } + } return appUserFriendMapper.deleteAppUserFriendByIds(ids); } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java index b300d07..5ea8294 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java @@ -301,8 +301,7 @@ public class AppUserServiceImpl implements IAppUserService { entity.setCompanyName(null); List friendList = appUserMapper.selectList(entity); if (friendList == null || friendList.size() == 0) { - entity.setFriendIds(null); - friendList = appUserMapper.selectList(entity); + friendList = new ArrayList<>(); } Collections.shuffle(friendList); if (friendList.size() > limit) { diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/aliyun/sms/SendNoteUtil.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/aliyun/sms/SendNoteUtil.java index 672f936..53f5244 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/aliyun/sms/SendNoteUtil.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/aliyun/sms/SendNoteUtil.java @@ -87,6 +87,7 @@ public class SendNoteUtil { return "Redis存入失败"; } if (!isChineseMobileNumber(PhoneNumber)) { + PhoneNumber = PhoneNumber.replace("+",""); return sendForeign(PhoneNumber,randomNumber); } CommonRequest request = new CommonRequest(); @@ -186,9 +187,10 @@ public class SendNoteUtil { return number.matches(regex); } - private String sendForeign(String phone,String code){ + private static String sendForeign(String phone,String code){ + DefaultProfile profile = DefaultProfile.getProfile("cn-hangzhou","LTAI5tQMf7PG2rH4U2mZBQnK", "3l8t7cVJGTGGu89AepWtq0CddgZNfU"); + IAcsClient client = new DefaultAcsClient(profile); CommonRequest request = new CommonRequest(); - request.setSysMethod(MethodType.POST); request.setSysDomain("dysmsapi.aliyuncs.com"); request.setSysVersion("2017-05-25"); @@ -204,7 +206,7 @@ public class SendNoteUtil { String returnStr = response.getData(); System.out.println(returnStr); String data = response.getData(); - return JSONObject.parseObject(data).getString("Message"); + return JSONObject.parseObject(data).getString("Code"); } catch (ServerException e) { e.printStackTrace(); return e.getErrMsg(); @@ -234,4 +236,12 @@ public class SendNoteUtil { }*/ } + public static void main(String[] args) { + String phone = "1+4049014566"; + if (!isChineseMobileNumber(phone)) { + phone = phone.replace("+",""); + System.out.println(phone); + System.out.println(sendForeign(phone,"1234")); + } + } } \ No newline at end of file