From 54345a9d52b2028940b87534f93b3db2186ec86a Mon Sep 17 00:00:00 2001
From: han0 <wslshanlin@sina.com>
Date: Wed, 11 Dec 2024 11:32:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=A3=A4?=
 =?UTF-8?q?=E5=9F=8E=E5=B8=82=E5=B1=95=E7=A4=BA=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DataShowingController.java     | 28 +++++++++++++++++++
 .../xinke/main/model/db/PricePublish.java     |  7 +++++
 2 files changed, 35 insertions(+)

diff --git a/src/main/java/mjkf/xinke/main/controller/DataShowingController.java b/src/main/java/mjkf/xinke/main/controller/DataShowingController.java
index 2dd52ac..8ad0b98 100644
--- a/src/main/java/mjkf/xinke/main/controller/DataShowingController.java
+++ b/src/main/java/mjkf/xinke/main/controller/DataShowingController.java
@@ -4,12 +4,18 @@ import com.jgy.xxs.core.http.resp.HttpResponse;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import mjkf.xinke.main.common.http.FuHttpResponse;
+import mjkf.xinke.main.constant.PricePublishType;
+import mjkf.xinke.main.model.db.DataAdjacent;
 import mjkf.xinke.main.model.db.LocalMaterial;
+import mjkf.xinke.main.model.db.PricePublish;
+import mjkf.xinke.main.service.DataAdjacentService;
 import mjkf.xinke.main.service.LocalMaterialService;
+import mjkf.xinke.main.service.PricePublishService;
 import mjkf.xinke.main.service.PriceResultService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 
 @RestController
@@ -22,6 +28,12 @@ public class DataShowingController {
     @Resource
     LocalMaterialService localMaterialService;
 
+    @Resource
+    PricePublishService pricePublishService;
+
+    @Resource
+    DataAdjacentService dataAdjacentService;
+
     @ApiOperation("钢材")
     @GetMapping("/steel")
     public HttpResponse steel (
@@ -90,4 +102,20 @@ public class DataShowingController {
         var result = localMaterialService.list(query);
         return FuHttpResponse.Builder().dataResponse(result).build();
     }
+
+    @ApiOperation("接壤城市")
+    @GetMapping("/adjacent")
+    public HttpResponse<List<PricePublish>> adjacent(
+            @ApiParam(value = "年") @RequestParam(value="year") Integer year,
+            @ApiParam(value = "月") @RequestParam(value="month") Integer month
+    ) throws Exception {
+        var query = pricePublishService.getQuery( year, month,null,null, null, PricePublishType.CURRENT);
+        var result = pricePublishService.list(query);
+        for (var item : result) {
+            var queryAdjacent  = dataAdjacentService.getQuery(null, year, month, item.getMaterialId(), null, null);
+            var adjacent = dataAdjacentService.getOne(queryAdjacent, false);
+            item.setAdjacent((DataAdjacent)adjacent);
+        }
+        return FuHttpResponse.Builder().dataResponse(result).build();
+    }
 }
diff --git a/src/main/java/mjkf/xinke/main/model/db/PricePublish.java b/src/main/java/mjkf/xinke/main/model/db/PricePublish.java
index 6793d01..43758ad 100644
--- a/src/main/java/mjkf/xinke/main/model/db/PricePublish.java
+++ b/src/main/java/mjkf/xinke/main/model/db/PricePublish.java
@@ -11,6 +11,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -191,6 +193,11 @@ public class PricePublish extends Model<PricePublish> {
     @ExcelProperty(value={"单位"}, index=3)
     private String unit;
 
+    @ApiModelProperty("接壤城市数据")
+    @ExcelIgnore
+    @TableField(exist = false)
+    private DataAdjacent adjacent;
+
     @Override
     public Serializable pkVal() {
         return this.id;