Explorar o código

交易市场平台(供应商)

wwh hai 1 semana
pai
achega
2848c9c27d

+ 10 - 3
baqing-admin/src/main/java/com/ruoyi/web/modules/trading/controller/BizAppYakMarketController.java

@@ -73,8 +73,15 @@ public class BizAppYakMarketController extends BaseController
73
     @GetMapping("/daily/list")
73
     @GetMapping("/daily/list")
74
     public TableDataInfo dailyList()
74
     public TableDataInfo dailyList()
75
     {
75
     {
76
-        AppYakMarketPageSupport.startPage();
77
-        List<AppYakMarketDailyListVo> list = appYakMarketService.selectDailyList();
78
-        return getDataTable(list);
76
+        try
77
+        {
78
+            AppYakMarketPageSupport.startPage();
79
+            List<AppYakMarketDailyListVo> list = appYakMarketService.selectDailyList();
80
+            return getDataTable(list);
81
+        }
82
+        finally
83
+        {
84
+            clearPage();
85
+        }
79
     }
86
     }
80
 }
87
 }

+ 4 - 0
baqing-admin/src/main/java/com/ruoyi/web/modules/trading/service/impl/AppYakMarketServiceImpl.java

@@ -7,6 +7,7 @@ import java.util.List;
7
 import java.util.stream.Collectors;
7
 import java.util.stream.Collectors;
8
 import org.springframework.beans.factory.annotation.Autowired;
8
 import org.springframework.beans.factory.annotation.Autowired;
9
 import org.springframework.stereotype.Service;
9
 import org.springframework.stereotype.Service;
10
+import com.github.pagehelper.PageHelper;
10
 import com.ruoyi.common.utils.StringUtils;
11
 import com.ruoyi.common.utils.StringUtils;
11
 import com.ruoyi.web.modules.trading.domain.AppYakMarketQuoteRow;
12
 import com.ruoyi.web.modules.trading.domain.AppYakMarketQuoteRow;
12
 import com.ruoyi.web.modules.trading.domain.BizMarketDailyQuote;
13
 import com.ruoyi.web.modules.trading.domain.BizMarketDailyQuote;
@@ -53,6 +54,7 @@ public class AppYakMarketServiceImpl implements IAppYakMarketService
53
     @Override
54
     @Override
54
     public AppYakMarketStats7Vo selectStats7()
55
     public AppYakMarketStats7Vo selectStats7()
55
     {
56
     {
57
+        PageHelper.clearPage();
56
         LocalDate end = YakMarketDateSupport.yesterday();
58
         LocalDate end = YakMarketDateSupport.yesterday();
57
         LocalDate begin = end.minusDays(6);
59
         LocalDate begin = end.minusDays(6);
58
         List<AppYakMarketQuoteRow> rows = appYakMarketQuoteMapper.selectByQuoteDateRange(
60
         List<AppYakMarketQuoteRow> rows = appYakMarketQuoteMapper.selectByQuoteDateRange(
@@ -64,6 +66,7 @@ public class AppYakMarketServiceImpl implements IAppYakMarketService
64
     @Override
66
     @Override
65
     public List<AppYakMarketTrendPointVo> selectTrend(int days)
67
     public List<AppYakMarketTrendPointVo> selectTrend(int days)
66
     {
68
     {
69
+        PageHelper.clearPage();
67
         if (days != 7 && days != 30)
70
         if (days != 7 && days != 30)
68
         {
71
         {
69
             throw new IllegalArgumentException("走势天数仅支持 7 或 30");
72
             throw new IllegalArgumentException("走势天数仅支持 7 或 30");
@@ -92,6 +95,7 @@ public class AppYakMarketServiceImpl implements IAppYakMarketService
92
     @Override
95
     @Override
93
     public AppYakMarketForecastVo selectForecast()
96
     public AppYakMarketForecastVo selectForecast()
94
     {
97
     {
98
+        PageHelper.clearPage();
95
         AppYakMarketQuoteRow row = appYakMarketQuoteMapper.selectByQuoteDate(
99
         AppYakMarketQuoteRow row = appYakMarketQuoteMapper.selectByQuoteDate(
96
                 YakMarketDateSupport.toSqlDate(YakMarketDateSupport.yesterday()));
100
                 YakMarketDateSupport.toSqlDate(YakMarketDateSupport.yesterday()));
97
         if (row == null)
101
         if (row == null)