lamphua 2 settimane fa
parent
commit
a5ceff3640

+ 4
- 4
cmc-temperature-back/cmc-monitoring/src/main/java/com/ruoyi/monitoring/controller/CmcTemperatureController.java Vedi File

50
      */
50
      */
51
     @Get
51
     @Get
52
     @Mapping("listByInfo")
52
     @Mapping("listByInfo")
53
-    public List<CmcTemperature> listByInfo(CmcTemperature cmcTemperature, String Info) {
54
-        QueryWrapper qw = getQW(cmcTemperature, Info);
53
+    public List<CmcTemperature> listByInfo(CmcTemperature cmcTemperature, String Info, Integer pageSize, Integer pageNum) {
54
+        QueryWrapper qw = getQW(cmcTemperature, Info, pageSize, pageNum);
55
         return cmcTemperatureService.list(qw);
55
         return cmcTemperatureService.list(qw);
56
     }
56
     }
57
 
57
 
58
-    private QueryWrapper getQW(CmcTemperature cmcTemperature, String Info) {
58
+    private QueryWrapper getQW(CmcTemperature cmcTemperature, String Info, Integer pageSize, Integer pageNum) {
59
         QueryWrapper qw = QueryWrapper.create();
59
         QueryWrapper qw = QueryWrapper.create();
60
         qw.select(CmcTemperature::getId, CmcTemperature::getGroupNo, CmcTemperature::getSensorNo, CmcTemperature::getData, CmcTemperature::getVolt, CmcTemperature::getCSQ, CmcTemperature::getDatetime)
60
         qw.select(CmcTemperature::getId, CmcTemperature::getGroupNo, CmcTemperature::getSensorNo, CmcTemperature::getData, CmcTemperature::getVolt, CmcTemperature::getCSQ, CmcTemperature::getDatetime)
61
             .from(CmcTemperature.class)
61
             .from(CmcTemperature.class)
70
             .and(CmcTemperature::getCSQ).eq(cmcTemperature.getCSQ())
70
             .and(CmcTemperature::getCSQ).eq(cmcTemperature.getCSQ())
71
             .and(CmcTemperature::getDatetime).ge(cmcTemperature.getStartTime())
71
             .and(CmcTemperature::getDatetime).ge(cmcTemperature.getStartTime())
72
             .and(CmcTemperature::getDatetime).le(cmcTemperature.getEndTime())
72
             .and(CmcTemperature::getDatetime).le(cmcTemperature.getEndTime())
73
-            .orderBy(CmcTemperature::getDatetime).desc();
73
+            .orderBy(CmcTemperature::getDatetime).desc().limit((pageNum - 1) * pageSize, pageSize);
74
         return qw;
74
         return qw;
75
     }
75
     }
76
 
76
 

+ 1
- 1
cmc-temperature-back/cmc-monitoring/src/main/resources/mapper/temperature/CmcChannelMapper.xml Vedi File

25
         <where>
25
         <where>
26
             <if test="Id != null ">c.ID = #{Id}</if>
26
             <if test="Id != null ">c.ID = #{Id}</if>
27
             <if test="SensorNo != null ">c.Sensor_No = #{SensorNo}</if>
27
             <if test="SensorNo != null ">c.Sensor_No = #{SensorNo}</if>
28
-            <if test="Info != null ">c.Info = #{Info}</if>
28
+            <if test="Info != null ">c.Info LIKE concat('%', #{Info}, '%')</if>
29
             <if test="Ver != null ">c.Ver = #{Ver}</if>
29
             <if test="Ver != null ">c.Ver = #{Ver}</if>
30
             <if test="Sn != null ">c.Sn = #{Sn}</if>
30
             <if test="Sn != null ">c.Sn = #{Sn}</if>
31
             <if test="Ca != null ">c.Ca = #{Ca}</if>
31
             <if test="Ca != null ">c.Ca = #{Ca}</if>

Loading…
Annulla
Salva