Commit 522e3e41b3e95fa2f2ffe4352613829312222862
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 3 changed files
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java
View file @
522e3e4
| ... | ... | @@ -207,7 +207,7 @@ |
| 207 | 207 | for (PatientCourseModel model : patientCourseModels) |
| 208 | 208 | { |
| 209 | 209 | PatientCourseResult result = new PatientCourseResult(); |
| 210 | - result.setAge(DateUtil.getAge(model.getBirthday(),new Date())); | |
| 210 | + result.setAge(DateUtil.getAge(model.getBirthday(), new Date())); | |
| 211 | 211 | result.setCardNo(model.getCardNo()); |
| 212 | 212 | result.setUserName(model.getUserName()); |
| 213 | 213 | result.setPhone(model.getPhone()); |
| ... | ... | @@ -216,7 +216,7 @@ |
| 216 | 216 | result.setSignTime(model.getSignTime() == null ? "" : DateUtil.gety_m_dhm(model.getSignTime())); |
| 217 | 217 | //预约类型 1 院内 2 小程序 |
| 218 | 218 | result.setOrderType((model.getOrderType() != null && model.getOrderType() == 1) ? "院内" : "小程序"); |
| 219 | - | |
| 219 | + result.setPatientId(model.getPatientId()); | |
| 220 | 220 | results.add(result); |
| 221 | 221 | } |
| 222 | 222 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MysqlDataInterceptor.java
View file @
522e3e4
| ... | ... | @@ -3,7 +3,6 @@ |
| 3 | 3 | |
| 4 | 4 | import com.lyms.platform.biz.service.SyncDataService; |
| 5 | 5 | import com.lyms.platform.common.utils.ExceptionUtils; |
| 6 | -import com.lyms.platform.operate.web.utils.SendMysqlSyncDatUtil; | |
| 7 | 6 | import org.apache.commons.collections.CollectionUtils; |
| 8 | 7 | import org.apache.commons.lang.StringUtils; |
| 9 | 8 | import org.apache.ibatis.executor.Executor; |
| 10 | 9 | |
| ... | ... | @@ -78,8 +77,9 @@ |
| 78 | 77 | if (isSyncTable(sql)) |
| 79 | 78 | { |
| 80 | 79 | System.out.println("==============delete or update sync sql = " + sql); |
| 80 | + //syncDataService.savePostMysql(sql,sqlId); | |
| 81 | 81 | sql = null; |
| 82 | - syncDataService.savePostMysql(sql,sqlId); | |
| 82 | + | |
| 83 | 83 | } |
| 84 | 84 | } |
| 85 | 85 | else if ("insert".equals(sqlCommandType.toLowerCase()) ) |
| 86 | 86 | |
| ... | ... | @@ -100,10 +100,9 @@ |
| 100 | 100 | if (returnValue != null && returnValue instanceof ArrayList) |
| 101 | 101 | { |
| 102 | 102 | List<Integer> list = (ArrayList)returnValue; |
| 103 | - if (CollectionUtils.isNotEmpty(list)) | |
| 104 | - { | |
| 103 | + if (CollectionUtils.isNotEmpty(list)) { | |
| 105 | 104 | System.out.println("============add sync sql = " + sql); |
| 106 | - syncDataService.savePostMysql(sql,sqlId); | |
| 105 | +// syncDataService.savePostMysql(sql,sqlId); | |
| 107 | 106 | sql = null; |
| 108 | 107 | } |
| 109 | 108 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/SendMysqlSyncDatUtil.java
View file @
522e3e4
| ... | ... | @@ -14,7 +14,6 @@ |
| 14 | 14 | import java.util.Set; |
| 15 | 15 | import java.util.concurrent.BlockingQueue; |
| 16 | 16 | import java.util.concurrent.LinkedBlockingQueue; |
| 17 | -import java.util.concurrent.TimeUnit; | |
| 18 | 17 | |
| 19 | 18 | /** |
| 20 | 19 | * Created by lqy |
| 21 | 20 | |
| ... | ... | @@ -23,9 +22,8 @@ |
| 23 | 22 | @Component |
| 24 | 23 | public class SendMysqlSyncDatUtil implements InitializingBean { |
| 25 | 24 | |
| 26 | - public static final String run_mode = PropertiesUtils.getPropertyValue("run.mode"); | |
| 27 | 25 | |
| 28 | - private static BlockingQueue<SqlRequest> syncSqlQueue = new LinkedBlockingQueue(500); | |
| 26 | + private static BlockingQueue<SqlRequest> syncSqlQueue = new LinkedBlockingQueue(200); | |
| 29 | 27 | |
| 30 | 28 | //配置文件中配置的要同步的区域的url地址 |
| 31 | 29 | private static Set<String> urls = new HashSet<>(); |