|
@@ -16,18 +16,18 @@ public class DbUtil {
|
|
|
private static final Logger log = LoggerFactory.getLogger(DbUtil.class);
|
|
|
private static Connection conn = null;
|
|
|
|
|
|
- // private final static String url =
|
|
|
+ // private static final String URL =
|
|
|
// "jdbc:postgresql://127.0.0.1:5432/postgres";
|
|
|
- // private final static String user = "postgres";
|
|
|
- // private final static String password = "ava1234";
|
|
|
+ // private static final String USER = "postgres";
|
|
|
+ // private static final String PASSWORD = "ava1234";
|
|
|
|
|
|
- private final static String url = "jdbc:postgresql://10.100.68.195:5432/sqmmt";
|
|
|
- private final static String user = "pmparse";
|
|
|
- private final static String password = "abc123!";
|
|
|
+ private static final String URL = "jdbc:postgresql://10.100.68.195:5432/sqmmt";
|
|
|
+ private static final String USER = "pmparse";
|
|
|
+ private static final String PASSWORD = "abc123!";
|
|
|
|
|
|
static {
|
|
|
try {
|
|
|
- conn = DriverManager.getConnection(url, user, password);
|
|
|
+ conn = DriverManager.getConnection(URL, USER, PASSWORD);
|
|
|
} catch (SQLException e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
@@ -60,17 +60,27 @@ public class DbUtil {
|
|
|
String[] timeArray = sdate.split(" - ");
|
|
|
String startTime = timeArray[0];
|
|
|
String endTime = timeArray[1];
|
|
|
- String sql = "select a.cellname,a.city,a.quxian,a.vendor,b.* from \n(select eci,cellname,city,quxian,vendor from pm_parse.per_cfg_cell where "
|
|
|
- + searchType + " in (" + condition + ")) a\ninner join \n(select " + indicators
|
|
|
- + " from pm_parse.pm_4g_" + ttype + " where sdate>='" + startTime + "' and sdate <= '" + endTime
|
|
|
- + "') b\n" + "on a.eci=b.eci";
|
|
|
+ condition = condition.replace(",", "','");
|
|
|
+ log.debug("condition: {}", condition);
|
|
|
+ // eci
|
|
|
+ String sql = "select a.cellname,a.city,a.quxian,a.vendor,b.*"
|
|
|
+ + " from (select eci, cellname, city, quxian, vendor"
|
|
|
+ + " from pm_parse.per_cfg_cell"
|
|
|
+ + " where eci in (" + condition + ")) a"
|
|
|
+ + " inner join (select " + indicators + " from pm_parse.pm_4g_" + ttype
|
|
|
+ + " where sdate >= '" + startTime
|
|
|
+ + "' and sdate <= '" + endTime + "') b"
|
|
|
+ + " on a.eci = b.eci";
|
|
|
// 全网
|
|
|
if ("all".equals(searchType)) {
|
|
|
- sql = "select a.cellname,a.city,a.quxian,a.vendor,b.* from pm_parse.per_cfg_cell a\ninner join \n(select "
|
|
|
- + indicators + " from pm_parse.pm_4g_" + ttype + " where sdate>='" + startTime + "' and sdate <= '"
|
|
|
- + endTime + "') b\n" + "on a.eci=b.eci";
|
|
|
+ sql = "select a.cellname, a.city, a.quxian, a.vendor, b.* from pm_parse.per_cfg_cell a"
|
|
|
+ + " inner join (select " + indicators + " from pm_parse.pm_4g_" + ttype
|
|
|
+ + " where sdate >= '" + startTime
|
|
|
+ + "' and sdate <= '" + endTime + "') b"
|
|
|
+ + " on a.eci = b.eci";
|
|
|
}
|
|
|
|
|
|
+ log.debug("sql: {}", sql);
|
|
|
List<Map<String, String>> datas = new ArrayList<>();
|
|
|
List<Col> cols = new ArrayList<>();
|
|
|
try {
|
|
@@ -125,23 +135,12 @@ public class DbUtil {
|
|
|
String startTime = timeArray[0];
|
|
|
String endTime = timeArray[1];
|
|
|
|
|
|
- String sql = "select b.* from \n" +
|
|
|
- "(select eci from pm_parse.per_cfg_cell where quxian in (" + quxians + ")) a\n" +
|
|
|
- "inner join \n" +
|
|
|
- "(select eci," + indicators + " from pm_parse.pm_4g_" + ttype +
|
|
|
- " where sdate>='" + startTime +
|
|
|
- "' and sdate <= '" + endTime + "') b\n" +
|
|
|
- "on a.eci=b.eci";
|
|
|
-
|
|
|
- if (indicators.contains("eci")) {
|
|
|
- sql = "select b.* from \n" +
|
|
|
- "(select eci from pm_parse.per_cfg_cell where quxian in (" + quxians + ")) a\n" +
|
|
|
- "inner join \n" +
|
|
|
- "(select " + indicators + " from pm_parse.pm_4g_" + ttype +
|
|
|
- " where sdate>='" + startTime +
|
|
|
- "' and sdate <= '" + endTime + "') b\n" +
|
|
|
- "on a.eci=b.eci";
|
|
|
- }
|
|
|
+ String sql = "select b.* from (select eci from pm_parse.per_cfg_cell where quxian in (" + quxians + ")) a"
|
|
|
+ + " inner join (select " + indicators + " from pm_parse.pm_4g_" + ttype
|
|
|
+ + " where sdate >= '" + startTime
|
|
|
+ + "' and sdate <= '" + endTime + "') b"
|
|
|
+ + " on a.eci = b.eci";
|
|
|
+ log.debug("sql: {}", sql);
|
|
|
List<Map<String, String>> datas = new ArrayList<>();
|
|
|
List<Col> cols = new ArrayList<>();
|
|
|
try {
|