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 d0c0124..89c156a 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 @@ -35,7 +35,7 @@ public class BabyStatisticsManagerController extends BaseController { @Autowired private BabyStatisticsManagerFacade babyStatisticsManagerFacade; - public static final String area_count_id = PropertiesUtils.getPropertyValue("area_count_id"); + public static final String area_count_url = PropertiesUtils.getPropertyValue("area_count_url"); /** * @auther HuJiaqi @@ -374,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:@"+area_count_id+":orcl", "LYMS_ODS", "Welcome1", sql); + List> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@"+area_count_url+":orcl", "LYMS_ODS", "Welcome1", sql); // List> list = new ArrayList<>(); // Map m1 = new HashMap<>(); // m1.put("1", "1"); @@ -445,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:@"+area_count_id+":orcl", "LYMS_ODS", "Welcome1", sql); + List> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@"+area_count_url+":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/controller/LisController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java index 2219c31..58e1f04 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java @@ -38,7 +38,6 @@ public class LisController extends BaseController { @ResponseBody public BaseResponse saveLisData(@RequestParam("lisData") String lisData, HttpServletRequest httpServletRequest) { - System.out.println("LisController==="+lisData); return lisService.saveLisData(lisData); } 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 dbc81cb..1b13741 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,12 +68,12 @@ public class AreaCountFacade { node_map.put(4, "37~ 分娩"); String version = PropertiesUtils.getPropertyValue("his_version"); - String area_count_id = PropertiesUtils.getPropertyValue("area_count_id"); + String area_count_url = PropertiesUtils.getPropertyValue("area_count_url"); if ("4".equals(version)) { //秦皇岛 DRIVER = "oracle.jdbc.driver.OracleDriver"; - JDBC = "jdbc:oracle:thin:@"+area_count_id+":orcl"; + JDBC = "jdbc:oracle:thin:@"+area_count_url+":orcl"; NAME = "LYMS_ODS"; PWD = "Welcome1"; } @@ -81,7 +81,7 @@ public class AreaCountFacade { { //德州 DRIVER = "oracle.jdbc.driver.OracleDriver"; - JDBC = "jdbc:oracle:thin:@"+area_count_id+":orcl"; + JDBC = "jdbc:oracle:thin:@"+area_count_url+":orcl"; NAME = "LYMS_ODS"; PWD = "Welcome1"; } @@ -89,7 +89,7 @@ public class AreaCountFacade { { //线上 DRIVER = "oracle.jdbc.driver.OracleDriver"; - JDBC = "jdbc:oracle:thin:@"+area_count_id+":orcl"; + JDBC = "jdbc:oracle:thin:@"+area_count_url+":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 5aa3bef..50e2f59 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 @@ -34,7 +34,7 @@ import java.util.*; @Component public class BabyStatisticsManagerFacade { - public static final String area_count_id = PropertiesUtils.getPropertyValue("area_count_id"); + public static final String area_count_url = PropertiesUtils.getPropertyValue("area_count_url"); @Autowired private BabyService babyService; @@ -639,7 +639,7 @@ public class BabyStatisticsManagerFacade { "END)"; // jdbc查oracle ExceptionUtils.catchException("babyStatisticsManagerBuildSourceList: " + sql); - List> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@"+area_count_id+":orcl", "LYMS_ODS", "Welcome1", sql); + List> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@"+area_count_url+":orcl", "LYMS_ODS", "Welcome1", sql); // List> list = new ArrayList<>(); // Map m1 = new HashMap<>(); // m1.put("LB_NAME", "本院分娩"); @@ -795,7 +795,7 @@ public class BabyStatisticsManagerFacade { // jdbc查oracle ExceptionUtils.catchException("babyStatisticsManagerSelfConversionList: " + sql); - List> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@"+area_count_id+":orcl", "LYMS_ODS", "Welcome1", sql); + List> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@"+area_count_url+":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 bd0657f..da52fdd 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 @@ -13,13 +13,13 @@ import java.util.Map; */ public class JdbcUtil { - static String area_count_id = PropertiesUtils.getPropertyValue("area_count_id"); + static String area_count_url = PropertiesUtils.getPropertyValue("area_count_url"); public static Connection getOracleConnection() { Connection con = null; try { Class.forName("oracle.jdbc.driver.OracleDriver"); - String url = "jdbc:oracle:thin:@"+area_count_id+":orcl"; + String url = "jdbc:oracle:thin:@"+area_count_url+":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 8f4020e..545d03a 100644 --- a/platform-operate-api/src/main/resources/config.properties +++ b/platform-operate-api/src/main/resources/config.properties @@ -25,7 +25,7 @@ postser_url=http://devmmsapi.qinhuangdao.healthbaby.com.cn:18019/initdata/reser #区域统计地址 -area_count_url=192.168.1.32 +area_count_url=119.90.57.26:1522