diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java index 4b006fa..bd9269a 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java @@ -335,7 +335,7 @@ public class MongoSyncService { classList.add(SieveResultModel.class); classList.add(StopPregModel.class); try { - Mongo mongo = new Mongo("111.206.6.150", 10001); + Mongo mongo = new Mongo("118.193.124.187", 10001); MongoTemplate template = new MongoTemplate(mongo, "sync-platform-data"); template.getDb().authenticate("platform", "platform123".toCharArray()); Query query = null; diff --git a/platform-biz-patient-service/src/main/resources/database.properties b/platform-biz-patient-service/src/main/resources/database.properties index 6a57d96..2ccd4ea 100644 --- a/platform-biz-patient-service/src/main/resources/database.properties +++ b/platform-biz-patient-service/src/main/resources/database.properties @@ -1,4 +1,4 @@ -mongo.db.host=111.206.6.150 +mongo.db.host=118.193.124.187 mongo.db.port=10001 mongo.db.dbname=platform mongo.db.username=platform diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/util/JDBCUtil.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/util/JDBCUtil.java index 9f31aee..a995fb4 100644 --- a/platform-job-index/src/main/java/com/lyms/platform/job/index/util/JDBCUtil.java +++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/util/JDBCUtil.java @@ -29,7 +29,7 @@ public class JDBCUtil { Connection con = null; try { Class.forName("com.mysql.jdbc.Driver"); - String url = "jdbc:mysql://111.206.6.150:3306/center?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8"; + String url = "jdbc:mysql://118.193.124.187:3306/center?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8"; String userName = "center"; String pwd = "lyms2015"; con = DriverManager.getConnection(url, userName, pwd); diff --git a/platform-job-index/src/main/resources/spring/spring-mongodb.xml b/platform-job-index/src/main/resources/spring/spring-mongodb.xml index bd402ef..052d4d7 100644 --- a/platform-job-index/src/main/resources/spring/spring-mongodb.xml +++ b/platform-job-index/src/main/resources/spring/spring-mongodb.xml @@ -21,7 +21,7 @@ - + diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/JDBCUtil.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/JDBCUtil.java index a38be9a..9ad0ac2 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/JDBCUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/JDBCUtil.java @@ -16,7 +16,7 @@ public class JDBCUtil { static String oracle_url = "jdbc:oracle:thin:@172.16.7.250:1521:prmi"; static String oracle_name = "LYMS_HENGSHUI_ZHENGSHI"; static String oracle_pwd = "lyms2018"; -// static String oracle_url = "jdbc:oracle:thin:@111.206.6.150:1522:orcl"; +// static String oracle_url = "jdbc:oracle:thin:@118.193.124.187:1522:orcl"; // static String oracle_name = "LYMS_ODS"; // static String oracle_pwd = "Welcome1"; diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/ConnTools.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/ConnTools.java index d1105d9..238edb6 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/ConnTools.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/ConnTools.java @@ -14,7 +14,7 @@ public class ConnTools { private static String hisPassword = "LYMS_123"; // private static String hisDirverClassName = "com.mysql.jdbc.Driver"; -// private static String hisUrl = "jdbc:mysql://111.206.6.150:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8"; +// private static String hisUrl = "jdbc:mysql://118.193.124.187:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8"; // private static String hisUser = "platform"; // private static String hisPassword = "platform123"; diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcfy/ConnTools.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcfy/ConnTools.java index d49c2b3..3cbc34c 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcfy/ConnTools.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcfy/ConnTools.java @@ -18,7 +18,7 @@ public class ConnTools { //测试 private static String cslisDirverClassName = "com.mysql.jdbc.Driver"; - private static String cslisUrl = "jdbc:mysql://111.206.6.150:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8"; + private static String cslisUrl = "jdbc:mysql://118.193.124.187:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8"; private static String cslisUser = "platform"; private static String cslisPassword = "platform123"; diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/ConnTools.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/ConnTools.java index 1d1e178..a6026a3 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/ConnTools.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/ConnTools.java @@ -49,7 +49,7 @@ public class ConnTools { private static String cslDirverClassName = "com.mysql.jdbc.Driver"; - private static String cslUrl = "jdbc:mysql://111.206.6.150:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8"; + private static String cslUrl = "jdbc:mysql://118.193.124.187:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8"; private static String cslUser = "platform"; private static String cslPassword = "platform123"; diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/JDBCUtil.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/JDBCUtil.java index 1b58fca..e90b15d 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/JDBCUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/JDBCUtil.java @@ -16,7 +16,7 @@ public class JDBCUtil { static String oracle_url = "jdbc:oracle:thin:@168.254.0.159:1521:prmi"; static String oracle_name = "LYMS_QHD_ORG"; static String oracle_pwd = "LYMS_QHD_ORG"; -// static String oracle_url = "jdbc:oracle:thin:@111.206.6.150:1522:orcl"; +// static String oracle_url = "jdbc:oracle:thin:@118.193.124.187:1522:orcl"; // static String oracle_name = "LYMS_ODS"; // static String oracle_pwd = "Welcome1"; diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/ConnTools.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/ConnTools.java index 4e02d7e..6af7898 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/ConnTools.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/ConnTools.java @@ -11,7 +11,7 @@ public class ConnTools { //测试环境 private static String dirverClassName = "com.mysql.jdbc.Driver"; - private static String url = "jdbc:mysql://111.206.6.150:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8"; + private static String url = "jdbc:mysql://118.193.124.187:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8"; private static String user = "platform"; private static String password = "platform123"; diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ConnTools.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ConnTools.java index 0684e71..885b09c 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ConnTools.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ConnTools.java @@ -24,7 +24,7 @@ public class ConnTools { private static String fmPassword = "lyms123"; private static String csczDirverClassName = "com.mysql.jdbc.Driver"; - private static String csczUrl = "jdbc:mysql://111.206.6.150:3306/platform?useUnicode=true&characterEncoding=utf8"; + private static String csczUrl = "jdbc:mysql://118.193.124.187:3306/platform?useUnicode=true&characterEncoding=utf8"; private static String csczUser = "platform"; private static String csczPassword = "platform123"; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LivelihoodProjectsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LivelihoodProjectsController.java index 44d3446..cc529bd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LivelihoodProjectsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LivelihoodProjectsController.java @@ -123,4 +123,12 @@ public class LivelihoodProjectsController extends BaseController { @RequestParam(required = false) String endDate) { return livelihoodProjectsFacade.getMsgcC401(startDate,endDate); } + + + @RequestMapping(value = "/getDef", method = RequestMethod.GET) + @ResponseBody + public void getDef(HttpServletResponse httpServletResponse + ) { + livelihoodProjectsFacade.getDef(httpServletResponse); + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java index fff53bc..674fcf2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java @@ -111,7 +111,7 @@ public class BasicConfigFacade { List mainBasicConfigList = new ArrayList<>(); try { - Mongo mongo = new Mongo("111.206.6.150", 10001); + Mongo mongo = new Mongo("118.193.124.187", 10001); UserCredentials credentials = new UserCredentials("platform", "platform123"); MongoTemplate mongoTemplate = new MongoTemplate(mongo, "sync-platform-data", credentials); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java index 4dc242c..e7f72a5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java @@ -10,10 +10,7 @@ import com.lyms.platform.common.enums.CdGwNationEnums; import com.lyms.platform.common.enums.CdGwPcountryEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; -import com.lyms.platform.common.utils.DateUtil; -import com.lyms.platform.common.utils.JsonUtil; -import com.lyms.platform.common.utils.PropertiesUtils; -import com.lyms.platform.common.utils.SystemConfig; +import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.result.BasicConfigResult; import com.lyms.platform.operate.web.result.MsgcResult; import com.lyms.platform.operate.web.utils.CollectionUtils; @@ -37,6 +34,8 @@ import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Component; +import javax.servlet.http.HttpServletResponse; +import java.io.*; import java.util.*; /** @@ -1235,13 +1234,18 @@ public class LivelihoodProjectsFacade { public Map getC201Patient(String id) { Patients patients = patientsService.findOnePatientById(id); try{ - if ("4".equals(HIS_VERSION)) + if (patients.getDueStatus() == null || patients.getDueStatus() == 1) + { + return null; + } + + if ("4".equals(HIS_VERSION)) + { + if (!("2".equals(patients.getCityId()) || (patients.isSendCoupon() != null && patients.isSendCoupon()))) { - if (!("2".equals(patients.getCityId()) )) - { - return null; - } + return null; } + } Map map = new HashMap<>(); //id map.put("id",StringUtils.isNotEmpty(patients.getId())?patients.getId():"/"); @@ -1903,4 +1907,83 @@ public class LivelihoodProjectsFacade { return objectResponse; } + public List readTxt(String path) { + List CARDS = new ArrayList<>(); + File file = new File(path); + String s = ""; + InputStreamReader in = null; + BufferedReader br = null; + try { + in = new InputStreamReader(new FileInputStream(file),"UTF-8"); + br = new BufferedReader(in); + while ((s=br.readLine()) != null){ + CARDS.add(s); + } + } + catch (Exception e) + { + try { + if(br != null) + { + br.close(); + } + if(in != null) + { + in.close(); + } + } catch (IOException e1) { + e1.printStackTrace(); + } + } + return CARDS; + } + + public void getDef(HttpServletResponse httpServletResponse) { + List list = readTxt("/data/card.txt"); + System.out.println(list.size()); + List> datas = new ArrayList<>(); + for (String card : list){ + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setExtEnable(false); + patientsQuery.setBuildTypeNot(1); + patientsQuery.setCardNo(card); + patientsQuery.setType(3);//产妇 + List patientsList = patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isNotEmpty(patientsList)){ + Patients patients = patientsList.get(0); + if(StringUtils.isNotEmpty(patients.getSource())) + { + patients = patientsService.findOnePatientById(patients.getSource()); + } + if (patients != null){ + System.out.println(card); + Map data = new HashMap<>(); + data.put("name",patients.getUsername()); + data.put("cardNo",patients.getCardNo()); + data.put("phone",patients.getPhone()); + data.put("isSend",(patients.isSendCoupon() != null && patients.isSendCoupon()) ? "已发放" : "未发放"); + data.put("residence",CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), + patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService)); + datas.add(data); + } + } + } + try { + OutputStream out = httpServletResponse.getOutputStream(); + Map cnames = new LinkedHashMap <>(); + cnames.put("name", "姓名"); + cnames.put("phone", "手机号码"); + cnames.put("cardNo", "身份证号码"); + cnames.put("isSend", "是否发放优惠券"); + cnames.put("residence", "户籍地"); + httpServletResponse.setContentType("application/octet-stream"); + httpServletResponse.setCharacterEncoding("UTF-8"); + httpServletResponse.setHeader("Content-Disposition", "attachment;fileName=" + "data.xls"); + ExcelUtil.toExcel(out, datas, cnames); + } catch (IOException e) { + e.printStackTrace(); + } + + } } 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 6be4503..dbfd3cf 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 @@ -45,7 +45,7 @@ public class JdbcUtil { Connection con = null; try { Class.forName("com.mysql.jdbc.Driver"); - String url = "jdbc:mysql://111.206.6.150:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8"; + String url = "jdbc:mysql://118.193.124.187:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8"; String userName = "platform"; String pwd = "platform123"; con = DriverManager.getConnection(url, userName, pwd); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/LpJdbcUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/LpJdbcUtil.java index 2145ada..655fe33 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/LpJdbcUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/LpJdbcUtil.java @@ -19,7 +19,7 @@ public class LpJdbcUtil { Connection con = null; try { Class.forName("com.mysql.jdbc.Driver"); - String url = "jdbc:mysql://111.206.6.150:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8"; + String url = "jdbc:mysql://118.193.124.187:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8"; String userName = "platform"; String pwd = "platform123"; con = DriverManager.getConnection(url, userName, pwd); diff --git a/platform-operate-api/src/main/resources/database.properties b/platform-operate-api/src/main/resources/database.properties index 3844751..983425e 100644 --- a/platform-operate-api/src/main/resources/database.properties +++ b/platform-operate-api/src/main/resources/database.properties @@ -19,7 +19,7 @@ mongo.slaveOk=${mongo.slaveOk} server.startup=2 mysql.slave.driver=com.mysql.jdbc.Driver -mysql.slave.jdbcurl=jdbc:mysql://111.206.6.150:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 +mysql.slave.jdbcurl=jdbc:mysql://118.193.124.187:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 mysql.slave.db.name=platform mysql.slave.db.password=platform123 diff --git a/platform-resource/resources/config-dev.properties b/platform-resource/resources/config-dev.properties index 272fe1c..0c74774 100644 --- a/platform-resource/resources/config-dev.properties +++ b/platform-resource/resources/config-dev.properties @@ -1,4 +1,4 @@ -mongo.db.host=111.206.6.150 +mongo.db.host=118.193.124.187 mongo.db.port=10001 mongo.db.dbname=platform @@ -17,7 +17,7 @@ mongo.socketKeepAlive=true mysql.db.name=platform mysql.db.password=platform123 mysql.driver=com.mysql.jdbc.Driver -mysql.jdbcurl=jdbc:mysql://111.206.6.150:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 +mysql.jdbcurl=jdbc:mysql://118.193.124.187:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 mysql.maxpoolsize=5 mysql.initialpoolsize=2