From 2983d06fb36c263dc6f6aa16e571fac9de92e92d Mon Sep 17 00:00:00 2001 From: linhw <5331581+linhw11@user.noreply.gitee.com> Date: Wed, 22 May 2024 16:10:51 +0800 Subject: [PATCH] ~ --- .../AppDynamicCommentController.java | 7 ++-- .../ruoyi/app/controller/OssController.java | 8 ++++ .../app/controller/UserSkillController.java | 1 - .../java/com/ruoyi/app/domain/AppUser.java | 2 +- .../ruoyi/app/domain/vo/AppUserDynamicVo.java | 8 ++++ .../app/mapper/AppUserDynamicMapper.java | 1 + .../service/IAppDynamicCommentService.java | 4 +- .../impl/AppDynamicCommentServiceImpl.java | 11 ++++-- .../impl/AppUserDynamicServiceImpl.java | 5 ++- .../mapper/app/AppUserDynamicMapper.xml | 38 +++++++++++++++++-- .../resources/mapper/app/AppUserMapper.xml | 2 + 11 files changed, 74 insertions(+), 13 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 085c8c5..6f4c1b9 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 @@ -2,6 +2,7 @@ package com.ruoyi.app.controller; import java.util.List; import java.io.IOException; +import java.util.Map; import javax.servlet.http.HttpServletResponse; import com.ruoyi.app.domain.vo.AppDynamicCommentVo; @@ -117,9 +118,9 @@ public class AppDynamicCommentController extends BaseController // @RequiresPermissions("app:comment:list") @GetMapping("/treeList") @ApiOperation(value = "评论树列表", notes = "评论树列表", httpMethod = "GET") - public TableDataInfo treeList(AppDynamicComment appDynamicComment) { + public AjaxResult treeList(AppDynamicComment appDynamicComment) { startPage(); - List list = appDynamicCommentService.treeList(appDynamicComment); - return getDataTable(list); + Map list = appDynamicCommentService.treeList(appDynamicComment); + return AjaxResult.success(list); } } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/OssController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/OssController.java index a0a2526..c799d97 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/OssController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/OssController.java @@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; +import java.util.List; @RestController @RequestMapping("/api/oss") @@ -26,6 +27,13 @@ public class OssController { return ossService.uploadFile(file); } + @PostMapping("uploadList") + @ApiOperation(value = "上传文件" , notes = "上传文件", produces = "file" , response = R.class) + public R uploadFile(@RequestBody List files, HttpServletRequest request + ) { + return ossService.uploadFile(files); + } + //2、删除oss中的文件 @DeleteMapping("delete") @ApiOperation("删除文件") diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/UserSkillController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/UserSkillController.java index 9091772..5b5222d 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/UserSkillController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/UserSkillController.java @@ -40,7 +40,6 @@ public class UserSkillController extends BaseController /** * 查询技能标签列表 */ - @RequiresPermissions("app:skill:list") @GetMapping("/list") public TableDataInfo list(UserSkill userSkill) { diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUser.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUser.java index c50f98b..312596a 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUser.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUser.java @@ -12,7 +12,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity; /** * app用户对象 app_user - * + * jobEndTime jobName jobType jobContent hobby city other * @author wyh * @date 2024-04-23 */ diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDynamicVo.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDynamicVo.java index bca147c..3c0e368 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDynamicVo.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDynamicVo.java @@ -41,6 +41,9 @@ public class AppUserDynamicVo extends AppUserDynamic @Excel(name = "专业") private String major; + @Excel(name = "昵称") + private String nickname; + @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "学历开始时间", width = 30, dateFormat = "yyyy-MM-dd") private Date startTime; @@ -58,6 +61,11 @@ public class AppUserDynamicVo extends AppUserDynamic private String cityName; + private String provinceName; + + private String townName; + + // 话题 private List appTopicList = new ArrayList<>(); diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppUserDynamicMapper.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppUserDynamicMapper.java index 14a854d..6c53df0 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppUserDynamicMapper.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppUserDynamicMapper.java @@ -19,6 +19,7 @@ public interface AppUserDynamicMapper * @return App用户动态 */ public AppUserDynamic selectAppUserDynamicById(Long id); + public AppUserDynamicVo selectcById(Long id); /** * 查询App用户动态列表 diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppDynamicCommentService.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppDynamicCommentService.java index 64779e0..958c405 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppDynamicCommentService.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppDynamicCommentService.java @@ -1,6 +1,8 @@ package com.ruoyi.app.service; import java.util.List; +import java.util.Map; + import com.ruoyi.app.domain.AppDynamicComment; import com.ruoyi.app.domain.vo.AppDynamicCommentVo; import com.ruoyi.common.core.web.domain.AjaxResult; @@ -61,6 +63,6 @@ public interface IAppDynamicCommentService */ public int deleteAppDynamicCommentById(Long id); - public List treeList(AppDynamicComment appDynamicComment); + public Map treeList(AppDynamicComment appDynamicComment); } 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 e29b4ec..e3e84bc 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 @@ -1,7 +1,9 @@ package com.ruoyi.app.service.impl; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; import com.ruoyi.app.domain.AppUser; @@ -119,14 +121,17 @@ public class AppDynamicCommentServiceImpl implements IAppDynamicCommentService } @Override - public List treeList(AppDynamicComment appDynamicComment) { + public Map treeList(AppDynamicComment appDynamicComment) { + Map map = new HashMap<>(); if (appDynamicComment.getDynamicId() == null) { - return new ArrayList<>(); + return map; } 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()); - return buildList(parentList,srcList); + map.put("countNum",appDynamicComments.size()); + map.put("list",buildList(parentList,srcList)); + return map; } public List buildList(List parentList,List srcList){ for (AppDynamicCommentVo appDynamicCommentVo : parentList) { 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 f73a8f0..a40e8fe 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 @@ -56,7 +56,7 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService @Override public AppUserDynamic selectAppUserDynamicById(Long id) { - return appUserDynamicMapper.selectAppUserDynamicById(id); + return appUserDynamicMapper.selectcById(id); } /** @@ -156,6 +156,9 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService List appUserCollects = appUserCollectMapper.selectAppUserCollectList(appUserCollect); appUserDynamic.setIds(appUserCollects.stream().map(x->x.getDynamicId()).collect(Collectors.toList())); } + if (appUserDynamic.getAppId() == null) { + appUserDynamic.setPrivacyStatus(0l); + } 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/AppUserDynamicMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserDynamicMapper.xml index 59f0232..8de7b0c 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 @@ -54,14 +54,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.town_id as "townId", a.province_id as "provinceId", a.city_id as "cityId", - t.name as "cityName" + c.name as "cityName", + t.name as "townName", + p.name as "provinceName" from app_user_dynamic a left join app_user u on u.id = a.user_id - left join app_town t on t.id = a.address + left join app_city c on c.id = a.city_id + left join app_province p on p.id = a.province_id + left join app_town t on t.id = a.town_id and a.user_id = #{userId} and u.username like concat('%',#{username},'%') - and a.content = #{content} + and a.content like concat('%',#{content},'%') and a.video_url = #{videoUrl} and a.topic_id like concat('%',#{topicId},'%') and a.address = #{address} @@ -86,6 +90,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + + insert into app_user_dynamic 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 0042de9..77df4aa 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 @@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + a.id as "id", @@ -318,6 +319,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" company_name = #{companyName}, industry = #{industry}, job_time = #{jobTime}, + job_end_time = #{jobEndTime}, job_name = #{jobName}, job_type = #{jobType}, skill_id = #{skillId},