浏览代码

联表查询

lamphua 2 周前
父节点
当前提交
eb8e1ac958

+ 2
- 1
cmc-temperature-back/cmc-monitoring/src/main/java/com/ruoyi/monitoring/controller/CmcTemperatureController.java 查看文件

60
     private QueryWrapper getQW(CmcTemperature cmcTemperature, String Info) {
60
     private QueryWrapper getQW(CmcTemperature cmcTemperature, String Info) {
61
         QueryWrapper qw = QueryWrapper.create();
61
         QueryWrapper qw = QueryWrapper.create();
62
         qw.select(CmcTemperature::getId, CmcTemperature::getGroupNo, CmcTemperature::getSensorNo, CmcTemperature::getData, CmcTemperature::getVolt, CmcTemperature::getCSQ, CmcTemperature::getDatetime)
62
         qw.select(CmcTemperature::getId, CmcTemperature::getGroupNo, CmcTemperature::getSensorNo, CmcTemperature::getData, CmcTemperature::getVolt, CmcTemperature::getCSQ, CmcTemperature::getDatetime)
63
+            .select(CmcChannel::getInfo)
63
             .from(CmcTemperature.class)
64
             .from(CmcTemperature.class)
64
             .leftJoin(CmcChannel.class)
65
             .leftJoin(CmcChannel.class)
65
             .on(CmcChannel::getSensorNo, CmcTemperature::getSensorNo)
66
             .on(CmcChannel::getSensorNo, CmcTemperature::getSensorNo)
72
             .and(CmcTemperature::getCSQ).eq(cmcTemperature.getCSQ())
73
             .and(CmcTemperature::getCSQ).eq(cmcTemperature.getCSQ())
73
             .and(CmcTemperature::getDatetime).ge(cmcTemperature.getStartTime())
74
             .and(CmcTemperature::getDatetime).ge(cmcTemperature.getStartTime())
74
             .and(CmcTemperature::getDatetime).le(cmcTemperature.getEndTime())
75
             .and(CmcTemperature::getDatetime).le(cmcTemperature.getEndTime())
75
-            .orderBy(CmcTemperature::getSensorNo).desc()
76
+            .orderBy(CmcTemperature::getSensorNo).asc()
76
             .orderBy(CmcTemperature::getDatetime).desc();
77
             .orderBy(CmcTemperature::getDatetime).desc();
77
         return qw;
78
         return qw;
78
     }
79
     }

+ 4
- 0
cmc-temperature-back/cmc-monitoring/src/main/java/com/ruoyi/monitoring/domain/CmcTemperature.java 查看文件

3
 import cn.afterturn.easypoi.excel.annotation.Excel;
3
 import cn.afterturn.easypoi.excel.annotation.Excel;
4
 import com.mybatisflex.annotation.Column;
4
 import com.mybatisflex.annotation.Column;
5
 import com.mybatisflex.annotation.Id;
5
 import com.mybatisflex.annotation.Id;
6
+import com.mybatisflex.annotation.RelationOneToOne;
6
 import com.mybatisflex.annotation.Table;
7
 import com.mybatisflex.annotation.Table;
7
 import lombok.Data;
8
 import lombok.Data;
8
 
9
 
26
     @Excel(name = "传感器编号")
27
     @Excel(name = "传感器编号")
27
     private Long SensorNo;
28
     private Long SensorNo;
28
 
29
 
30
+    @RelationOneToOne(selfField = "Sensor_No", targetField = "Sensor_No", targetTable = "Channel")
31
+    private CmcChannel channel;
32
+
29
     /** 监测时间 */
33
     /** 监测时间 */
30
     @Excel(name = "监测时间")
34
     @Excel(name = "监测时间")
31
     private Date Datetime;
35
     private Date Datetime;

正在加载...
取消
保存