jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 5640ec331b75f54073b777eb4578a0f7fc519a71

Authored by jiangjiazhi
2 parents f7042c44c1 dd5c0e89ee
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 6 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyStatisticsManagerController.java View file @ 5640ec3
... ... @@ -35,7 +35,7 @@
35 35 @Autowired
36 36 private BabyStatisticsManagerFacade babyStatisticsManagerFacade;
37 37  
38   - public static final String area_count_id = PropertiesUtils.getPropertyValue("area_count_id");
  38 + public static final String area_count_url = PropertiesUtils.getPropertyValue("area_count_url");
39 39  
40 40 /**
41 41 * @auther HuJiaqi
... ... @@ -374,7 +374,7 @@
374 374 // jdbc查oracle
375 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);
376 376 ExceptionUtils.catchException("babyStatisticsManagerSelfConversionList: " + sql);
377   - List<Map<String, Object>> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@"+area_count_id+":orcl", "LYMS_ODS", "Welcome1", sql);
  377 + List<Map<String, Object>> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@"+area_count_url+":orcl", "LYMS_ODS", "Welcome1", sql);
378 378 // List<Map<String, Object>> list = new ArrayList<>();
379 379 // Map<String, Object> m1 = new HashMap<>();
380 380 // m1.put("1", "1");
... ... @@ -445,7 +445,7 @@
445 445 // jdbc查oracle
446 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);
447 447 ExceptionUtils.catchException("babyStatisticsManagerBuildSourceList: " + sql);
448   - List<Map<String, Object>> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@"+area_count_id+":orcl", "LYMS_ODS", "Welcome1", sql);
  448 + List<Map<String, Object>> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@"+area_count_url+":orcl", "LYMS_ODS", "Welcome1", sql);
449 449 // List<Map<String, Object>> list = new ArrayList<>();
450 450 // Map<String, Object> m1 = new HashMap<>();
451 451 // m1.put("1", "1");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java View file @ 5640ec3
... ... @@ -38,7 +38,6 @@
38 38 @ResponseBody
39 39 public BaseResponse saveLisData(@RequestParam("lisData") String lisData,
40 40 HttpServletRequest httpServletRequest) {
41   - System.out.println("LisController==="+lisData);
42 41 return lisService.saveLisData(lisData);
43 42 }
44 43  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java View file @ 5640ec3
... ... @@ -68,12 +68,12 @@
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 + String area_count_url = PropertiesUtils.getPropertyValue("area_count_url");
72 72 if ("4".equals(version))
73 73 {
74 74 //秦皇岛
75 75 DRIVER = "oracle.jdbc.driver.OracleDriver";
76   - JDBC = "jdbc:oracle:thin:@"+area_count_id+":orcl";
  76 + JDBC = "jdbc:oracle:thin:@"+area_count_url+":orcl";
77 77 NAME = "LYMS_ODS";
78 78 PWD = "Welcome1";
79 79 }
... ... @@ -81,7 +81,7 @@
81 81 {
82 82 //德州
83 83 DRIVER = "oracle.jdbc.driver.OracleDriver";
84   - JDBC = "jdbc:oracle:thin:@"+area_count_id+":orcl";
  84 + JDBC = "jdbc:oracle:thin:@"+area_count_url+":orcl";
85 85 NAME = "LYMS_ODS";
86 86 PWD = "Welcome1";
87 87 }
... ... @@ -89,7 +89,7 @@
89 89 {
90 90 //线上
91 91 DRIVER = "oracle.jdbc.driver.OracleDriver";
92   - JDBC = "jdbc:oracle:thin:@"+area_count_id+":orcl";
  92 + JDBC = "jdbc:oracle:thin:@"+area_count_url+":orcl";
93 93 NAME = "LYMS_ODS";
94 94 PWD = "Welcome1";
95 95 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java View file @ 5640ec3
... ... @@ -34,7 +34,7 @@
34 34 @Component
35 35 public class BabyStatisticsManagerFacade {
36 36  
37   - public static final String area_count_id = PropertiesUtils.getPropertyValue("area_count_id");
  37 + public static final String area_count_url = PropertiesUtils.getPropertyValue("area_count_url");
38 38  
39 39 @Autowired
40 40 private BabyService babyService;
... ... @@ -639,7 +639,7 @@
639 639 "END)";
640 640 // jdbc查oracle
641 641 ExceptionUtils.catchException("babyStatisticsManagerBuildSourceList: " + sql);
642   - List<Map<String, Object>> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@"+area_count_id+":orcl", "LYMS_ODS", "Welcome1", sql);
  642 + List<Map<String, Object>> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@"+area_count_url+":orcl", "LYMS_ODS", "Welcome1", sql);
643 643 // List<Map<String, Object>> list = new ArrayList<>();
644 644 // Map<String, Object> m1 = new HashMap<>();
645 645 // m1.put("LB_NAME", "本院分娩");
... ... @@ -795,7 +795,7 @@
795 795  
796 796 // jdbc查oracle
797 797 ExceptionUtils.catchException("babyStatisticsManagerSelfConversionList: " + sql);
798   - List<Map<String, Object>> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@"+area_count_id+":orcl", "LYMS_ODS", "Welcome1", sql);
  798 + List<Map<String, Object>> list = JdbcUtil.getOracleListDataBySql("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@"+area_count_url+":orcl", "LYMS_ODS", "Welcome1", sql);
799 799  
800 800 Collections.sort(list, new Comparator<Map<String, Object>>() {
801 801 @Override
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/JdbcUtil.java View file @ 5640ec3
... ... @@ -13,13 +13,13 @@
13 13 */
14 14 public class JdbcUtil {
15 15  
16   - static String area_count_id = PropertiesUtils.getPropertyValue("area_count_id");
  16 + static String area_count_url = PropertiesUtils.getPropertyValue("area_count_url");
17 17  
18 18 public static Connection getOracleConnection() {
19 19 Connection con = null;
20 20 try {
21 21 Class.forName("oracle.jdbc.driver.OracleDriver");
22   - String url = "jdbc:oracle:thin:@"+area_count_id+":orcl";
  22 + String url = "jdbc:oracle:thin:@"+area_count_url+":orcl";
23 23 String userName = "LYMS_ODS";
24 24 String pwd = "Welcome1";
25 25 con = DriverManager.getConnection(url, userName, pwd);
platform-operate-api/src/main/resources/config.properties View file @ 5640ec3
... ... @@ -25,5 +25,5 @@
25 25  
26 26  
27 27 #区域统计地址
28   -area_count_url=192.168.1.32
  28 +area_count_url=119.90.57.26:1522