lamphua 1 tydzień temu
rodzic
commit
e793b85ac5

+ 8
- 1
cmc-temperature-back/cmc-monitoring/src/main/java/com/ruoyi/monitoring/controller/CmcTemperatureController.java Wyświetl plik

5
 import com.ruoyi.common.web.domain.PageData;
5
 import com.ruoyi.common.web.domain.PageData;
6
 import com.ruoyi.monitoring.domain.CmcChannel;
6
 import com.ruoyi.monitoring.domain.CmcChannel;
7
 import com.ruoyi.monitoring.domain.CmcTemperature;
7
 import com.ruoyi.monitoring.domain.CmcTemperature;
8
+import com.ruoyi.monitoring.service.ICmcChannelService;
8
 import com.ruoyi.monitoring.service.ICmcTemperatureService;
9
 import com.ruoyi.monitoring.service.ICmcTemperatureService;
9
 import com.ruoyi.common.web.controller.BaseController;
10
 import com.ruoyi.common.web.controller.BaseController;
10
 import org.noear.solon.annotation.*;
11
 import org.noear.solon.annotation.*;
22
     @Inject
23
     @Inject
23
     ICmcTemperatureService cmcTemperatureService;
24
     ICmcTemperatureService cmcTemperatureService;
24
 
25
 
26
+    @Inject
27
+    ICmcChannelService cmcChannelService;
28
+
25
     /**
29
     /**
26
      * 查询水温监测列表
30
      * 查询水温监测列表
27
      */
31
      */
52
     @Get
56
     @Get
53
     @Mapping("listByInfo")
57
     @Mapping("listByInfo")
54
     public PageData<CmcTemperature> listByInfo(Page<CmcTemperature> page, CmcTemperature cmcTemperature, String Info) {
58
     public PageData<CmcTemperature> listByInfo(Page<CmcTemperature> page, CmcTemperature cmcTemperature, String Info) {
59
+        CmcChannel channel = new CmcChannel();
60
+        channel.setInfo(Info);
61
+        int channelSize = cmcChannelService.listChannel(channel).size();
55
         QueryWrapper qw = getQW(cmcTemperature, Info);
62
         QueryWrapper qw = getQW(cmcTemperature, Info);
56
         Page<CmcTemperature> result = cmcTemperatureService.page(page, qw);
63
         Page<CmcTemperature> result = cmcTemperatureService.page(page, qw);
57
-        return getPageData(result);
64
+        return getPageData(result).total(result.getRecords().size() / channelSize);
58
     }
65
     }
59
 
66
 
60
     private QueryWrapper getQW(CmcTemperature cmcTemperature, String Info) {
67
     private QueryWrapper getQW(CmcTemperature cmcTemperature, String Info) {

Ładowanie…
Anuluj
Zapisz