Ver código fonte

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

lamphua 2 semanas atrás
pai
commit
333afb869b

+ 24
- 0
cmc-temperature-back/cmc-monitoring/src/main/java/com/ruoyi/monitoring/controller/CmcChannelController.java Ver arquivo

8
 import org.noear.solon.annotation.Inject;
8
 import org.noear.solon.annotation.Inject;
9
 import org.noear.solon.annotation.Mapping;
9
 import org.noear.solon.annotation.Mapping;
10
 
10
 
11
+import java.util.ArrayList;
11
 import java.util.List;
12
 import java.util.List;
13
+import java.util.stream.Collectors;
12
 
14
 
13
 /**
15
 /**
14
  * 监测点位
16
  * 监测点位
29
     public List<CmcChannel> list(CmcChannel cmcChannel) {
31
     public List<CmcChannel> list(CmcChannel cmcChannel) {
30
         return cmcChannelService.listChannel(cmcChannel);
32
         return cmcChannelService.listChannel(cmcChannel);
31
     }
33
     }
34
+
35
+    /**
36
+     * 查询监测点位位置列表
37
+     */
38
+    @Get
39
+    @Mapping("channelInfoList")
40
+    public List<String> channelInfoList() {
41
+        List<String> channelInfoList = new ArrayList<>();
42
+        List<String> multiChannelInfoList = new ArrayList<>();
43
+        List<CmcChannel> cmcChannelList = cmcChannelService.listChannel(new CmcChannel());
44
+        cmcChannelList.forEach(channel -> {
45
+            if (channel.getInfo() != null && !channel.getInfo().equals("")) {
46
+                if (!channel.getInfo().contains("-"))
47
+                    channelInfoList.add(channel.getInfo());
48
+                else
49
+                    multiChannelInfoList.add(channel.getInfo().split("-")[0]);
50
+            }
51
+        });
52
+        channelInfoList.addAll(multiChannelInfoList.stream().distinct().collect(Collectors.toList()));
53
+        return channelInfoList;
54
+    }
55
+
32
 }
56
 }

+ 33
- 2
cmc-temperature-back/cmc-monitoring/src/main/java/com/ruoyi/monitoring/controller/CmcTemperatureController.java Ver arquivo

1
 package com.ruoyi.monitoring.controller;
1
 package com.ruoyi.monitoring.controller;
2
 
2
 
3
+import com.mybatisflex.core.query.QueryTable;
3
 import com.mybatisflex.core.query.QueryWrapper;
4
 import com.mybatisflex.core.query.QueryWrapper;
5
+import com.ruoyi.monitoring.domain.CmcChannel;
4
 import com.ruoyi.monitoring.domain.CmcTemperature;
6
 import com.ruoyi.monitoring.domain.CmcTemperature;
5
 import com.ruoyi.monitoring.service.ICmcTemperatureService;
7
 import com.ruoyi.monitoring.service.ICmcTemperatureService;
6
 import com.ruoyi.common.web.controller.BaseController;
8
 import com.ruoyi.common.web.controller.BaseController;
31
 
33
 
32
     private QueryWrapper getQW(CmcTemperature cmcTemperature) {
34
     private QueryWrapper getQW(CmcTemperature cmcTemperature) {
33
         QueryWrapper qw = QueryWrapper.create();
35
         QueryWrapper qw = QueryWrapper.create();
34
-        qw.and(CmcTemperature::getId).like(cmcTemperature.getId());
35
-        qw.and(CmcTemperature::getGroupNo).like(cmcTemperature.getGroupNo());
36
+        qw.and(CmcTemperature::getId).eq(cmcTemperature.getId());
37
+        qw.and(CmcTemperature::getGroupNo).eq(cmcTemperature.getGroupNo());
36
         qw.and(CmcTemperature::getSensorNo).eq(cmcTemperature.getSensorNo());
38
         qw.and(CmcTemperature::getSensorNo).eq(cmcTemperature.getSensorNo());
37
         qw.and(CmcTemperature::getData).eq(cmcTemperature.getData());
39
         qw.and(CmcTemperature::getData).eq(cmcTemperature.getData());
38
         qw.and(CmcTemperature::getVolt).eq(cmcTemperature.getVolt());
40
         qw.and(CmcTemperature::getVolt).eq(cmcTemperature.getVolt());
43
         return qw;
45
         return qw;
44
     }
46
     }
45
 
47
 
48
+    /**
49
+     * 根据点位查询水温监测列表
50
+     */
51
+    @Get
52
+    @Mapping("listByInfo")
53
+    public List<CmcTemperature> listByInfo(CmcTemperature cmcTemperature, String Info) {
54
+        QueryWrapper qw = getQW(cmcTemperature, Info);
55
+        return cmcTemperatureService.list(qw);
56
+    }
57
+
58
+    private QueryWrapper getQW(CmcTemperature cmcTemperature, String Info) {
59
+        QueryWrapper qw = QueryWrapper.create();
60
+        qw.select(CmcTemperature::getId, CmcTemperature::getGroupNo, CmcTemperature::getSensorNo, CmcTemperature::getData, CmcTemperature::getVolt, CmcTemperature::getCSQ, CmcTemperature::getDatetime)
61
+            .from(CmcTemperature.class)
62
+            .leftJoin(CmcChannel.class)
63
+            .on(CmcChannel::getSensorNo, CmcTemperature::getSensorNo)
64
+            .where(CmcChannel::getInfo).eq(Info)
65
+            .and(CmcTemperature::getId).eq(cmcTemperature.getId())
66
+            .and(CmcTemperature::getGroupNo).eq(cmcTemperature.getGroupNo())
67
+            .and(CmcTemperature::getSensorNo).eq(cmcTemperature.getSensorNo())
68
+            .and(CmcTemperature::getData).eq(cmcTemperature.getData())
69
+            .and(CmcTemperature::getVolt).eq(cmcTemperature.getVolt())
70
+            .and(CmcTemperature::getCSQ).eq(cmcTemperature.getCSQ())
71
+            .and(CmcTemperature::getDatetime).ge(cmcTemperature.getStartTime())
72
+            .and(CmcTemperature::getDatetime).le(cmcTemperature.getEndTime())
73
+            .orderBy(CmcTemperature::getDatetime).desc();
74
+        return qw;
75
+    }
76
+
46
 }
77
 }

+ 2
- 0
cmc-temperature-back/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java Ver arquivo

1
 package com.ruoyi.gen.mapper;
1
 package com.ruoyi.gen.mapper;
2
 
2
 
3
+import com.mybatisflex.annotation.UseDataSource;
3
 import com.mybatisflex.core.BaseMapper;
4
 import com.mybatisflex.core.BaseMapper;
4
 import com.ruoyi.gen.domain.GenTableColumn;
5
 import com.ruoyi.gen.domain.GenTableColumn;
5
 
6
 
9
  * 业务表字段 数据层
10
  * 业务表字段 数据层
10
  * @author ruoyi
11
  * @author ruoyi
11
  */
12
  */
13
+@UseDataSource("sqlite")
12
 public interface GenTableColumnMapper extends BaseMapper<GenTableColumn> {
14
 public interface GenTableColumnMapper extends BaseMapper<GenTableColumn> {
13
 
15
 
14
     /**
16
     /**

+ 2
- 0
cmc-temperature-back/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java Ver arquivo

1
 package com.ruoyi.gen.mapper;
1
 package com.ruoyi.gen.mapper;
2
 
2
 
3
+import com.mybatisflex.annotation.UseDataSource;
3
 import com.mybatisflex.core.BaseMapper;
4
 import com.mybatisflex.core.BaseMapper;
4
 import com.ruoyi.gen.domain.GenTable;
5
 import com.ruoyi.gen.domain.GenTable;
5
 
6
 
9
  * 业务表 数据层
10
  * 业务表 数据层
10
  * @author ruoyi
11
  * @author ruoyi
11
  */
12
  */
13
+@UseDataSource("sqlite")
12
 public interface GenTableMapper extends BaseMapper<GenTable> {
14
 public interface GenTableMapper extends BaseMapper<GenTable> {
13
 
15
 
14
     /**
16
     /**

Carregando…
Cancelar
Salvar