diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/Lucky24RecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/Lucky24RecordAdminService.java index 05c4617ed..0d71f8984 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/Lucky24RecordAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/Lucky24RecordAdminService.java @@ -108,13 +108,19 @@ public class Lucky24RecordAdminService { Date startTime = DateTimeUtil.getBeginTimeOfDay(DateTimeUtil.convertStrToDate(endDate, DateTimeUtil.DEFAULT_DATE_PATTERN)); ZonedDateTime zonedStartTime = startTime.toInstant().atZone(ZoneId.systemDefault()); Date systemStartTime = Date.from(zonedStartTime.withZoneSameLocal(ZoneId.of(partitionInfo.getZoneId())).toInstant()); + String zoneDateTableName = DateTimeUtil.convertDate(systemStartTime, DateTimeUtil.DEFAULT_DATE_PATTERN_); Date endTime = DateTimeUtil.getEndTimeOfDay(DateTimeUtil.convertStrToDate(endDate, DateTimeUtil.DEFAULT_DATE_PATTERN)); ZonedDateTime zonedEndTime = endTime.toInstant().atZone(ZoneId.systemDefault()); Date systemEndTime = Date.from(zonedEndTime.withZoneSameLocal(ZoneId.of(partitionInfo.getZoneId())).toInstant()); + String systemDateTableName = DateTimeUtil.convertDate(systemEndTime, DateTimeUtil.DEFAULT_DATE_PATTERN_); + if (zoneDateTableName.equals(systemDateTableName)){ + systemDateTableName = null; + } + List list = null == poolType? - recordMapper.listPlatform(endDate, partitionId, poolTypeList, systemStartTime, systemEndTime): - recordMapper.listPlatformByPoolType(endDate, partitionId, poolTypeList, systemStartTime, systemEndTime); + recordMapper.listPlatformManual(endDate, partitionId, poolTypeList, systemStartTime, systemEndTime, zoneDateTableName, systemDateTableName): + recordMapper.listPlatformByPoolTypeManual(endDate, partitionId, poolTypeList, systemStartTime, systemEndTime, zoneDateTableName, systemDateTableName); for (Lucky24PlatformStat stat: list) { statMap.put(stat.getDate(), stat); } diff --git a/accompany-base/accompany-sharding/accompany-sharding-service/src/main/java/com/accompany/sharding/config/ShardingSphereConfig.java b/accompany-base/accompany-sharding/accompany-sharding-service/src/main/java/com/accompany/sharding/config/ShardingSphereConfig.java index bba01768f..06fc49bef 100644 --- a/accompany-base/accompany-sharding/accompany-sharding-service/src/main/java/com/accompany/sharding/config/ShardingSphereConfig.java +++ b/accompany-base/accompany-sharding/accompany-sharding-service/src/main/java/com/accompany/sharding/config/ShardingSphereConfig.java @@ -69,18 +69,6 @@ public class ShardingSphereConfig { return ruleConfig; } - /*private ReadwriteSplittingRuleConfiguration getReadWriteRuleConfig() { - //同一事务下强制使用主库 - ReadwriteSplittingDataSourceGroupRuleConfiguration dataSourceGroupConfig = new ReadwriteSplittingDataSourceGroupRuleConfiguration( - "ds", "ds", Arrays.asList("ds", "ds_slave"), TransactionalReadQueryStrategy.PRIMARY, "weight_lb"); - Properties algorithmProps = new Properties(); - algorithmProps.setProperty("ds_slave", "4"); - algorithmProps.setProperty("ds", "1"); - Map algorithmConfigMap = new HashMap<>(1); - algorithmConfigMap.put("weight_lb", new AlgorithmConfiguration("WEIGHT", algorithmProps)); - return new ReadwriteSplittingRuleConfiguration(Collections.singleton(dataSourceGroupConfig), algorithmConfigMap); - }*/ - private ReadwriteSplittingRuleConfiguration getReadWriteRuleConfig() { //同一事务下强制使用主库 ReadwriteSplittingDataSourceGroupRuleConfiguration dataSourceGroupConfig = new ReadwriteSplittingDataSourceGroupRuleConfiguration( diff --git a/accompany-base/accompany-sharding/accompany-sharding-service/src/main/java/com/accompany/sharding/mapper/Lucky24RecordMapper.java b/accompany-base/accompany-sharding/accompany-sharding-service/src/main/java/com/accompany/sharding/mapper/Lucky24RecordMapper.java index 6ac07d010..ac9e54530 100644 --- a/accompany-base/accompany-sharding/accompany-sharding-service/src/main/java/com/accompany/sharding/mapper/Lucky24RecordMapper.java +++ b/accompany-base/accompany-sharding/accompany-sharding-service/src/main/java/com/accompany/sharding/mapper/Lucky24RecordMapper.java @@ -15,10 +15,20 @@ public interface Lucky24RecordMapper extends BaseMapper { @Param("poolTypeList")List poolTypeList, @Param("startTime") Date startTime, @Param("endTime") Date endTime); + List listPlatformManual(@Param("zoneDate")String zoneDate, @Param("partitionId") Integer partitionId, + @Param("poolTypeList")List poolTypeList, + @Param("startTime") Date startTime, @Param("endTime") Date endTime, + @Param("zoneDateTableName") String zoneDateTableName, @Param("systemDateTableName") String systemDateTableName); + List listPlatformByPoolType(@Param("zoneDate")String zonedDate, @Param("partitionId") Integer partitionId, @Param("poolTypeList")List poolTypeList, @Param("startTime") Date startTime, @Param("endTime") Date endTime); + List listPlatformByPoolTypeManual(@Param("zoneDate")String zonedDate, @Param("partitionId") Integer partitionId, + @Param("poolTypeList")List poolTypeList, + @Param("startTime") Date startTime, @Param("endTime") Date endTime, + @Param("zoneDateTableName") String zoneDateTableName, @Param("systemDateTableName") String systemDateTableName); + List listPersonal(@Param("zoneDate")String zoneDate, @Param("partitionId") Integer partitionId, @Param("poolTypeList")List poolTypeList, @Param("startTime") Date startTime, @Param("endTime") Date endTime, diff --git a/accompany-base/accompany-sharding/accompany-sharding-service/src/main/resources/sharding/sqlmappers/Lucky24RecordMapper.xml b/accompany-base/accompany-sharding/accompany-sharding-service/src/main/resources/sharding/sqlmappers/Lucky24RecordMapper.xml index 397ade980..e1b696032 100644 --- a/accompany-base/accompany-sharding/accompany-sharding-service/src/main/resources/sharding/sqlmappers/Lucky24RecordMapper.xml +++ b/accompany-base/accompany-sharding/accompany-sharding-service/src/main/resources/sharding/sqlmappers/Lucky24RecordMapper.xml @@ -28,6 +28,68 @@ group by r.uid) r + + + +