联表查询

cmc-temperature-back/cmc-monitoring/src/main/java/com/ruoyi/monitoring/controller/CmcTemperatureController.java

@@ -60,6 +60,7 @@ public class CmcTemperatureController extends BaseController {
     private QueryWrapper getQW(CmcTemperature cmcTemperature, String Info) {
         QueryWrapper qw = QueryWrapper.create();
         qw.select(CmcTemperature::getId, CmcTemperature::getGroupNo, CmcTemperature::getSensorNo, CmcTemperature::getData, CmcTemperature::getVolt, CmcTemperature::getCSQ, CmcTemperature::getDatetime)
+            .select(CmcChannel::getInfo)
             .from(CmcTemperature.class)
             .leftJoin(CmcChannel.class)
             .on(CmcChannel::getSensorNo, CmcTemperature::getSensorNo)
@@ -72,7 +73,7 @@ public class CmcTemperatureController extends BaseController {
             .and(CmcTemperature::getCSQ).eq(cmcTemperature.getCSQ())
             .and(CmcTemperature::getDatetime).ge(cmcTemperature.getStartTime())
             .and(CmcTemperature::getDatetime).le(cmcTemperature.getEndTime())
-            .orderBy(CmcTemperature::getSensorNo).desc()
+            .orderBy(CmcTemperature::getSensorNo).asc()
             .orderBy(CmcTemperature::getDatetime).desc();
         return qw;
     }

cmc-temperature-back/cmc-monitoring/src/main/java/com/ruoyi/monitoring/domain/CmcTemperature.java

@@ -3,6 +3,7 @@ package com.ruoyi.monitoring.domain;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.RelationOneToOne;
 import com.mybatisflex.annotation.Table;
 import lombok.Data;
 
@@ -26,6 +27,9 @@ public class CmcTemperature {
     @Excel(name = "传感器编号")
     private Long SensorNo;
 
+    @RelationOneToOne(selfField = "Sensor_No", targetField = "Sensor_No", targetTable = "Channel")
+    private CmcChannel channel;
+
     /** 监测时间 */
     @Excel(name = "监测时间")
     private Date Datetime;