From a891790aa18c1dd90237d96a3bf3cd43837419ec Mon Sep 17 00:00:00 2001 From: han0 Date: Tue, 26 Dec 2023 14:45:50 +0800 Subject: [PATCH] =?UTF-8?q?feat(public):=20=E6=96=B0=E5=A2=9E=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/controller/PublicController.java | 46 +++++++++++++++++++ .../main/model/vo/PublicTrendResponse.java | 3 ++ 2 files changed, 49 insertions(+) diff --git a/src/main/java/mjkf/xinke/main/controller/PublicController.java b/src/main/java/mjkf/xinke/main/controller/PublicController.java index 779f81a..c31fea4 100644 --- a/src/main/java/mjkf/xinke/main/controller/PublicController.java +++ b/src/main/java/mjkf/xinke/main/controller/PublicController.java @@ -4,8 +4,10 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jgy.xxs.core.http.resp.HttpResponse; +import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import lombok.Data; import mjkf.xinke.dev.modular.file.entity.DevFile; import mjkf.xinke.dev.modular.file.service.DevFileService; import mjkf.xinke.main.common.http.FuHttpResponse; @@ -20,6 +22,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.io.Serializable; +import java.time.LocalDate; /** *

@@ -95,4 +99,46 @@ public class PublicController { var result = devFileService.page(new Page<>(1, 10), query); return FuHttpResponse.Builder().dataResponse(result.getRecords()).build(); } + + @Data + static public class PublicUpdateInfo implements Serializable { + @ApiModelProperty("日期") + private LocalDate date; + + @ApiModelProperty("期数") + private Integer period; + + public PublicUpdateInfo () {} + + public PublicUpdateInfo (PricePublish lastData) { + Integer initialPeriod = 0; + var initialDate = LocalDate.of(2000,1,1); + + this.date = lastData.getCreateTime().toLocalDate(); + Integer months = 0; + for (var i = 0; i < 1000;i++) { + var date = initialDate.plusMonths(i); + if (date.getYear() == this.date.getYear() && date.getMonth() == this.date.getMonth()) { + months = i; + break; + } + } + this.period = initialPeriod + months; + } + } + + @ApiOperation("更新信息") + @GetMapping("/update-info") + public HttpResponse updateInfo () throws Exception { + var query = new LambdaQueryWrapper(); + query.orderByDesc(PricePublish::getCreateTime); + var items = pricePublishService.list(); + var data = items.get(0); + + var result = new PublicUpdateInfo(data); + + return FuHttpResponse.Builder().dataResponse(result).build(); + } + + } diff --git a/src/main/java/mjkf/xinke/main/model/vo/PublicTrendResponse.java b/src/main/java/mjkf/xinke/main/model/vo/PublicTrendResponse.java index 05b0ad7..5a51dfd 100644 --- a/src/main/java/mjkf/xinke/main/model/vo/PublicTrendResponse.java +++ b/src/main/java/mjkf/xinke/main/model/vo/PublicTrendResponse.java @@ -65,6 +65,8 @@ public class PublicTrendResponse { private Integer type; + private String unit; + static public List list(List data, String region) { var result = data.stream().map(item -> new PublicTrendResponse(item, region)).collect(Collectors.toList()); return result; @@ -89,6 +91,7 @@ public class PublicTrendResponse { this.tax = item.getTax(); this.status = item.getStatus(); this.type = item.getType(); + this.unit = item.getUnit(); this.price = item.getRegionPrice(region); }