diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ShowSysSourceARListDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ShowSysSourceARListDto.java new file mode 100644 index 00000000..1a192256 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ShowSysSourceARListDto.java @@ -0,0 +1,79 @@ +package com.ruoyi.system.domain.dto; + +// 向AR发送资源位有关数据 +public class ShowSysSourceARListDto { + private Long sourceId; + private int cX; + private int cY; + private String sourceStatus; + private String part; + private String workAddress; + private String workName; + private String detail; + + public Long getSourceId() { + return sourceId; + } + + public void setSourceId(Long sourceId) { + this.sourceId = sourceId; + } + + public int getcX() { + return cX; + } + + public void setcX(int cX) { + this.cX = cX; + } + + public int getcY() { + return cY; + } + + public void setcY(int cY) { + this.cY = cY; + } + + public String getSourceStatus() { + return sourceStatus; + } + + public void setSourceStatus(String sourceStatus) { + this.sourceStatus = sourceStatus; + } + + public String getPart() { + return part; + } + + public void setPart(String part) { + this.part = part; + } + + public String getWorkAddress() { + return workAddress; + } + + public void setWorkAddress(String workAddress) { + this.workAddress = workAddress; + } + + public String getWorkName() { + return workName; + } + + public void setWorkName(String workName) { + this.workName = workName; + } + + public String getDetail() { + return detail; + } + + public void setDetail(String detail) { + this.detail = detail; + } + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ShowSysSourceListDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ShowSysSourceListDto.java index 53a4eabe..4a3d3826 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ShowSysSourceListDto.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ShowSysSourceListDto.java @@ -8,7 +8,6 @@ public class ShowSysSourceListDto { private int cY; private String sourceStatus; private String part; - private String workAddress; public Long getSourceId() { 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 b7ba0e03..054b4454 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 @@ -2,10 +2,7 @@ package com.ruoyi.system.mapper; import java.util.List; 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 com.ruoyi.system.domain.dto.*; import org.apache.ibatis.annotations.Param; /** @@ -75,10 +72,15 @@ public interface SysSourceMapper public List getHotSource(); -public int updateSysSourceByCP(SysSource sysSource); + public int updateSysSourceByCP(SysSource sysSource); /* * 查看我的发布资源位详情 * */ public List getUserPublishWorkSourceList(Long workId); + + /* + * AR 获取资源位信息列表, 包括作品标题和介绍 + * */ + public List getSysSourceARList(SysSource sysSource); } 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 094e4c0b..c4e58faa 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 @@ -28,6 +28,11 @@ public interface ISysSourceService */ public List selectSysSourceList(SysSource sysSource); + /* + * AR 获取资源位信息列表, 包括作品标题和介绍 + * */ + public List getSysSourceARList(SysSource sysSource); + /** * 新增资源位 * 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 e729f06e..c68c62a8 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 @@ -2,10 +2,7 @@ package com.ruoyi.system.service.impl; 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 com.ruoyi.system.domain.dto.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.system.mapper.SysSourceMapper; @@ -130,4 +127,12 @@ public class SysSourceServiceImpl implements ISysSourceService public List getUserPublishWorkSourceList(Long workId){ return sysSourceMapper.getUserPublishWorkSourceList(workId); } + + /* + * AR 获取资源位信息列表, 包括作品标题和介绍 + * */ + @Override + public List getSysSourceARList(SysSource sysSource){ + return sysSourceMapper.getSysSourceARList(sysSource); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml index 46d622eb..f7700742 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml @@ -65,6 +65,17 @@ 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, work_id, c_x, c_y from sys_source @@ -139,6 +150,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + insert into sys_source