diff --git a/src/main/java/com/yupi/springbootinit/controller/HostInfoController.java b/src/main/java/com/yupi/springbootinit/controller/HostInfoController.java index ffb25e0..e6ca64b 100644 --- a/src/main/java/com/yupi/springbootinit/controller/HostInfoController.java +++ b/src/main/java/com/yupi/springbootinit/controller/HostInfoController.java @@ -4,8 +4,10 @@ import cn.dev33.satoken.stp.StpUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yupi.springbootinit.common.BaseResponse; import com.yupi.springbootinit.common.ResultUtils; +import com.yupi.springbootinit.model.dto.host.HistoryDataDTO; import com.yupi.springbootinit.model.dto.host.HostInfoDTO; import com.yupi.springbootinit.model.vo.hosts.NewHostsVO; +import com.yupi.springbootinit.model.vo.hosts.SevenDaysData; import com.yupi.springbootinit.service.HostInfoService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -32,4 +34,12 @@ public class HostInfoController { Page conditionHosts = hostInfoService.getConditionHosts(hostInfoDTO); return ResultUtils.success(conditionHosts); } + + @PostMapping("7days_data") + public BaseResponse> sevenDaysData(@RequestBody HistoryDataDTO historyDataDTO){ + Object loginId = StpUtil.getLoginId(); + historyDataDTO.setUserId(Long.valueOf(loginId.toString())); + List data = hostInfoService.getSevenDaysData(historyDataDTO); + return ResultUtils.success(data); + } } diff --git a/src/main/java/com/yupi/springbootinit/mapper/NewHostsMapper.java b/src/main/java/com/yupi/springbootinit/mapper/NewHostsMapper.java index a91308d..52b444e 100644 --- a/src/main/java/com/yupi/springbootinit/mapper/NewHostsMapper.java +++ b/src/main/java/com/yupi/springbootinit/mapper/NewHostsMapper.java @@ -3,11 +3,13 @@ package com.yupi.springbootinit.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yupi.springbootinit.model.dto.host.HistoryDataDTO; import com.yupi.springbootinit.model.dto.host.HostInfoDTO; import com.yupi.springbootinit.model.entity.NewHosts; import java.util.List; import com.yupi.springbootinit.model.vo.hosts.NewHostsVO; +import com.yupi.springbootinit.model.vo.hosts.SevenDaysData; import org.apache.ibatis.annotations.Param; /* @@ -30,4 +32,7 @@ public interface NewHostsMapper extends BaseMapper { int batchInsert(@Param("list") List list); Page selectPageByCondition(@Param("page") Page page, @Param("hostInfoDTO") HostInfoDTO hostInfoDTO); + + List selectSevenDaysData(HistoryDataDTO historyDataDTO); + } \ No newline at end of file diff --git a/src/main/java/com/yupi/springbootinit/model/dto/host/HistoryDataDTO.java b/src/main/java/com/yupi/springbootinit/model/dto/host/HistoryDataDTO.java new file mode 100644 index 0000000..6952ba4 --- /dev/null +++ b/src/main/java/com/yupi/springbootinit/model/dto/host/HistoryDataDTO.java @@ -0,0 +1,26 @@ +package com.yupi.springbootinit.model.dto.host; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/* + * @author: ziin + * @date: 2025/6/17 15:59 + */ +@Data +@ApiModel("历史数据") +public class HistoryDataDTO { + + @ApiModelProperty(value = "历史数据名称", example = "fans") + private String historyDataName; + + @ApiModelProperty(value = "主播 Id") + private String hostsId; + + @ApiModelProperty(value = "租户 Id", example = "1") + private Long tenantId; + + @ApiModelProperty(value = "用户 Id", example = "1") + private Long userId; +} diff --git a/src/main/java/com/yupi/springbootinit/model/vo/hosts/SevenDaysData.java b/src/main/java/com/yupi/springbootinit/model/vo/hosts/SevenDaysData.java new file mode 100644 index 0000000..efb28f9 --- /dev/null +++ b/src/main/java/com/yupi/springbootinit/model/vo/hosts/SevenDaysData.java @@ -0,0 +1,19 @@ +package com.yupi.springbootinit.model.vo.hosts; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +/* + * @author: ziin + * @date: 2025/6/17 16:05 + */ +@Data +public class SevenDaysData { + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + + private Integer DataContent; +} diff --git a/src/main/java/com/yupi/springbootinit/service/HostInfoService.java b/src/main/java/com/yupi/springbootinit/service/HostInfoService.java index a5a59aa..325ba4c 100644 --- a/src/main/java/com/yupi/springbootinit/service/HostInfoService.java +++ b/src/main/java/com/yupi/springbootinit/service/HostInfoService.java @@ -3,9 +3,11 @@ package com.yupi.springbootinit.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.yupi.springbootinit.model.dto.host.HistoryDataDTO; import com.yupi.springbootinit.model.dto.host.HostInfoDTO; import com.yupi.springbootinit.model.entity.NewHosts; import com.yupi.springbootinit.model.vo.hosts.NewHostsVO; +import com.yupi.springbootinit.model.vo.hosts.SevenDaysData; import java.util.List; import java.util.concurrent.CompletableFuture; @@ -18,4 +20,6 @@ public interface HostInfoService extends IService { Page getConditionHosts(HostInfoDTO hostInfoDTO); + + List getSevenDaysData(HistoryDataDTO historyDataDTO); } diff --git a/src/main/java/com/yupi/springbootinit/service/impl/HostInfoServiceImpl.java b/src/main/java/com/yupi/springbootinit/service/impl/HostInfoServiceImpl.java index a8d009f..3c4f22f 100644 --- a/src/main/java/com/yupi/springbootinit/service/impl/HostInfoServiceImpl.java +++ b/src/main/java/com/yupi/springbootinit/service/impl/HostInfoServiceImpl.java @@ -7,9 +7,11 @@ import com.google.common.collect.Lists; import com.yupi.springbootinit.common.BaseResponse; import com.yupi.springbootinit.common.ResultUtils; import com.yupi.springbootinit.mapper.NewHostsMapper; +import com.yupi.springbootinit.model.dto.host.HistoryDataDTO; import com.yupi.springbootinit.model.dto.host.HostInfoDTO; import com.yupi.springbootinit.model.entity.NewHosts; import com.yupi.springbootinit.model.vo.hosts.NewHostsVO; +import com.yupi.springbootinit.model.vo.hosts.SevenDaysData; import com.yupi.springbootinit.service.HostInfoService; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Async; @@ -41,4 +43,10 @@ public class HostInfoServiceImpl extends ServiceImpl i Page page = new Page<>(hostInfoDTO.getCurrent(),hostInfoDTO.getPageSize()); return newHostsMapper.selectPageByCondition(page, hostInfoDTO); } + + @Override + public List getSevenDaysData(HistoryDataDTO historyDataDTO) { + List data = newHostsMapper.selectSevenDaysData(historyDataDTO); + return data; + } } diff --git a/src/main/resources/mapper/NewHostsMapper.xml b/src/main/resources/mapper/NewHostsMapper.xml index e21cb04..39f3665 100644 --- a/src/main/resources/mapper/NewHostsMapper.xml +++ b/src/main/resources/mapper/NewHostsMapper.xml @@ -346,4 +346,29 @@ + + \ No newline at end of file