diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java index 608005f..7a031d8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java @@ -300,5 +300,4 @@ public class AreaCountController extends BaseController { httpServletResponse,nodeName); } - } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyStatisticsManagerController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyStatisticsManagerController.java index bad43b6..d0c0124 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyStatisticsManagerController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyStatisticsManagerController.java @@ -6,10 +6,7 @@ import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; -import com.lyms.platform.common.utils.BeanUtils; -import com.lyms.platform.common.utils.DateUtil; -import com.lyms.platform.common.utils.ExcelUtil; -import com.lyms.platform.common.utils.ExceptionUtils; +import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.facade.BabyStatisticsManagerFacade; import com.lyms.platform.operate.web.request.*; @@ -38,6 +35,8 @@ public class BabyStatisticsManagerController extends BaseController { @Autowired private BabyStatisticsManagerFacade babyStatisticsManagerFacade; + public static final String area_count_id = PropertiesUtils.getPropertyValue("area_count_id"); + /** * @auther HuJiaqi * @createTime 2017年01月09日 15时33分 @@ -375,7 +374,7 @@ public class BabyStatisticsManagerController extends BaseController { // jdbc查oracle // List> list = JdbcUtil.getOracleListDataBySql("com.mysql.jdbc.Driver", "jdbc:oracle:thin:@127.0.0.1:1521:orcl", "LYMS_ODS", "Welcome1", sql); ExceptionUtils.catchException("babyStatisticsManagerSelfConversionList: " + sql); - List> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@192.168.1.32:1521:orcl", "LYMS_ODS", "Welcome1", sql); + List> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@"+area_count_id+":orcl", "LYMS_ODS", "Welcome1", sql); // List> list = new ArrayList<>(); // Map m1 = new HashMap<>(); // m1.put("1", "1"); @@ -446,7 +445,7 @@ public class BabyStatisticsManagerController extends BaseController { // jdbc查oracle // List> list = JdbcUtil.getOracleListDataBySql("com.mysql.jdbc.Driver", "jdbc:oracle:thin:@127.0.0.1:1521:orcl", "LYMS_ODS", "Welcome1", sql); ExceptionUtils.catchException("babyStatisticsManagerBuildSourceList: " + sql); - List> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@192.168.1.32:1521:orcl", "LYMS_ODS", "Welcome1", sql); + List> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@"+area_count_id+":orcl", "LYMS_ODS", "Welcome1", sql); // List> list = new ArrayList<>(); // Map m1 = new HashMap<>(); // m1.put("1", "1"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java index 5cabc77..dbc81cb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java @@ -68,11 +68,20 @@ public class AreaCountFacade { node_map.put(4, "37～ 分娩"); String version = PropertiesUtils.getPropertyValue("his_version"); + String area_count_id = PropertiesUtils.getPropertyValue("area_count_id"); if ("4".equals(version)) { //秦皇岛 DRIVER = "oracle.jdbc.driver.OracleDriver"; - JDBC = "jdbc:oracle:thin:@127.0.0.1:1521:orcl"; + JDBC = "jdbc:oracle:thin:@"+area_count_id+":orcl"; + NAME = "LYMS_ODS"; + PWD = "Welcome1"; + } + else if ("6".equals(version)) + { + //德州 + DRIVER = "oracle.jdbc.driver.OracleDriver"; + JDBC = "jdbc:oracle:thin:@"+area_count_id+":orcl"; NAME = "LYMS_ODS"; PWD = "Welcome1"; } @@ -80,7 +89,7 @@ public class AreaCountFacade { { //线上 DRIVER = "oracle.jdbc.driver.OracleDriver"; - JDBC = "jdbc:oracle:thin:@119.90.57.26:1522:orcl"; + JDBC = "jdbc:oracle:thin:@"+area_count_id+":orcl"; NAME = "LYMS_ODS"; PWD = "Welcome1"; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java index eaa0b95..5aa3bef 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java @@ -9,6 +9,7 @@ import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.common.utils.PropertiesUtils; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.utils.JdbcUtil; @@ -33,6 +34,8 @@ import java.util.*; @Component public class BabyStatisticsManagerFacade { + public static final String area_count_id = PropertiesUtils.getPropertyValue("area_count_id"); + @Autowired private BabyService babyService; @@ -636,7 +639,7 @@ public class BabyStatisticsManagerFacade { "END)"; // jdbc查oracle ExceptionUtils.catchException("babyStatisticsManagerBuildSourceList: " + sql); - List> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@127.0.0.1:1521:orcl", "LYMS_ODS", "Welcome1", sql); + List> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@"+area_count_id+":orcl", "LYMS_ODS", "Welcome1", sql); // List> list = new ArrayList<>(); // Map m1 = new HashMap<>(); // m1.put("LB_NAME", "本院分娩"); @@ -792,7 +795,7 @@ public class BabyStatisticsManagerFacade { // jdbc查oracle ExceptionUtils.catchException("babyStatisticsManagerSelfConversionList: " + sql); - List> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@127.0.0.1:1521:orcl", "LYMS_ODS", "Welcome1", sql); + List> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@"+area_count_id+":orcl", "LYMS_ODS", "Welcome1", sql); Collections.sort(list, new Comparator>() { @Override diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/JdbcUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/JdbcUtil.java index bfd42af..bd0657f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/JdbcUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/JdbcUtil.java @@ -1,5 +1,7 @@ package com.lyms.platform.operate.web.utils; +import com.lyms.platform.common.utils.PropertiesUtils; + import java.sql.*; import java.util.ArrayList; import java.util.HashMap; @@ -10,11 +12,14 @@ import java.util.Map; * Created by Administrator on 2016/9/29. */ public class JdbcUtil { + + static String area_count_id = PropertiesUtils.getPropertyValue("area_count_id"); + public static Connection getOracleConnection() { Connection con = null; try { Class.forName("oracle.jdbc.driver.OracleDriver"); - String url = "jdbc:oracle:thin:@192.168.1.32:1521:orcl"; + String url = "jdbc:oracle:thin:@"+area_count_id+":orcl"; String userName = "LYMS_ODS"; String pwd = "Welcome1"; con = DriverManager.getConnection(url, userName, pwd); diff --git a/platform-operate-api/src/main/resources/config.properties b/platform-operate-api/src/main/resources/config.properties index ed29d54..6176c8a 100644 --- a/platform-operate-api/src/main/resources/config.properties +++ b/platform-operate-api/src/main/resources/config.properties @@ -24,4 +24,8 @@ nio_client_start=2 postser_url=http://devmmsapi.qinhuangdao.healthbaby.com.cn:18019/initdata/reser +#区域统计地址 +area_count_url=192.168.1.32 + +