From ed247ff62e384c340a80e3e4392e9f45bcd81067 Mon Sep 17 00:00:00 2001 From: haotianmingyue <2421912570@qq.com> Date: Thu, 26 Dec 2024 11:12:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=8F=91=E5=B8=83--=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0--=E6=9F=A5=E7=9C=8B=E5=8F=91=E5=B8=83=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/AppSystemController.java | 20 ++++- .../domain/dto/UserPublishWorkDetailDto.java | 6 +- .../dto/UserPublishWorkSourceListDto.java | 88 +++++++++++++++++++ .../ruoyi/system/mapper/SysSourceMapper.java | 6 ++ .../ruoyi/system/mapper/UserWorkMapper.java | 7 ++ .../system/service/ISysSourceService.java | 10 ++- .../system/service/IUserWorkService.java | 8 ++ .../service/impl/SysSourceServiceImpl.java | 9 ++ .../service/impl/UserWorkServiceImpl.java | 10 +++ .../mapper/system/SysSourceMapper.xml | 20 +++++ .../mapper/system/UserWorkMapper.xml | 22 +++++ 11 files changed, 197 insertions(+), 9 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java index b1cc300a..d1bd74fa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java @@ -1189,9 +1189,25 @@ public class AppSystemController extends BaseController { @GetMapping("/getUserPublishWorkDetail/{workId}") public AjaxResult getUserPublishWorkDetail(@PathVariable("workId") Long workId) { - UserWork userWork = userWorkService.selectUserWorkByWorkId(workId); + UserPublishWorkDetailDto userPublishWorkDetail = userWorkService.getUserPublishWorkDetail(workId); - return success(); + //----------------------------------查看该作品所属的资源位---------------------------------------------- + List sourceList = sysSourceService.getUserPublishWorkSourceList(workId); + + for(UserPublishWorkSourceListDto userPublishWorkSourceListDto: sourceList){ + userPublishWorkSourceListDto.setSource(userPublishWorkSourceListDto.getCity()+userPublishWorkSourceListDto.getScenic()+userPublishWorkSourceListDto.getPart()+userPublishWorkSourceListDto.getCoordinate()); + + LocalDate now = LocalDate.now(); + long daysBetween = ChronoUnit.DAYS.between(now, userPublishWorkSourceListDto.getEndTime()); + + + userPublishWorkSourceListDto.setrDays(daysBetween); + } + //-----------------------------------查看该作品所属资源位end--------------------------------------------- + + userPublishWorkDetail.setSourceList(sourceList); + + return success(userPublishWorkDetail); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserPublishWorkDetailDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserPublishWorkDetailDto.java index 2524ec1a..575e3006 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserPublishWorkDetailDto.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserPublishWorkDetailDto.java @@ -23,7 +23,7 @@ public class UserPublishWorkDetailDto { private String nickName; private String avatar; - private List sourceList; + private List sourceList; @@ -109,11 +109,11 @@ public class UserPublishWorkDetailDto { this.avatar = avatar; } - public List getSourceList() { + public List getSourceList() { return sourceList; } - public void setSourceList(List sourceList) { + public void setSourceList(List sourceList) { this.sourceList = sourceList; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserPublishWorkSourceListDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserPublishWorkSourceListDto.java index 660eaed9..15101072 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserPublishWorkSourceListDto.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserPublishWorkSourceListDto.java @@ -1,8 +1,96 @@ package com.ruoyi.system.domain.dto; +import java.time.LocalDate; +import java.util.Date; + /* * 我的---我的--我的发布(在具体资源位上的作品)--点击详情中的作品位于那个资源位上的信息 * */ public class UserPublishWorkSourceListDto { + + private Long sourceId; + private String city; + private String scenic; + private String part; + private String coordinate; + private LocalDate startTime; + private LocalDate endTime; + + private String source; + private Long rDays; + + public Long getSourceId() { + return sourceId; + } + + public void setSourceId(Long sourceId) { + this.sourceId = sourceId; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getScenic() { + return scenic; + } + + public void setScenic(String scenic) { + this.scenic = scenic; + } + + public String getPart() { + return part; + } + + public void setPart(String part) { + this.part = part; + } + + public String getCoordinate() { + return coordinate; + } + + public void setCoordinate(String coordinate) { + this.coordinate = coordinate; + } + + public LocalDate getStartTime() { + return startTime; + } + + public void setStartTime(LocalDate startTime) { + this.startTime = startTime; + } + + public LocalDate getEndTime() { + return endTime; + } + + public void setEndTime(LocalDate endTime) { + + this.endTime = endTime; + } + + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + + public Long getrDays() { + return rDays; + } + + public void setrDays(Long rDays) { + this.rDays = rDays; + } + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysSourceMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysSourceMapper.java index f50de355..b7ba0e03 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysSourceMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysSourceMapper.java @@ -5,6 +5,7 @@ import com.ruoyi.system.domain.SysSource; import com.ruoyi.system.domain.dto.HotSourceDto; import com.ruoyi.system.domain.dto.SourceListDto; import com.ruoyi.system.domain.dto.SourcePriceDto; +import com.ruoyi.system.domain.dto.UserPublishWorkSourceListDto; import org.apache.ibatis.annotations.Param; /** @@ -75,4 +76,9 @@ public interface SysSourceMapper public List getHotSource(); public int updateSysSourceByCP(SysSource sysSource); + + /* + * 查看我的发布资源位详情 + * */ + public List getUserPublishWorkSourceList(Long workId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserWorkMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserWorkMapper.java index 1645eb96..16f31b03 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserWorkMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserWorkMapper.java @@ -3,6 +3,7 @@ package com.ruoyi.system.mapper; import java.util.Date; import java.util.List; import com.ruoyi.system.domain.UserWork; +import com.ruoyi.system.domain.dto.UserPublishWorkDetailDto; import com.ruoyi.system.domain.dto.UserWorkReviewDto; import org.apache.ibatis.annotations.Param; @@ -72,4 +73,10 @@ public interface UserWorkMapper * 内容审核获取用户作品列表 * */ public List getAllUserWork(UserWork userWork); + + /* + * + * 查看发布作品详情 + * */ + public UserPublishWorkDetailDto getUserPublishWorkDetail(Long workId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysSourceService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysSourceService.java index a643a913..094e4c0b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysSourceService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysSourceService.java @@ -2,10 +2,7 @@ package com.ruoyi.system.service; import java.util.List; import com.ruoyi.system.domain.SysSource; -import com.ruoyi.system.domain.dto.ChangeSourcePriceDto; -import com.ruoyi.system.domain.dto.HotSourceDto; -import com.ruoyi.system.domain.dto.SourceListDto; -import com.ruoyi.system.domain.dto.SourcePriceDto; +import com.ruoyi.system.domain.dto.*; /** * 资源位Service接口 @@ -87,4 +84,9 @@ public interface ISysSourceService public List getHotSource(); public int updateSysSourceByCP(SysSource sysSource); + + /* + * 查看我的发布资源位详情 + * */ + public List getUserPublishWorkSourceList(Long workId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserWorkService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserWorkService.java index 55786464..5548e07e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserWorkService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserWorkService.java @@ -3,6 +3,7 @@ package com.ruoyi.system.service; import java.util.Date; import java.util.List; import com.ruoyi.system.domain.UserWork; +import com.ruoyi.system.domain.dto.UserPublishWorkDetailDto; import com.ruoyi.system.domain.dto.UserWorkReviewDto; /** @@ -73,4 +74,11 @@ public interface IUserWorkService * 内容审核获取用户作品列表 * */ public List getAllUserWork(UserWork userWork); + + /* + * + * 查看发布作品详情 + * */ + public UserPublishWorkDetailDto getUserPublishWorkDetail(Long workId); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSourceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSourceServiceImpl.java index 5e7919d3..e729f06e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSourceServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSourceServiceImpl.java @@ -5,6 +5,7 @@ import java.util.List; import com.ruoyi.system.domain.dto.HotSourceDto; import com.ruoyi.system.domain.dto.SourceListDto; import com.ruoyi.system.domain.dto.SourcePriceDto; +import com.ruoyi.system.domain.dto.UserPublishWorkSourceListDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.system.mapper.SysSourceMapper; @@ -121,4 +122,12 @@ public class SysSourceServiceImpl implements ISysSourceService public int updateSysSourceByCP(SysSource sysSource){ return sysSourceMapper.updateSysSourceByCP(sysSource); } + + @Override + /* + * 查看我的发布资源位详情 + * */ + public List getUserPublishWorkSourceList(Long workId){ + return sysSourceMapper.getUserPublishWorkSourceList(workId); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWorkServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWorkServiceImpl.java index 1cc94641..da5b36d5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWorkServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWorkServiceImpl.java @@ -3,6 +3,7 @@ package com.ruoyi.system.service.impl; import java.util.Date; import java.util.List; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.system.domain.dto.UserPublishWorkDetailDto; import com.ruoyi.system.domain.dto.UserWorkReviewDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -110,4 +111,13 @@ public class UserWorkServiceImpl implements IUserWorkService public List getAllUserWork(UserWork userWork ){ return userWorkMapper.getAllUserWork(userWork); } + + @Override + /* + * + * 查看发布作品详情 + * */ + public UserPublishWorkDetailDto getUserPublishWorkDetail(Long workId){ + return userWorkMapper.getUserPublishWorkDetail(workId); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml index 6b086bac..839ce8ce 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml @@ -52,6 +52,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + select source_id, city_id, city, scenic_id, scenic, part, scale, coordinate, price, source_status, work_address, start_time, end_time, b_bought, order_id from sys_source @@ -113,6 +125,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by b_bought desc limit 6 + insert into sys_source diff --git a/ruoyi-system/src/main/resources/mapper/system/UserWorkMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserWorkMapper.xml index e6d4bd90..2645e1bb 100644 --- a/ruoyi-system/src/main/resources/mapper/system/UserWorkMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/UserWorkMapper.xml @@ -39,6 +39,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + select work_id, user_id, work_name, work_address, coordinate, create_time, post_time, work_status, audit_opinion, source_id, price, receive_rockets, detail, delete_flag, scenic, part, city from user_work @@ -189,5 +202,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from user_work where work_status != "0" and user_id = #{userId} + + \ No newline at end of file