jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 160b38c79554dc34e5e695ee60ddc0bef7f3bde1

Authored by liquanyu
1 parent d70b31e41c
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 6 changed files with 31 additions and 12 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java View file @ 160b38c
... ... @@ -300,6 +300,5 @@
300 300 httpServletResponse,nodeName);
301 301 }
302 302  
303   -
304 303 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyStatisticsManagerController.java View file @ 160b38c
... ... @@ -6,10 +6,7 @@
6 6 import com.lyms.platform.common.constants.ErrorCodeConstants;
7 7 import com.lyms.platform.common.result.BaseListResponse;
8 8 import com.lyms.platform.common.result.BaseObjectResponse;
9   -import com.lyms.platform.common.utils.BeanUtils;
10   -import com.lyms.platform.common.utils.DateUtil;
11   -import com.lyms.platform.common.utils.ExcelUtil;
12   -import com.lyms.platform.common.utils.ExceptionUtils;
  9 +import com.lyms.platform.common.utils.*;
13 10 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
14 11 import com.lyms.platform.operate.web.facade.BabyStatisticsManagerFacade;
15 12 import com.lyms.platform.operate.web.request.*;
... ... @@ -38,6 +35,8 @@
38 35 @Autowired
39 36 private BabyStatisticsManagerFacade babyStatisticsManagerFacade;
40 37  
  38 + public static final String area_count_id = PropertiesUtils.getPropertyValue("area_count_id");
  39 +
41 40 /**
42 41 * @auther HuJiaqi
43 42 * @createTime 2017年01月09日 15时33分
... ... @@ -375,7 +374,7 @@
375 374 // jdbc查oracle
376 375 // List<Map<String, Object>> list = JdbcUtil.getOracleListDataBySql("com.mysql.jdbc.Driver", "jdbc:oracle:thin:@127.0.0.1:1521:orcl", "LYMS_ODS", "Welcome1", sql);
377 376 ExceptionUtils.catchException("babyStatisticsManagerSelfConversionList: " + sql);
378   - List<Map<String, Object>> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@192.168.1.32:1521:orcl", "LYMS_ODS", "Welcome1", sql);
  377 + List<Map<String, Object>> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@"+area_count_id+":orcl", "LYMS_ODS", "Welcome1", sql);
379 378 // List<Map<String, Object>> list = new ArrayList<>();
380 379 // Map<String, Object> m1 = new HashMap<>();
381 380 // m1.put("1", "1");
... ... @@ -446,7 +445,7 @@
446 445 // jdbc查oracle
447 446 // List<Map<String, Object>> list = JdbcUtil.getOracleListDataBySql("com.mysql.jdbc.Driver", "jdbc:oracle:thin:@127.0.0.1:1521:orcl", "LYMS_ODS", "Welcome1", sql);
448 447 ExceptionUtils.catchException("babyStatisticsManagerBuildSourceList: " + sql);
449   - List<Map<String, Object>> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@192.168.1.32:1521:orcl", "LYMS_ODS", "Welcome1", sql);
  448 + List<Map<String, Object>> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@"+area_count_id+":orcl", "LYMS_ODS", "Welcome1", sql);
450 449 // List<Map<String, Object>> list = new ArrayList<>();
451 450 // Map<String, Object> m1 = new HashMap<>();
452 451 // m1.put("1", "1");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java View file @ 160b38c
... ... @@ -68,19 +68,28 @@
68 68 node_map.put(4, "37～ 分娩");
69 69  
70 70 String version = PropertiesUtils.getPropertyValue("his_version");
  71 + String area_count_id = PropertiesUtils.getPropertyValue("area_count_id");
71 72 if ("4".equals(version))
72 73 {
73 74 //秦皇岛
74 75 DRIVER = "oracle.jdbc.driver.OracleDriver";
75   - JDBC = "jdbc:oracle:thin:@127.0.0.1:1521:orcl";
  76 + JDBC = "jdbc:oracle:thin:@"+area_count_id+":orcl";
76 77 NAME = "LYMS_ODS";
77 78 PWD = "Welcome1";
78 79 }
  80 + else if ("6".equals(version))
  81 + {
  82 + //德州
  83 + DRIVER = "oracle.jdbc.driver.OracleDriver";
  84 + JDBC = "jdbc:oracle:thin:@"+area_count_id+":orcl";
  85 + NAME = "LYMS_ODS";
  86 + PWD = "Welcome1";
  87 + }
79 88 else
80 89 {
81 90 //线上
82 91 DRIVER = "oracle.jdbc.driver.OracleDriver";
83   - JDBC = "jdbc:oracle:thin:@119.90.57.26:1522:orcl";
  92 + JDBC = "jdbc:oracle:thin:@"+area_count_id+":orcl";
84 93 NAME = "LYMS_ODS";
85 94 PWD = "Welcome1";
86 95 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java View file @ 160b38c
... ... @@ -9,6 +9,7 @@
9 9 import com.lyms.platform.common.utils.DateUtil;
10 10 import com.lyms.platform.common.utils.ExceptionUtils;
11 11 import com.lyms.platform.common.utils.JsonUtil;
  12 +import com.lyms.platform.common.utils.PropertiesUtils;
12 13 import com.lyms.platform.operate.web.request.*;
13 14 import com.lyms.platform.operate.web.result.*;
14 15 import com.lyms.platform.operate.web.utils.JdbcUtil;
... ... @@ -33,6 +34,8 @@
33 34 @Component
34 35 public class BabyStatisticsManagerFacade {
35 36  
  37 + public static final String area_count_id = PropertiesUtils.getPropertyValue("area_count_id");
  38 +
36 39 @Autowired
37 40 private BabyService babyService;
38 41  
... ... @@ -636,7 +639,7 @@
636 639 "END)";
637 640 // jdbc查oracle
638 641 ExceptionUtils.catchException("babyStatisticsManagerBuildSourceList: " + sql);
639   - List<Map<String, Object>> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@127.0.0.1:1521:orcl", "LYMS_ODS", "Welcome1", sql);
  642 + List<Map<String, Object>> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@"+area_count_id+":orcl", "LYMS_ODS", "Welcome1", sql);
640 643 // List<Map<String, Object>> list = new ArrayList<>();
641 644 // Map<String, Object> m1 = new HashMap<>();
642 645 // m1.put("LB_NAME", "本院分娩");
... ... @@ -792,7 +795,7 @@
792 795  
793 796 // jdbc查oracle
794 797 ExceptionUtils.catchException("babyStatisticsManagerSelfConversionList: " + sql);
795   - List<Map<String, Object>> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@127.0.0.1:1521:orcl", "LYMS_ODS", "Welcome1", sql);
  798 + List<Map<String, Object>> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@"+area_count_id+":orcl", "LYMS_ODS", "Welcome1", sql);
796 799  
797 800 Collections.sort(list, new Comparator<Map<String, Object>>() {
798 801 @Override
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/JdbcUtil.java View file @ 160b38c
1 1 package com.lyms.platform.operate.web.utils;
2 2  
  3 +import com.lyms.platform.common.utils.PropertiesUtils;
  4 +
3 5 import java.sql.*;
4 6 import java.util.ArrayList;
5 7 import java.util.HashMap;
6 8  
... ... @@ -10,11 +12,14 @@
10 12 * Created by Administrator on 2016/9/29.
11 13 */
12 14 public class JdbcUtil {
  15 +
  16 + static String area_count_id = PropertiesUtils.getPropertyValue("area_count_id");
  17 +
13 18 public static Connection getOracleConnection() {
14 19 Connection con = null;
15 20 try {
16 21 Class.forName("oracle.jdbc.driver.OracleDriver");
17   - String url = "jdbc:oracle:thin:@192.168.1.32:1521:orcl";
  22 + String url = "jdbc:oracle:thin:@"+area_count_id+":orcl";
18 23 String userName = "LYMS_ODS";
19 24 String pwd = "Welcome1";
20 25 con = DriverManager.getConnection(url, userName, pwd);
platform-operate-api/src/main/resources/config.properties View file @ 160b38c
... ... @@ -22,4 +22,8 @@
22 22  
23 23 #postser_url=http://api.meishengbb.com/initdata/reser
24 24 postser_url=http://devmmsapi.qinhuangdao.healthbaby.com.cn:18019/initdata/reser
  25 +
  26 +
  27 +#区域统计地址
  28 +area_count_url=192.168.1.32