From 6289aab5516482d81f5ae1780633cc1bdd59f3db Mon Sep 17 00:00:00 2001
From: zhangjian <zhangjian@main99.com>
Date: Mon, 22 Apr 2024 13:39:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?RefinitivApiController=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=82=A1=E7=A5=A8=E6=8E=A8=E8=8D=90url=E5=92=8C=E5=85=A5?=
 =?UTF-8?q?=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../market/web/RefinitivApiController.java    | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/java/cn/stock/market/web/RefinitivApiController.java b/src/main/java/cn/stock/market/web/RefinitivApiController.java
index c732267..6437e8e 100644
--- a/src/main/java/cn/stock/market/web/RefinitivApiController.java
+++ b/src/main/java/cn/stock/market/web/RefinitivApiController.java
@@ -15,6 +15,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -80,10 +81,10 @@ public class RefinitivApiController {
 
     }
 
-    @ApiOperation(value = "获取BSE股票推荐TopActives", httpMethod = "GET", response = RetifiveStockInfo.class)
-    @GetMapping("/getBSETopActives")
+    @ApiOperation(value = "获取股票推荐TopActives", httpMethod = "GET", response = RetifiveStockInfo.class)
+    @GetMapping("/getTopActives")
     @EncryptFilter(decryptRequest = false)
-    public ServerResponse<?> getBSETopActives() {
+    public ServerResponse<?> getTopActives(@RequestParam String stockType) {
         String name = ".AV.BO";
         List<RetifiveStockInfo> list = Lists.newArrayList();
         try {
@@ -106,10 +107,10 @@ public class RefinitivApiController {
         return ServerResponse.createBySuccess("操作成功", list);
     }
 
-    @ApiOperation(value = "获取BSE股票推荐TopGainers", httpMethod = "GET", response = RetifiveStockInfo.class)
-    @GetMapping("/getBSETopGainers")
+    @ApiOperation(value = "获取股票推荐TopGainers", httpMethod = "GET", response = RetifiveStockInfo.class)
+    @GetMapping("/getTopGainers")
     @EncryptFilter(decryptRequest = false)
-    public ServerResponse<?> getBSETopGainers() {
+    public ServerResponse<?> getTopGainers(@RequestParam String stockType) {
         String name = ".PG.BO";
         List<RetifiveStockInfo> list = Lists.newArrayList();
         try {
@@ -132,10 +133,10 @@ public class RefinitivApiController {
         return ServerResponse.createBySuccess("操作成功", list);
     }
 
-    @ApiOperation(value = "获取BSE股票推荐TopLosers", httpMethod = "GET", response = RetifiveStockInfo.class)
-    @GetMapping("/getBSETopLosers")
+    @ApiOperation(value = "获取股票推荐TopLosers", httpMethod = "GET", response = RetifiveStockInfo.class)
+    @GetMapping("/getTopLosers")
     @EncryptFilter(decryptRequest = false)
-    public ServerResponse<?> getBSETopLosers() {
+    public ServerResponse<?> getTopLosers(@RequestParam String stockType) {
         String name = ".PL.BO";
         List<RetifiveStockInfo> list = Lists.newArrayList();
         try {

From d3155bce538bc1af811fe083874e7eac2259efda Mon Sep 17 00:00:00 2001
From: xiaoliuhu <xiaoliuhu@juyou88.com>
Date: Mon, 22 Apr 2024 13:57:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E8=82=A1=E7=A5=A8=E8=A1=8C=E6=83=85=E5=A2=9E=E5=8A=A0=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E8=82=A1=E7=A5=A8id=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/basic/repository/RetifiveStockRepository.java | 9 +++++++--
 src/main/java/cn/stock/market/dto/RetifiveStockInfo.java | 3 +++
 .../cn/stock/market/web/MessageRetifiveController.java   | 5 +++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cn/stock/market/domain/basic/repository/RetifiveStockRepository.java b/src/main/java/cn/stock/market/domain/basic/repository/RetifiveStockRepository.java
index 96833cf..074f45e 100644
--- a/src/main/java/cn/stock/market/domain/basic/repository/RetifiveStockRepository.java
+++ b/src/main/java/cn/stock/market/domain/basic/repository/RetifiveStockRepository.java
@@ -5,11 +5,10 @@ import cn.qutaojing.common.domain.respostory.SimplePoConvertEntityRepository;
 import cn.qutaojing.common.utils.SpringUtils;
 import cn.stock.market.domain.basic.convert.RetifiveStockConvert;
 import cn.stock.market.domain.basic.entity.RetifiveStock;
+import cn.stock.market.infrastructure.db.po.QRetifiveStockPO;
 import cn.stock.market.infrastructure.db.po.RetifiveStockPO;
 import cn.stock.market.infrastructure.db.repo.RetifiveStockRepo;
 import com.rp.spring.jpa.GenericJpaRepository;
-import java.lang.Integer;
-import java.lang.Override;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
@@ -30,6 +29,8 @@ public class RetifiveStockRepository extends SimplePoConvertEntityRepository<Ret
 
   final RetifiveStockConvert convert;
 
+  final QRetifiveStockPO p = QRetifiveStockPO.retifiveStockPO;
+
   @Override
   public GenericJpaRepository<RetifiveStockPO, Integer> repo() {
     return repo;
@@ -43,4 +44,8 @@ public class RetifiveStockRepository extends SimplePoConvertEntityRepository<Ret
   public static RetifiveStockRepository of() {
     return SpringUtils.getBean(RetifiveStockRepository.class);
   }
+
+  public RetifiveStock findBtStockByCoCode(String coCode) {
+    return findOneIfMutil(p.symbol.eq(coCode));
+  }
 }
diff --git a/src/main/java/cn/stock/market/dto/RetifiveStockInfo.java b/src/main/java/cn/stock/market/dto/RetifiveStockInfo.java
index 73cfb67..4158a3a 100644
--- a/src/main/java/cn/stock/market/dto/RetifiveStockInfo.java
+++ b/src/main/java/cn/stock/market/dto/RetifiveStockInfo.java
@@ -60,5 +60,8 @@ public class RetifiveStockInfo {
 
     @ApiModelProperty("股票当前的交易状态: 1-表示退市Closed, 2-Opening Auction, 3-Continuous Trading, 15-Intra-day Close (scheduled)")
     private String status;
+
+    @ApiModelProperty("股票id")
+    private Integer id;
 }
 
diff --git a/src/main/java/cn/stock/market/web/MessageRetifiveController.java b/src/main/java/cn/stock/market/web/MessageRetifiveController.java
index c5f002d..c296323 100644
--- a/src/main/java/cn/stock/market/web/MessageRetifiveController.java
+++ b/src/main/java/cn/stock/market/web/MessageRetifiveController.java
@@ -180,6 +180,11 @@ public class MessageRetifiveController {
                 RefreshMsg refreshMsg = appClient.getMessageFuture().get(10, TimeUnit.SECONDS);// 设置超时时间，例如10秒
                 if (DataType.DataTypes.FIELD_LIST == refreshMsg.payload().dataType()){
                     RetifiveStockInfo retifiveStockInfo = decode3(refreshMsg.payload().fieldList(), refreshMsg.name());
+                    //获取股票id
+                    RetifiveStock stock = retifiveStockService.repository().findBtStockByCoCode(itemName);
+                    if(stock != null){
+                        retifiveStockInfo.setId(stock.getId());
+                    }
                     return ServerResponse.createBySuccess("操作成功",retifiveStockInfo);
                 }
             } catch (Exception e) {