diff --git a/rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/team/target/api/TeamPolicyManagerClientApi.java b/rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/team/target/api/TeamPolicyManagerClientApi.java index 84f74e97..a6057c6c 100644 --- a/rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/team/target/api/TeamPolicyManagerClientApi.java +++ b/rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/team/target/api/TeamPolicyManagerClientApi.java @@ -30,7 +30,8 @@ public interface TeamPolicyManagerClientApi { ResultResponse getReleaseByRegionAndType( @RequestParam("sysOrigin") String sysOrigin, @RequestParam("region") String region, - @RequestParam("policyType") String policyType); + @RequestParam("policyType") String policyType, + @RequestParam("countryCode") String countryCode); @PostMapping("/mapRegionRelease") ResultResponse> mapRegionRelease( @@ -38,7 +39,10 @@ public interface TeamPolicyManagerClientApi { @GetMapping("/listSysOriginRegion") ResultResponse> listSysOriginRegion( - @RequestParam("sysOrigin") String sysOrigin, @RequestParam("region") String region, @RequestParam("policyType") String policyType); + @RequestParam("sysOrigin") String sysOrigin, + @RequestParam("region") String region, + @RequestParam("policyType") String policyType, + @RequestParam("countryCode") String countryCode); @GetMapping("/listTeamPolicy") ResultResponse> listTeamPolicy( diff --git a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/cmd/team/TeamPolicyManagerBackQryCmd.java b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/cmd/team/TeamPolicyManagerBackQryCmd.java index a3a15acc..6d398c39 100644 --- a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/cmd/team/TeamPolicyManagerBackQryCmd.java +++ b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/cmd/team/TeamPolicyManagerBackQryCmd.java @@ -32,4 +32,6 @@ public class TeamPolicyManagerBackQryCmd implements Serializable { */ private String policyType; + private String countryCode; + } diff --git a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/cmd/team/TeamPolicyManagerCmd.java b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/cmd/team/TeamPolicyManagerCmd.java index d24adadc..47e9cd4d 100644 --- a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/cmd/team/TeamPolicyManagerCmd.java +++ b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/cmd/team/TeamPolicyManagerCmd.java @@ -63,6 +63,11 @@ public class TeamPolicyManagerCmd extends CommonCommand { */ private String policyType; + /** + * 国家code + */ + private String countryCode; + /** * 创建时间. */ diff --git a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/agency/agency/TeamPolicyManagerDTO.java b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/agency/agency/TeamPolicyManagerDTO.java index cb4e3436..3618ff06 100644 --- a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/agency/agency/TeamPolicyManagerDTO.java +++ b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/agency/agency/TeamPolicyManagerDTO.java @@ -37,6 +37,11 @@ public class TeamPolicyManagerDTO implements Serializable { */ private String region; + /** + * 国家code + */ + private String countryCode; + /** * true: 曾经对外发布过. */ diff --git a/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/team/TeamPolicyManagerBackServiceImpl.java b/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/team/TeamPolicyManagerBackServiceImpl.java index c21d8f38..d4a1e4eb 100644 --- a/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/team/TeamPolicyManagerBackServiceImpl.java +++ b/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/team/TeamPolicyManagerBackServiceImpl.java @@ -33,13 +33,13 @@ public class TeamPolicyManagerBackServiceImpl implements TeamPolicyManagerBackSe @Override public List historyReleases(TeamPolicyManagerBackQryCmd query) { return assembleTeamPolicyManagerVO(ResponseAssert.requiredSuccess(teamPolicyManagerClient - .listSysOriginRegion(query.getSysOrigin(), query.getRegion(), query.getPolicyType()))); + .listSysOriginRegion(query.getSysOrigin(), query.getRegion(), query.getPolicyType(), query.getCountryCode()))); } @Override public TeamPolicyManagerCO getByRegionByType(TeamPolicyManagerBackQryCmd query) { TeamPolicyManagerDTO teamPolicyManager = ResponseAssert.requiredSuccess(teamPolicyManagerClient - .getReleaseByRegionAndType(query.getSysOrigin(), query.getRegion(), query.getPolicyType())); + .getReleaseByRegionAndType(query.getSysOrigin(), query.getRegion(), query.getPolicyType(), query.getCountryCode())); if (Objects.isNull(teamPolicyManager)) { return new TeamPolicyManagerCO(); } diff --git a/rc-service/rc-service-console/console-client/src/main/java/com/red/circle/console/app/dto/clienobject/team/TeamPolicyManagerCO.java b/rc-service/rc-service-console/console-client/src/main/java/com/red/circle/console/app/dto/clienobject/team/TeamPolicyManagerCO.java index 2615326a..932b1b6e 100644 --- a/rc-service/rc-service-console/console-client/src/main/java/com/red/circle/console/app/dto/clienobject/team/TeamPolicyManagerCO.java +++ b/rc-service/rc-service-console/console-client/src/main/java/com/red/circle/console/app/dto/clienobject/team/TeamPolicyManagerCO.java @@ -38,6 +38,11 @@ public class TeamPolicyManagerCO implements Serializable { */ private String region; + /** + * 国家code + */ + private String countryCode; + /** * true: 曾经对外发布过. */ diff --git a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/dynamic/DynamicReportCmd.java b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/dynamic/DynamicReportCmd.java index 9e18b942..3a3924e2 100644 --- a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/dynamic/DynamicReportCmd.java +++ b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/dynamic/DynamicReportCmd.java @@ -36,4 +36,9 @@ public class DynamicReportCmd extends AppExtCommand { @NotNull private Integer reportType; + /** + * 图片集合. + */ + private String imageUrls; + } diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/entity/team/team/TeamPolicyManager.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/entity/team/team/TeamPolicyManager.java index 6becb71c..b3dcbb1f 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/entity/team/team/TeamPolicyManager.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/entity/team/team/TeamPolicyManager.java @@ -42,6 +42,11 @@ public class TeamPolicyManager implements Serializable { */ private String region; + /** + * 国家code + */ + private String countryCode; + /** * true: 曾经对外发布过. */ diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/TeamPolicyManagerService.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/TeamPolicyManagerService.java index f7d27eb1..693abdb9 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/TeamPolicyManagerService.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/TeamPolicyManagerService.java @@ -30,7 +30,7 @@ public interface TeamPolicyManagerService { * 获取指定系统区域政策. * @param policyType 策略类型 MONEY(美金政策)、SALARY_DIAMOND(工资钻石政策). */ - List listTeamPolicyAndTypePolicy(String sysOrigin, String region, String policyType); + List listTeamPolicyAndTypePolicy(String sysOrigin, String region, String policyType, String countryCode); /** * 获取指定系统区域政策. @@ -54,7 +54,7 @@ public interface TeamPolicyManagerService { * @param policyType 策略类型 MONEY(美金政策)、SALARY_DIAMOND(工资钻石政策). * @return 策略 */ - TeamPolicyManager getReleaseByRegionAndType(String sysOrigin, String region, String policyType); + TeamPolicyManager getReleaseByRegionAndType(String sysOrigin, String region, String policyType, String countryCode); /** * 获取区域已发布政策. diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/impl/TeamPolicyManagerServiceImpl.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/impl/TeamPolicyManagerServiceImpl.java index 7dc8abb1..6c7cc1e7 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/impl/TeamPolicyManagerServiceImpl.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/impl/TeamPolicyManagerServiceImpl.java @@ -47,7 +47,8 @@ public class TeamPolicyManagerServiceImpl implements TeamPolicyManagerService { } @Override - public List listTeamPolicyAndTypePolicy(String sysOrigin, String region, String policyType) { + public List listTeamPolicyAndTypePolicy(String sysOrigin, String region, + String policyType, String countryCode) { Criteria criteria = new Criteria(); criteria.and("region").is(region); criteria.and("sysOrigin").is(sysOrigin); @@ -56,6 +57,9 @@ public class TeamPolicyManagerServiceImpl implements TeamPolicyManagerService { }else { criteria.and("policyType").ne(TeamPolicyTypeEnum.SALARY_DIAMOND.name()); } + if (StringUtils.isNotBlank(countryCode)) { + criteria.and("countryCode").is(countryCode); + } return mongoTemplate.find( Query.query(criteria).with(Sort.by(Sort.Order.desc("createTime"))), TeamPolicyManager.class); } @@ -81,7 +85,7 @@ public class TeamPolicyManagerServiceImpl implements TeamPolicyManagerService { } @Override - public TeamPolicyManager getReleaseByRegionAndType(String sysOrigin, String region, String policyType) { + public TeamPolicyManager getReleaseByRegionAndType(String sysOrigin, String region, String policyType, String countryCode) { Criteria criteria = new Criteria(); criteria.and("region").is(region); @@ -92,6 +96,9 @@ public class TeamPolicyManagerServiceImpl implements TeamPolicyManagerService { }else { criteria.and("policyType").ne(TeamPolicyTypeEnum.SALARY_DIAMOND.name()); } + if (StringUtils.isNotBlank(countryCode)) { + criteria.and("countryCode").is(countryCode); + } return mongoTemplate.findOne(Query.query(criteria), TeamPolicyManager.class); } diff --git a/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/endpoint/team/TeamPolicyManagerClientEndpoint.java b/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/endpoint/team/TeamPolicyManagerClientEndpoint.java index 3bd6527c..ef615e96 100644 --- a/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/endpoint/team/TeamPolicyManagerClientEndpoint.java +++ b/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/endpoint/team/TeamPolicyManagerClientEndpoint.java @@ -41,9 +41,10 @@ public class TeamPolicyManagerClientEndpoint implements TeamPolicyManagerClient } @Override - public ResultResponse getReleaseByRegionAndType(String sysOrigin, String region, String policyType) { + public ResultResponse getReleaseByRegionAndType(String sysOrigin, String region, + String policyType, String countryCode) { return ResultResponse.success( - teamPolicyManagerClientService.getReleaseByRegionAndTypePolicyType(sysOrigin, region, policyType)); + teamPolicyManagerClientService.getReleaseByRegionAndTypePolicyType(sysOrigin, region, policyType, countryCode)); } @Override @@ -53,9 +54,9 @@ public class TeamPolicyManagerClientEndpoint implements TeamPolicyManagerClient @Override public ResultResponse> listSysOriginRegion(String sysOrigin, - String region, String policyType) { + String region, String policyType, String countryCode) { return ResultResponse.success( - teamPolicyManagerClientService.listTeamPolicyAndTypePolicy(sysOrigin, region, policyType)); + teamPolicyManagerClientService.listTeamPolicyAndTypePolicy(sysOrigin, region, policyType, countryCode)); } @Override diff --git a/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/team/TeamPolicyManagerClientService.java b/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/team/TeamPolicyManagerClientService.java index 12f7cb73..a92bfdfe 100644 --- a/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/team/TeamPolicyManagerClientService.java +++ b/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/team/TeamPolicyManagerClientService.java @@ -18,7 +18,8 @@ public interface TeamPolicyManagerClientService { TeamPolicyManagerDTO getReleaseByRegionAndType(String sysOrigin, String region); - TeamPolicyManagerDTO getReleaseByRegionAndTypePolicyType(String sysOrigin, String region, String policyType); + TeamPolicyManagerDTO getReleaseByRegionAndTypePolicyType(String sysOrigin, String region, + String policyType, String countryCode); Map mapRegionRelease(Set regions); @@ -26,7 +27,7 @@ public interface TeamPolicyManagerClientService { List listTeamPolicy(String sysOrigin, String region); - List listTeamPolicyAndTypePolicy(String sysOrigin, String region, String policyType); + List listTeamPolicyAndTypePolicy(String sysOrigin, String region, String policyType, String countryCode); void add(TeamPolicyManagerCmd cmd); diff --git a/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/team/impl/TeamPolicyManagerClientServiceImpl.java b/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/team/impl/TeamPolicyManagerClientServiceImpl.java index f9a47af7..368b2dbf 100644 --- a/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/team/impl/TeamPolicyManagerClientServiceImpl.java +++ b/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/team/impl/TeamPolicyManagerClientServiceImpl.java @@ -36,9 +36,10 @@ public class TeamPolicyManagerClientServiceImpl implements TeamPolicyManagerClie } @Override - public TeamPolicyManagerDTO getReleaseByRegionAndTypePolicyType(String sysOrigin, String region, String policyType) { + public TeamPolicyManagerDTO getReleaseByRegionAndTypePolicyType(String sysOrigin, String region, + String policyType, String countryCode) { return teamAppConvertor.toTeamPolicyManagerDTO( - teamPolicyManagerService.getReleaseByRegionAndType(sysOrigin, region, policyType)); + teamPolicyManagerService.getReleaseByRegionAndType(sysOrigin, region, policyType, countryCode)); } @@ -61,9 +62,10 @@ public class TeamPolicyManagerClientServiceImpl implements TeamPolicyManagerClie } @Override - public List listTeamPolicyAndTypePolicy(String sysOrigin, String region, String policyType) { + public List listTeamPolicyAndTypePolicy(String sysOrigin, String region, + String policyType, String countryCode) { return teamAppConvertor.toListTeamPolicyManagerDTO( - teamPolicyManagerService.listTeamPolicyAndTypePolicy(sysOrigin, region, policyType)); + teamPolicyManagerService.listTeamPolicyAndTypePolicy(sysOrigin, region, policyType, countryCode)); } @Override