From c47bac207b1f49d4cfe8cd98202a96865345a94f Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期三, 15 十一月 2023 09:11:08 +0800
Subject: [PATCH] 修改了sql语句，能同时返回站点名称和设备编号
---
src/main/java/com/flightfeather/monitor/mapper/FugitiveDustMapper.java | 2 +-
src/main/resources/application.yml | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/flightfeather/monitor/mapper/FugitiveDustMapper.java b/src/main/java/com/flightfeather/monitor/mapper/FugitiveDustMapper.java
index 397ac58..41b141d 100644
--- a/src/main/java/com/flightfeather/monitor/mapper/FugitiveDustMapper.java
+++ b/src/main/java/com/flightfeather/monitor/mapper/FugitiveDustMapper.java
@@ -16,7 +16,7 @@
@Select("select DISTINCT typename from ja_t_dust_site_info")
List<DustSiteData> scenarioData();
- @Select("select DISTINCT name from ja_t_dust_site_info ")
+ @Select("select DISTINCT name,mn_code from ja_t_dust_site_info ")
List<DustSiteData> allSiteName();
List<AnalysisDustData> analysisdata(String siteName, String beginTime, String endTime,String type);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f4ff63b..dd7bceb 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -3,9 +3,9 @@
ds1:
driver-class-name: com.mysql.cj.jdbc.Driver
# 鐢熶骇鐜
- url: jdbc:mysql://localhost:3306/fume
- username: fume
- password: fume_feiyu2023
+# url: jdbc:mysql://localhost:3306/fume
+# username: fume
+# password: fume_feiyu2023
# url: jdbc:mysql://localhost:3306/qianduan_sql
# username: root
@@ -15,9 +15,9 @@
# username: root
# password: 123456
-# url: jdbc:mysql://114.215.109.124:3306/fume
-# username: fumeRemote
-# password: feiyu2023
+ url: jdbc:mysql://114.215.109.124:3306/fume
+ username: fumeRemote
+ password: feiyu2023
mybatis:
configuration:
--
Gitblit v1.9.3