From f81eeef1684649cb760aabb18b0bc656f4146c53 Mon Sep 17 00:00:00 2001 From: linhw <5331581+linhw11@user.noreply.gitee.com> Date: Wed, 8 May 2024 14:34:14 +0800 Subject: [PATCH] ~ --- .../controller/AppUserCollectController.java | 128 ++++++++++++++++++ .../com/ruoyi/app/domain/AppDynamicLike.java | 4 + .../com/ruoyi/app/domain/AppUserCollect.java | 72 ++++++++++ .../com/ruoyi/app/domain/AppUserDynamic.java | 10 +- .../com/ruoyi/app/domain/vo/AppUserVo.java | 10 ++ .../app/mapper/AppUserCollectMapper.java | 61 +++++++++ .../app/service/IAppUserCollectService.java | 62 +++++++++ .../impl/AppDynamicLikeServiceImpl.java | 10 ++ .../impl/AppUserCollectServiceImpl.java | 112 +++++++++++++++ .../impl/AppUserDynamicServiceImpl.java | 14 +- .../mapper/app/AppDynamicLikeMapper.xml | 7 +- .../mapper/app/AppUserCollectMapper.xml | 82 +++++++++++ .../mapper/app/AppUserDynamicMapper.xml | 6 + .../resources/mapper/app/AppUserMapper.xml | 13 +- 14 files changed, 584 insertions(+), 7 deletions(-) create mode 100644 gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppUserCollectController.java create mode 100644 gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserCollect.java create mode 100644 gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppUserCollectMapper.java create mode 100644 gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppUserCollectService.java create mode 100644 gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserCollectServiceImpl.java create mode 100644 gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserCollectMapper.xml diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppUserCollectController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppUserCollectController.java new file mode 100644 index 0000000..ccc2c96 --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppUserCollectController.java @@ -0,0 +1,128 @@ +package com.ruoyi.app.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.app.domain.AppUserDynamic; +import com.ruoyi.app.domain.vo.AppUserDynamicVo; +import com.ruoyi.app.service.IAppUserDynamicService; +import com.ruoyi.common.core.domain.R; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.ruoyi.app.domain.AppUserCollect; +import com.ruoyi.app.service.IAppUserCollectService; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.page.TableDataInfo; + +/** + * 用户收藏Controller + * + * @author wyh + * @date 2024-05-08 + */ +@RestController +@RequestMapping("/collect") +@Api(tags = "用户收藏" , description = "用户收藏") +public class AppUserCollectController extends BaseController +{ + @Autowired + private IAppUserCollectService appUserCollectService; + + @Autowired + private IAppUserDynamicService appUserDynamicService; + + /** + * 查询用户收藏列表 + */ + @RequiresPermissions("app:collect:list") + @GetMapping("/list") + @ApiOperation(value = "查询用户收藏", notes = "查询用户收藏", httpMethod = "GET") + public TableDataInfo list(AppUserCollect appUserCollect) + { + startPage(); + List list = appUserCollectService.selectAppUserCollectList(appUserCollect); + return getDataTable(list); + } + + /** + * 导出用户收藏列表 + */ + @RequiresPermissions("app:collect:export") + @Log(title = "用户收藏", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, AppUserCollect appUserCollect) + { + List list = appUserCollectService.selectAppUserCollectList(appUserCollect); + ExcelUtil util = new ExcelUtil(AppUserCollect.class); + util.exportExcel(response, list, "用户收藏数据"); + } + + /** + * 获取用户收藏详细信息 + */ + @RequiresPermissions("app:collect:query") + @GetMapping(value = "/{id}") + @ApiOperation(value = "获取用户收藏详细信息", notes = "获取用户收藏详细信息", httpMethod = "GET") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(appUserCollectService.selectAppUserCollectById(id)); + } + + /** + * 新增用户收藏 + */ + @RequiresPermissions("app:collect:add") + @ApiOperation(value = "新增用户收藏", notes = "新增用户收藏", httpMethod = "POST") + @Log(title = "用户收藏", businessType = BusinessType.INSERT) + @PostMapping("/add") + public AjaxResult add(@RequestBody AppUserCollect appUserCollect) + { + return appUserCollectService.insertAppUserCollect(appUserCollect); + } + + /** + * 修改用户收藏 + */ + @RequiresPermissions("app:collect:edit") + @ApiOperation(value = "修改用户收藏", notes = "修改用户收藏", httpMethod = "PUT") + @Log(title = "用户收藏", businessType = BusinessType.UPDATE) + @PutMapping("/edit") + public AjaxResult edit(@RequestBody AppUserCollect appUserCollect) + { + return toAjax(appUserCollectService.updateAppUserCollect(appUserCollect)); + } + + /** + * 删除用户收藏 + */ + @RequiresPermissions("app:collect:remove") + @Log(title = "用户收藏", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(appUserCollectService.deleteAppUserCollectByIds(ids)); + } + + @GetMapping("/pageList") + @ApiOperation(value = "分页app用户收藏列表", notes = "分页app用户收藏列表", httpMethod = "GET") + public TableDataInfo pageList(AppUserDynamic appUserDynamic) { + startPage(); + List list = appUserDynamicService.selectDynamicList(appUserDynamic); + return getDataTable(list); + } +} diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppDynamicLike.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppDynamicLike.java index 36481dc..f51773a 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppDynamicLike.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppDynamicLike.java @@ -1,5 +1,6 @@ package com.ruoyi.app.domain; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; @@ -11,6 +12,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity; * @author wyh * @date 2024-04-24 */ +@Data public class AppDynamicLike extends BaseEntity { private static final long serialVersionUID = 1L; @@ -26,6 +28,8 @@ public class AppDynamicLike extends BaseEntity @Excel(name = "动态id") private Long dynamicId; + private Long dynamicUserId; + public void setId(Long id) { this.id = id; diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserCollect.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserCollect.java new file mode 100644 index 0000000..0da786a --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserCollect.java @@ -0,0 +1,72 @@ +package com.ruoyi.app.domain; + +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.core.annotation.Excel; +import com.ruoyi.common.core.web.domain.BaseEntity; + +/** + * 用户收藏对象 app_user_collect + * + * @author wyh + * @date 2024-05-08 + */ +@Data +public class AppUserCollect extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** id */ + private Long id; + + /** 我的id */ + @Excel(name = "我的id") + private Long userId; + + /** 动态id */ + @Excel(name = "动态id") + private Long dynamicId; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setUserId(Long userId) + { + this.userId = userId; + } + + public Long getUserId() + { + return userId; + } + public void setDynamicId(Long dynamicId) + { + this.dynamicId = dynamicId; + } + + public Long getDynamicId() + { + return dynamicId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("userId", getUserId()) + .append("dynamicId", getDynamicId()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .append("createBy", getCreateBy()) + .append("updateBy", getUpdateBy()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserDynamic.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserDynamic.java index 369697e..14f58ff 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserDynamic.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserDynamic.java @@ -6,6 +6,8 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.BaseEntity; +import java.util.List; + /** * App用户动态对象 app_user_dynamic * @@ -57,7 +59,13 @@ public class AppUserDynamic extends BaseEntity private String username; @Excel(name = "是否会员") - private int isMember; + private Integer isMember; + + @Excel(name = "是否收藏0是1否") + private int isCollect; + + // 动态ids + private List ids; public void setIsTop(Long isTop) { diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserVo.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserVo.java index 2b6e98c..362f53c 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserVo.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserVo.java @@ -25,6 +25,16 @@ public class AppUserVo extends AppUser private String schoolName; private List userSkillList; + + private String cityName; + + private int friendNum; + + private int likeNum; + + private int attentionNum; + + private int fansNum; public void setUserSkillList(List userSkillList) { this.userSkillList = userSkillList; } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppUserCollectMapper.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppUserCollectMapper.java new file mode 100644 index 0000000..2ed1cec --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppUserCollectMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.app.mapper; + +import java.util.List; +import com.ruoyi.app.domain.AppUserCollect; + +/** + * 用户收藏Mapper接口 + * + * @author wyh + * @date 2024-05-08 + */ +public interface AppUserCollectMapper +{ + /** + * 查询用户收藏 + * + * @param id 用户收藏主键 + * @return 用户收藏 + */ + public AppUserCollect selectAppUserCollectById(Long id); + + /** + * 查询用户收藏列表 + * + * @param appUserCollect 用户收藏 + * @return 用户收藏集合 + */ + public List selectAppUserCollectList(AppUserCollect appUserCollect); + + /** + * 新增用户收藏 + * + * @param appUserCollect 用户收藏 + * @return 结果 + */ + public int insertAppUserCollect(AppUserCollect appUserCollect); + + /** + * 修改用户收藏 + * + * @param appUserCollect 用户收藏 + * @return 结果 + */ + public int updateAppUserCollect(AppUserCollect appUserCollect); + + /** + * 删除用户收藏 + * + * @param id 用户收藏主键 + * @return 结果 + */ + public int deleteAppUserCollectById(Long id); + + /** + * 批量删除用户收藏 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteAppUserCollectByIds(Long[] ids); +} diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppUserCollectService.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppUserCollectService.java new file mode 100644 index 0000000..2a30f3f --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppUserCollectService.java @@ -0,0 +1,62 @@ +package com.ruoyi.app.service; + +import java.util.List; +import com.ruoyi.app.domain.AppUserCollect; +import com.ruoyi.common.core.web.domain.AjaxResult; + +/** + * 用户收藏Service接口 + * + * @author wyh + * @date 2024-05-08 + */ +public interface IAppUserCollectService +{ + /** + * 查询用户收藏 + * + * @param id 用户收藏主键 + * @return 用户收藏 + */ + public AppUserCollect selectAppUserCollectById(Long id); + + /** + * 查询用户收藏列表 + * + * @param appUserCollect 用户收藏 + * @return 用户收藏集合 + */ + public List selectAppUserCollectList(AppUserCollect appUserCollect); + + /** + * 新增用户收藏 + * + * @param appUserCollect 用户收藏 + * @return 结果 + */ + public AjaxResult insertAppUserCollect(AppUserCollect appUserCollect); + + /** + * 修改用户收藏 + * + * @param appUserCollect 用户收藏 + * @return 结果 + */ + public int updateAppUserCollect(AppUserCollect appUserCollect); + + /** + * 批量删除用户收藏 + * + * @param ids 需要删除的用户收藏主键集合 + * @return 结果 + */ + public int deleteAppUserCollectByIds(Long[] ids); + + /** + * 删除用户收藏信息 + * + * @param id 用户收藏主键 + * @return 结果 + */ + public int deleteAppUserCollectById(Long id); +} diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppDynamicLikeServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppDynamicLikeServiceImpl.java index 25aa57a..eaba4db 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppDynamicLikeServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppDynamicLikeServiceImpl.java @@ -1,6 +1,9 @@ package com.ruoyi.app.service.impl; import java.util.List; + +import com.ruoyi.app.domain.AppUserDynamic; +import com.ruoyi.app.mapper.AppUserDynamicMapper; import com.ruoyi.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -20,6 +23,9 @@ public class AppDynamicLikeServiceImpl implements IAppDynamicLikeService @Autowired private AppDynamicLikeMapper appDynamicLikeMapper; + @Autowired + private AppUserDynamicMapper appUserDynamicMapper; + /** * 查询动态点赞 * @@ -53,6 +59,10 @@ public class AppDynamicLikeServiceImpl implements IAppDynamicLikeService @Override public int insertAppDynamicLike(AppDynamicLike appDynamicLike) { + AppUserDynamic appUserDynamic = appUserDynamicMapper.selectAppUserDynamicById(appDynamicLike.getDynamicUserId()); + if (appUserDynamic != null) { + appDynamicLike.setDynamicUserId(appUserDynamic.getUserId()); + } appDynamicLike.setCreateTime(DateUtils.getNowDate()); return appDynamicLikeMapper.insertAppDynamicLike(appDynamicLike); } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserCollectServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserCollectServiceImpl.java new file mode 100644 index 0000000..84ae2be --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserCollectServiceImpl.java @@ -0,0 +1,112 @@ +package com.ruoyi.app.service.impl; + +import java.util.List; + +import com.ruoyi.app.domain.AppUserDynamic; +import com.ruoyi.app.mapper.AppUserDynamicMapper; +import com.ruoyi.common.core.utils.DateUtils; +import com.ruoyi.common.core.web.domain.AjaxResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.app.mapper.AppUserCollectMapper; +import com.ruoyi.app.domain.AppUserCollect; +import com.ruoyi.app.service.IAppUserCollectService; + +/** + * 用户收藏Service业务层处理 + * + * @author wyh + * @date 2024-05-08 + */ +@Service +public class AppUserCollectServiceImpl implements IAppUserCollectService +{ + @Autowired + private AppUserCollectMapper appUserCollectMapper; + + @Autowired + private AppUserDynamicMapper appUserDynamicMapper; + + /** + * 查询用户收藏 + * + * @param id 用户收藏主键 + * @return 用户收藏 + */ + @Override + public AppUserCollect selectAppUserCollectById(Long id) + { + return appUserCollectMapper.selectAppUserCollectById(id); + } + + /** + * 查询用户收藏列表 + * + * @param appUserCollect 用户收藏 + * @return 用户收藏 + */ + @Override + public List selectAppUserCollectList(AppUserCollect appUserCollect) + { + return appUserCollectMapper.selectAppUserCollectList(appUserCollect); + } + + /** + * 新增用户收藏 + * + * @param appUserCollect 用户收藏 + * @return 结果 + */ + @Override + public AjaxResult insertAppUserCollect(AppUserCollect appUserCollect) { + if (appUserCollect.getUserId() == null || appUserCollect.getDynamicId() == null) { + return AjaxResult.error("用户id不能为空和动态id不能为空"); + } + AppUserDynamic appUserDynamic = appUserDynamicMapper.selectAppUserDynamicById(appUserCollect.getDynamicId()); + if (appUserDynamic == null) { + return AjaxResult.error("该动态不存在"); + } + if (appUserDynamic.getUserId() == appUserCollect.getUserId()) { + return AjaxResult.error("不能收藏自己的动态！"); + } + appUserCollect.setCreateTime(DateUtils.getNowDate()); + return AjaxResult.success(appUserCollectMapper.insertAppUserCollect(appUserCollect)); + } + + /** + * 修改用户收藏 + * + * @param appUserCollect 用户收藏 + * @return 结果 + */ + @Override + public int updateAppUserCollect(AppUserCollect appUserCollect) + { + appUserCollect.setUpdateTime(DateUtils.getNowDate()); + return appUserCollectMapper.updateAppUserCollect(appUserCollect); + } + + /** + * 批量删除用户收藏 + * + * @param ids 需要删除的用户收藏主键 + * @return 结果 + */ + @Override + public int deleteAppUserCollectByIds(Long[] ids) + { + return appUserCollectMapper.deleteAppUserCollectByIds(ids); + } + + /** + * 删除用户收藏信息 + * + * @param id 用户收藏主键 + * @return 结果 + */ + @Override + public int deleteAppUserCollectById(Long id) + { + return appUserCollectMapper.deleteAppUserCollectById(id); + } +} diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java index 5871be1..6426352 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java @@ -4,16 +4,13 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import com.ruoyi.app.domain.AppDynamicComment; -import com.ruoyi.app.domain.AppDynamicImg; -import com.ruoyi.app.domain.AppDynamicLike; +import com.ruoyi.app.domain.*; import com.ruoyi.app.domain.vo.AppUserDynamicVo; import com.ruoyi.app.mapper.*; import com.ruoyi.common.core.utils.DateUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.app.domain.AppUserDynamic; import com.ruoyi.app.service.IAppUserDynamicService; /** @@ -40,6 +37,9 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService @Autowired private AppTopicMapper appTopicMapper; + @Autowired + private AppUserCollectMapper appUserCollectMapper; + /** * 查询App用户动态 * @@ -139,6 +139,12 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService @Override public List selectDynamicList(AppUserDynamic appUserDynamic) { + if (appUserDynamic.getIsCollect() == 1 && appUserDynamic.getAppId() != null) { + AppUserCollect appUserCollect = new AppUserCollect(); + appUserCollect.setUserId(appUserDynamic.getAppId()); + List appUserCollects = appUserCollectMapper.selectAppUserCollectList(appUserCollect); + appUserDynamic.setIds(appUserCollects.stream().map(x->x.getDynamicId()).collect(Collectors.toList())); + } List list = appUserDynamicMapper.selectDynamicList(appUserDynamic); for (AppUserDynamicVo appUserDynamicVo : list) { Long id = appUserDynamicVo.getId(); diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppDynamicLikeMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppDynamicLikeMapper.xml index bc666d7..d9dd8eb 100644 --- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppDynamicLikeMapper.xml +++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppDynamicLikeMapper.xml @@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -16,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, user_id, dynamic_id, create_time, update_time, create_by, updateBy, remark from app_dynamic_like + select id, user_id, dynamic_id,dynamic_user_id, create_time, update_time, create_by, updateBy, remark from app_dynamic_like @@ -38,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" user_id, dynamic_id, + dynamic_user_id, create_time, update_time, create_by, @@ -47,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{userId}, #{dynamicId}, + #{dynamicUserId}, #{createTime}, #{updateTime}, #{createBy}, @@ -60,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" user_id = #{userId}, dynamic_id = #{dynamicId}, + dynamic_user_id = #{dynamicUserId}, create_time = #{createTime}, update_time = #{updateTime}, create_by = #{createBy}, diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserCollectMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserCollectMapper.xml new file mode 100644 index 0000000..2d92d2a --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserCollectMapper.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + select id, user_id, dynamic_id, create_time, update_time, create_by, updateBy, remark from app_user_collect + + + + + + + + insert into app_user_collect + + user_id, + dynamic_id, + create_time, + update_time, + create_by, + updateBy, + remark, + + + #{userId}, + #{dynamicId}, + #{createTime}, + #{updateTime}, + #{createBy}, + #{updateBy}, + #{remark}, + + + + + update app_user_collect + + user_id = #{userId}, + dynamic_id = #{dynamicId}, + create_time = #{createTime}, + update_time = #{updateTime}, + create_by = #{createBy}, + updateBy = #{updateBy}, + remark = #{remark}, + + where id = #{id} + + + + delete from app_user_collect where id = #{id} + + + + delete from app_user_collect where id in + + #{id} + + + \ No newline at end of file diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserDynamicMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserDynamicMapper.xml index 760999c..a25543b 100644 --- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserDynamicMapper.xml +++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserDynamicMapper.xml @@ -66,6 +66,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.updateBy = #{updateBy} and a.is_top = #{isTop} and u.is_member = #{isMember} + + and a.id in + + #{item} + + order by a.is_top,a.create_time diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml index d3e814f..7bcee90 100644 --- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml +++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml @@ -130,10 +130,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"