查询监测点位位置列表，根据点位查询水温监测列表

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

@@ -8,7 +8,9 @@ import org.noear.solon.annotation.Get;
 import org.noear.solon.annotation.Inject;
 import org.noear.solon.annotation.Mapping;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 监测点位
@@ -29,4 +31,26 @@ public class CmcChannelController extends BaseController {
     public List<CmcChannel> list(CmcChannel cmcChannel) {
         return cmcChannelService.listChannel(cmcChannel);
     }
+
+    /**
+     * 查询监测点位位置列表
+     */
+    @Get
+    @Mapping("channelInfoList")
+    public List<String> channelInfoList() {
+        List<String> channelInfoList = new ArrayList<>();
+        List<String> multiChannelInfoList = new ArrayList<>();
+        List<CmcChannel> cmcChannelList = cmcChannelService.listChannel(new CmcChannel());
+        cmcChannelList.forEach(channel -> {
+            if (channel.getInfo() != null && !channel.getInfo().equals("")) {
+                if (!channel.getInfo().contains("-"))
+                    channelInfoList.add(channel.getInfo());
+                else
+                    multiChannelInfoList.add(channel.getInfo().split("-")[0]);
+            }
+        });
+        channelInfoList.addAll(multiChannelInfoList.stream().distinct().collect(Collectors.toList()));
+        return channelInfoList;
+    }
+
 }

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

@@ -1,6 +1,8 @@
 package com.ruoyi.monitoring.controller;
 
+import com.mybatisflex.core.query.QueryTable;
 import com.mybatisflex.core.query.QueryWrapper;
+import com.ruoyi.monitoring.domain.CmcChannel;
 import com.ruoyi.monitoring.domain.CmcTemperature;
 import com.ruoyi.monitoring.service.ICmcTemperatureService;
 import com.ruoyi.common.web.controller.BaseController;
@@ -31,8 +33,8 @@ public class CmcTemperatureController extends BaseController {
 
     private QueryWrapper getQW(CmcTemperature cmcTemperature) {
         QueryWrapper qw = QueryWrapper.create();
-        qw.and(CmcTemperature::getId).like(cmcTemperature.getId());
-        qw.and(CmcTemperature::getGroupNo).like(cmcTemperature.getGroupNo());
+        qw.and(CmcTemperature::getId).eq(cmcTemperature.getId());
+        qw.and(CmcTemperature::getGroupNo).eq(cmcTemperature.getGroupNo());
         qw.and(CmcTemperature::getSensorNo).eq(cmcTemperature.getSensorNo());
         qw.and(CmcTemperature::getData).eq(cmcTemperature.getData());
         qw.and(CmcTemperature::getVolt).eq(cmcTemperature.getVolt());
@@ -43,4 +45,33 @@ public class CmcTemperatureController extends BaseController {
         return qw;
     }
 
+    /**
+     * 根据点位查询水温监测列表
+     */
+    @Get
+    @Mapping("listByInfo")
+    public List<CmcTemperature> listByInfo(CmcTemperature cmcTemperature, String Info) {
+        QueryWrapper qw = getQW(cmcTemperature, Info);
+        return cmcTemperatureService.list(qw);
+    }
+
+    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)
+            .from(CmcTemperature.class)
+            .leftJoin(CmcChannel.class)
+            .on(CmcChannel::getSensorNo, CmcTemperature::getSensorNo)
+            .where(CmcChannel::getInfo).eq(Info)
+            .and(CmcTemperature::getId).eq(cmcTemperature.getId())
+            .and(CmcTemperature::getGroupNo).eq(cmcTemperature.getGroupNo())
+            .and(CmcTemperature::getSensorNo).eq(cmcTemperature.getSensorNo())
+            .and(CmcTemperature::getData).eq(cmcTemperature.getData())
+            .and(CmcTemperature::getVolt).eq(cmcTemperature.getVolt())
+            .and(CmcTemperature::getCSQ).eq(cmcTemperature.getCSQ())
+            .and(CmcTemperature::getDatetime).ge(cmcTemperature.getStartTime())
+            .and(CmcTemperature::getDatetime).le(cmcTemperature.getEndTime())
+            .orderBy(CmcTemperature::getDatetime).desc();
+        return qw;
+    }
+
 }

cmc-temperature-back/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java

@@ -1,5 +1,6 @@
 package com.ruoyi.gen.mapper;
 
+import com.mybatisflex.annotation.UseDataSource;
 import com.mybatisflex.core.BaseMapper;
 import com.ruoyi.gen.domain.GenTableColumn;
 
@@ -9,6 +10,7 @@ import java.util.List;
  * 业务表字段 数据层
  * @author ruoyi
  */
+@UseDataSource("sqlite")
 public interface GenTableColumnMapper extends BaseMapper<GenTableColumn> {
 
     /**

cmc-temperature-back/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java

@@ -1,5 +1,6 @@
 package com.ruoyi.gen.mapper;
 
+import com.mybatisflex.annotation.UseDataSource;
 import com.mybatisflex.core.BaseMapper;
 import com.ruoyi.gen.domain.GenTable;
 
@@ -9,6 +10,7 @@ import java.util.List;
  * 业务表 数据层
  * @author ruoyi
  */
+@UseDataSource("sqlite")
 public interface GenTableMapper extends BaseMapper<GenTable> {
 
     /**