From 2863a68e336bd9b2d187e98557bdc7cc6b9aac2e Mon Sep 17 00:00:00 2001 From: zjh <zjh@888> Date: 星期四, 27 六月 2024 10:21:49 +0800 Subject: [PATCH] zjh 本地 2024/06/27 --1 --- ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java | 10 +- ltkj-admin/src/test/java/zjhTest.java | 43 ++++++++-- ltkj-admin/src/test/java/ConfigHandler.java | 84 +++++++++++++++++++++ ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 34 ++++++++ ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java | 52 ++++++------- ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinimpapplyDto.java | 9 +- 6 files changed, 186 insertions(+), 46 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java index 178c84e..6e5df2b 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java @@ -114,16 +114,16 @@ map.put("jbbm",dto.getJbbm()); map.put("jbbm1",dto.getJbbm1()); map.put("jbbm2",dto.getJbbm2()); - map.put("tw",dto.getTw()); - map.put("mb",dto.getMb()); - map.put("hx",dto.getHx()); - map.put("bp",dto.getBp()); +// map.put("tw",dto.getTw()); +// map.put("mb",dto.getMb()); +// map.put("hx",dto.getHx()); +// map.put("bp",dto.getBp()); map.put("fzbz",dto.getFzbz()); map.put("hzqx",dto.getHzqx()); map.put("sfqc",dto.getSfqc()); map.put("qchs",dto.getQchs()); map.put("sfqj",dto.getSfqj()); - map.put("ckrq",dto.getCkrq()); + map.put("jzqk",dto.getJzqk()); String post = HttpClientUtils.sendPost(HIS_URL, map); return AjaxResult.success(post); } diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java index c018167..f3c65df 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java @@ -122,34 +122,30 @@ // @ApiOperation(value = "鏂板/淇敼闂ㄨ瘖璇婃柇") public AjaxResult Outpinimpapply (OutpinimpapplyDto dto) { - Map<String, Object> map = new HashMap<> (); - map.put ("his_registration_id", dto.getHisRegistrationId ()); - map.put ("mzzdid", dto.getMzzdid ()); - map.put ("sqysbm", dto.getSqysbm ()); - map.put ("mzksbm", dto.getMzksbm ()); - map.put ("fbrq", dto.getFbrq ()); - map.put ("zdrq", dto.getZdrq ()); - map.put ("czybm", dto.getCzybm ()); - map.put ("czyksbm", dto.getCzyksbm ()); - map.put ("zs", dto.getZs ()); - map.put ("bs", dto.getBs ()); - map.put ("clyz", dto.getClyz ()); - map.put ("jws", dto.getJws ()); - map.put ("tgjc", dto.getTgjc ()); - map.put ("gms", dto.getGms ()); - map.put ("jbbm", dto.getJbbm ()); - map.put ("jbbm1", dto.getJbbm1 ()); - map.put ("jbbm2", dto.getJbbm2 ()); - map.put ("tw", dto.getTw ()); - map.put ("mb", dto.getMb ()); - map.put ("hx", dto.getHx ()); - map.put ("bp", dto.getBp ()); - map.put ("fzbz", dto.getFzbz ()); - map.put ("hzqx", dto.getHzqx ()); - map.put ("sfqc", dto.getSfqc ()); - map.put ("qchs", dto.getQchs ()); - map.put ("sfqj", dto.getSfqj ()); - map.put ("ckrq", dto.getCkrq ()); + Map<String, Object> map = new HashMap<>(); + map.put("his_registration_id",dto.getHisRegistrationId()); + map.put("mzzdid",dto.getMzzdid()); + map.put("sqysbm",dto.getSqysbm()); + map.put("mzksbm",dto.getMzksbm()); + map.put("fbrq",dto.getFbrq()); + map.put("zdrq",dto.getZdrq()); + map.put("czybm",dto.getCzybm()); + map.put("czyksbm",dto.getCzyksbm()); + map.put("zs",dto.getZs()); + map.put("bs",dto.getBs()); + map.put("clyz",dto.getClyz()); + map.put("jws",dto.getJws()); + map.put("tgjc",dto.getTgjc()); + map.put("gms",dto.getGms()); + map.put("jbbm",dto.getJbbm()); + map.put("jbbm1",dto.getJbbm1()); + map.put("jbbm2",dto.getJbbm2()); + map.put("fzbz",dto.getFzbz()); + map.put("hzqx",dto.getHzqx()); + map.put("sfqc",dto.getSfqc()); + map.put("qchs",dto.getQchs()); + map.put("sfqj",dto.getSfqj()); + map.put("jzqk",dto.getJzqk()); String post = HttpClientUtils.sendPost (HIS_URL+"Outpinimpapply", map); return AjaxResult.success ().put ("data", post); } diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java index b38be14..5c07cb4 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java @@ -46,6 +46,7 @@ import com.ltkj.framework.datasource.DynamicDataSourceContextHolder; import com.ltkj.hosp.domain.*; import com.ltkj.hosp.dto.QianDaoDto; +import com.ltkj.hosp.hisDto.OutpinimpapplyDto; import com.ltkj.hosp.mapper.TestMapper; import com.ltkj.hosp.service.*; import com.ltkj.hosp.sqlDomain.LtkjMiddleDetail; @@ -66,6 +67,7 @@ import com.ltkj.system.service.ISysUserService; import com.ltkj.web.controller.his.HisApiGetMethodService; import com.ltkj.web.controller.his.HisApiMethod; +import com.ltkj.web.controller.his.HisApiMethodService; import com.ltkj.web.controller.his.HisMzJysqController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -188,7 +190,8 @@ private HisApiGetMethodService hisApiGetMethodService; @Autowired private ISysDeptService sysDeptService; - + @Autowired + private HisApiMethodService controller; /** * 鏌ヨ浣撴璁板綍鍒楄〃 @@ -1855,6 +1858,35 @@ TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId()); customer.setCardId("0"); tjCustomerService.updateById(customer); + String config = configService.selectConfigByKey("sfkqdyhis"); + if(null !=config && config.equals("Y")){ + final String date = DateUtil.format(tjOrder.getCreateTime(), "yyyy-MM-dd HH:mm:ss"); + OutpinimpapplyDto dto=new OutpinimpapplyDto(); + dto.setHisRegistrationId(tjOrder.getCardId()); + dto.setMzzdid(1); + dto.setSqysbm("00029"); + dto.setMzksbm("0101"); + dto.setFbrq(date); + dto.setZdrq(date); + dto.setCzybm("00029"); + dto.setCzyksbm("0101"); + dto.setZs("鍋ュ悍鏌ヤ綋"); + dto.setBs("涓嶈"); + dto.setClyz(""); + dto.setJws(""); + dto.setTgjc(""); + dto.setGms(""); + dto.setJbbm("Z00.001"); + dto.setJbbm1(""); + dto.setJbbm2(""); + dto.setFzbz("1"); + dto.setHzqx("6"); + dto.setSfqc("0"); + dto.setQchs(""); + dto.setSfqj("0"); + dto.setJzqk(9); + controller.Outpinimpapply(dto); + } return AjaxResult.success("绛剧鎴愬姛锛�"); } else { diff --git a/ltkj-admin/src/test/java/ConfigHandler.java b/ltkj-admin/src/test/java/ConfigHandler.java new file mode 100644 index 0000000..df9909a --- /dev/null +++ b/ltkj-admin/src/test/java/ConfigHandler.java @@ -0,0 +1,84 @@ +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.util.Properties; + +public class ConfigHandler { + + private static final String DB_PROPERTIES_FILE = "D:\\ltkjprojectconf\\config.properties"; + private static final String DB_URL_KEY = "ip"; + private static final String DB_PROT_KEY = "prot"; + private static final String DB_NAME_KEY = "name"; + private static final String DB_USER_KEY = "username"; + private static final String DB_PASSWORD_KEY = "password"; + private Connection connection; + private Connection connectToDatabase(Properties props) throws SQLException { + String dbUrl = "jdbc:mysql://"+props.getProperty("ip")+":"+props.getProperty("prot")+"/"+props.getProperty("name")+"" + + "?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8"; + String dbUser = props.getProperty(DB_USER_KEY); + String dbPassword = props.getProperty(DB_PASSWORD_KEY); + // 鍔犺浇MySQL椹卞姩 + try { + Class.forName("com.mysql.cj.jdbc.Driver"); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + if (connection == null || connection.isClosed()) { + // 鍏抽棴鏃х殑杩炴帴 + if (connection != null) { + try { + connection.close(); + } catch (SQLException e) { + e.printStackTrace(); + } + } + // 鍒涘缓鏂扮殑鏁版嵁搴撹繛鎺� +// connection = DriverManager.getConnection(connectionString, username, password); + } + return DriverManager.getConnection(dbUrl, dbUser, dbPassword); + } + + public void modifyConfigAndRefreshDB(String newDbUrl,String prot,String name, String newDbUser, String newDbPassword) throws IOException, SQLException { + Properties properties = new Properties(); + properties.load(new FileInputStream(DB_PROPERTIES_FILE)); + + // 淇敼閰嶇疆 + properties.setProperty(DB_URL_KEY, newDbUrl); + properties.setProperty(DB_PROT_KEY, prot); + properties.setProperty(DB_NAME_KEY, name); + properties.setProperty(DB_USER_KEY, newDbUser); + properties.setProperty(DB_PASSWORD_KEY, newDbPassword); + + // 鏇存柊閰嶇疆鏂囦欢 + properties.store(new FileOutputStream(DB_PROPERTIES_FILE), null); + + // 鍏抽棴鏃х殑鏁版嵁搴撹繛鎺ワ紝骞跺缓绔嬫柊鐨勮繛鎺� + Connection connection = connectToDatabase(properties); + // ... 浣跨敤鏂扮殑connection杩涜鏁版嵁搴撴搷浣� ... + + // 纭繚鍏抽棴鏁版嵁搴撹繛鎺� + if (connection != null && !connection.isClosed()) { + connection.close(); + } + } + + public static void main(String[] args) { + ConfigHandler configHandler = new ConfigHandler(); + try { + // 鍋囪鏂扮殑鏁版嵁搴撹繛鎺ヤ俊鎭� + String newDbUrl = "192.168.0.5"; + String prot = "3306"; + String name = "ltkjpeis1"; + String newDbUser = "root"; + String newDbPassword = "root"; + + configHandler.modifyConfigAndRefreshDB(newDbUrl,prot,name,newDbUser, newDbPassword); + System.out.println("鏁版嵁搴撻厤缃凡鏇存柊骞朵笖鏁版嵁搴撹繛鎺ュ凡鍒锋柊銆�"); + } catch (IOException | SQLException e) { + e.printStackTrace(); + } + } +} \ No newline at end of file diff --git a/ltkj-admin/src/test/java/zjhTest.java b/ltkj-admin/src/test/java/zjhTest.java index 845975f..8d4ac01 100644 --- a/ltkj-admin/src/test/java/zjhTest.java +++ b/ltkj-admin/src/test/java/zjhTest.java @@ -9,6 +9,7 @@ import com.ltkj.LtkjApplication; import com.ltkj.common.core.redis.RedisCache; import com.ltkj.common.utils.SecurityUtils; +import com.ltkj.framework.config.MatchUtils; import com.ltkj.hosp.domain.DictHosp; import com.ltkj.hosp.domain.TjCustomer; import com.ltkj.hosp.domain.TjPackage; @@ -34,6 +35,9 @@ import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -41,6 +45,7 @@ import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; +import java.util.Properties; /** * @Author: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃/璧典匠璞� @@ -112,17 +117,39 @@ } - public static void main(String[] args) { - try { - forwardUrl("192.168.0.5","www.baidu.com"); - } catch (Exception e) { - e.printStackTrace(); + + + public static void main(String[] args) { + // 鍒濆鏁版嵁搴撻厤缃� + String initialUrl = "jdbc:mysql://initial_host:3306/initial_db"; + String username = "user"; + String password = "pass"; + + // 鏂版暟鎹簱閰嶇疆 + String newUrl = "jdbc:mysql://new_host:3306/new_db"; + + // 鏇存敼杩炴帴URL + String urlToUse = initialUrl; // 鍙互鏍规嵁闇�瑕佸垏鎹㈠埌newUrl + + // 鍒涘缓鏁版嵁搴撹繛鎺ュ睘鎬� + Properties props = new Properties(); + props.setProperty("user", username); + props.setProperty("password", password); + + try { + // 杩炴帴鍒版暟鎹簱 + Connection conn = DriverManager.getConnection(urlToUse, props); + + // 浣跨敤conn杩涜鏁版嵁搴撴搷浣�... + + // 鍏抽棴杩炴帴 + conn.close(); + } catch (SQLException e) { + e.printStackTrace(); + } } - - } - diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinimpapplyDto.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinimpapplyDto.java index 1580bef..e7a9ab1 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinimpapplyDto.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinimpapplyDto.java @@ -11,10 +11,10 @@ private Integer mzzdid; private String sqysbm; private String mzksbm; - @JsonFormat(pattern = "yyyy-mm-dd hh:mm:ss") - private Date fbrq; - @JsonFormat(pattern = "yyyy-mm-dd hh:mm:ss") - private Date zdrq; +// @JsonFormat(pattern = "yyyy-mm-dd hh:mm:ss") + private String fbrq; +// @JsonFormat(pattern = "yyyy-mm-dd hh:mm:ss") + private String zdrq; private String czybm; private String czyksbm; private String zs; @@ -37,4 +37,5 @@ private String sfqj; @JsonFormat(pattern = "yyyy-mm-dd hh:mm:ss") private Date ckrq; + private Integer jzqk; } -- Gitblit v1.8.0