diff --git a/server/like-front/src/main/java/com/mdd/front/controller/AppCircleContentController.java b/server/like-front/src/main/java/com/mdd/front/controller/AppCircleContentController.java index a8f818e..f0615f2 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/AppCircleContentController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/AppCircleContentController.java @@ -66,4 +66,12 @@ public class AppCircleContentController { return AjaxResult.success(); } + @Log(title = "圈子内容分享") + @PostMapping("/share") + @ApiOperation(value="圈子内容分享") + public AjaxResult share(@Validated @RequestBody IdValidate idValidate) { + iAppCircleContentService.share(idValidate.getId()); + return AjaxResult.success(); + } + } diff --git a/server/like-front/src/main/java/com/mdd/front/service/IAppCircleContentService.java b/server/like-front/src/main/java/com/mdd/front/service/IAppCircleContentService.java index 20fc112..2cebd57 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/IAppCircleContentService.java +++ b/server/like-front/src/main/java/com/mdd/front/service/IAppCircleContentService.java @@ -56,5 +56,6 @@ public interface IAppCircleContentService { * @param id 主键ID */ void del(Integer id); + void share(Integer id); } diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/AppCircleContentServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/AppCircleContentServiceImpl.java index c4fe937..d8908b8 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/AppCircleContentServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/AppCircleContentServiceImpl.java @@ -1,36 +1,34 @@ package com.mdd.front.service.impl; -import cn.dev33.satoken.stp.StpUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.yulichang.query.MPJQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.mdd.common.core.PageResult; import com.mdd.common.entity.AppCircle; +import com.mdd.common.entity.AppCircleContent; import com.mdd.common.entity.AppCirclePlate; import com.mdd.common.entity.AppCircleUser; +import com.mdd.common.mapper.AppCircleContentMapper; import com.mdd.common.mapper.AppCircleMapper; import com.mdd.common.mapper.AppCirclePlateMapper; import com.mdd.common.mapper.AppCircleUserMapper; -import com.mdd.front.validate.common.PageValidate; +import com.mdd.common.util.RedisUtils; +import com.mdd.common.util.TimeUtils; import com.mdd.front.service.IAppCircleContentService; import com.mdd.front.validate.AppCircleContentCreateValidate; -import com.mdd.front.validate.AppCircleContentUpdateValidate; import com.mdd.front.validate.AppCircleContentSearchValidate; -import com.mdd.front.vo.AppCircleContentListedVo; +import com.mdd.front.validate.AppCircleContentUpdateValidate; +import com.mdd.front.validate.common.PageValidate; import com.mdd.front.vo.AppCircleContentDetailVo; -import com.mdd.common.config.GlobalConfig; -import com.mdd.common.core.PageResult; -import com.mdd.common.entity.AppCircleContent; -import com.mdd.common.mapper.AppCircleContentMapper; -import com.mdd.common.util.ListUtils; -import com.mdd.common.util.TimeUtils; -import com.mdd.common.util.UrlUtils; +import com.mdd.front.vo.AppCircleContentListedVo; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.util.Assert; import javax.annotation.Resource; -import java.util.*; +import java.util.LinkedList; +import java.util.List; import java.util.stream.Collectors; /** @@ -52,6 +50,9 @@ public class AppCircleContentServiceImpl implements IAppCircleContentService { @Resource AppCirclePlateMapper appCirclePlateMapper; + @Value("${config.shareRedisKey}") + private String shareRedisKey; + /** * 圈子内容信息列表 * @@ -241,4 +242,13 @@ public class AppCircleContentServiceImpl implements IAppCircleContentService { appCircleContentMapper.updateById(model); } + @Override + public void share(Integer id) { + Object value = RedisUtils.get(shareRedisKey + id); + if (value == null) { + RedisUtils.set(shareRedisKey + id,1); + } else { + RedisUtils.set(shareRedisKey + id,(Integer)value + 1); + } + } } diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/AppCircleUserServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/AppCircleUserServiceImpl.java index 33e437d..67a9a43 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/AppCircleUserServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/AppCircleUserServiceImpl.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.yulichang.query.MPJQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.mdd.common.entity.AppCircle; +import com.mdd.common.mapper.AppCircleMapper; import com.mdd.front.validate.common.PageValidate; import com.mdd.front.service.IAppCircleUserService; import com.mdd.front.validate.AppCircleUserCreateValidate; @@ -35,6 +37,9 @@ public class AppCircleUserServiceImpl implements IAppCircleUserService { @Resource AppCircleUserMapper appCircleUserMapper; + @Resource + AppCircleMapper appCircleMapper; + /** * 圈子用户信息列表 * @@ -107,6 +112,13 @@ public class AppCircleUserServiceImpl implements IAppCircleUserService { */ @Override public void add(AppCircleUserCreateValidate createValidate) { + AppCircle appCircle = appCircleMapper.selectOne( + new QueryWrapper() + .eq("id", createValidate.getCircleId()) + .eq("is_delete", 0) + .last("limit 1")); + Assert.notNull(appCircle, "圈子数据不存在"); + AppCircleUser model = new AppCircleUser(); model.setCircleId(createValidate.getCircleId()); model.setUserId(createValidate.getUserId()); diff --git a/server/like-front/src/main/java/com/mdd/front/validate/AppCircleUserCreateValidate.java b/server/like-front/src/main/java/com/mdd/front/validate/AppCircleUserCreateValidate.java index d67d2fb..8c3b6ea 100644 --- a/server/like-front/src/main/java/com/mdd/front/validate/AppCircleUserCreateValidate.java +++ b/server/like-front/src/main/java/com/mdd/front/validate/AppCircleUserCreateValidate.java @@ -20,27 +20,21 @@ public class AppCircleUserCreateValidate implements Serializable { @ApiModelProperty(value = "成员id") private Integer userId; - @NotNull(message = "circleName参数缺失") @ApiModelProperty(value = "圈子昵称") private String circleName; - @NotNull(message = "nickName参数缺失") @ApiModelProperty(value = "本群昵称") private String nickName; - @NotNull(message = "isRemind参数缺失") @ApiModelProperty(value = "是否提醒1是2否") private Integer isRemind; - @NotNull(message = "isAdmin参数缺失") @ApiModelProperty(value = "是否是管理员1是2否") private Integer isAdmin; - @NotNull(message = "longitude参数缺失") @ApiModelProperty(value = "经度") private String longitude; - @NotNull(message = "latitude参数缺失") @ApiModelProperty(value = "纬度") private String latitude; diff --git a/server/like-front/src/main/resources/application.yml b/server/like-front/src/main/resources/application.yml index 9b852f9..0672341 100644 --- a/server/like-front/src/main/resources/application.yml +++ b/server/like-front/src/main/resources/application.yml @@ -84,6 +84,7 @@ sa-token: config: + shareRedisKey: content_ #短信短信配置 aliyun: sms: