Merge remote-tracking branch 'origin/retifive' into retifive

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));
+  }
 }

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;
 }
 

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) {

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)
+    @ApiOperation(value = "获取股票推荐TopActives", httpMethod = "GET", response = RetifiveStockInfo.class)
-    @GetMapping("/getBSETopActives")
+    @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)
+    @ApiOperation(value = "获取股票推荐TopGainers", httpMethod = "GET", response = RetifiveStockInfo.class)
-    @GetMapping("/getBSETopGainers")
+    @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)
+    @ApiOperation(value = "获取股票推荐TopLosers", httpMethod = "GET", response = RetifiveStockInfo.class)
-    @GetMapping("/getBSETopLosers")
+    @GetMapping("/getTopLosers")
     @EncryptFilter(decryptRequest = false)
-    public ServerResponse<?> getBSETopLosers() {
+    public ServerResponse<?> getTopLosers(@RequestParam String stockType) {
         String name = ".PL.BO";
         List<RetifiveStockInfo> list = Lists.newArrayList();
         try {