|
|
|
@ -16,8 +16,8 @@ import java.util.*; |
|
|
|
public class EpidemicTangVo { |
|
|
|
|
|
|
|
@Data |
|
|
|
@ApiModel("疫情-汤同伟") |
|
|
|
public static class Epidemic{ |
|
|
|
@ApiModel("疫情风险-汤同伟") |
|
|
|
public static class EpidemicRisk { |
|
|
|
@ApiModelProperty("全球累计死亡") |
|
|
|
private String worldDead; |
|
|
|
@ApiModelProperty("全球累积确诊") |
|
|
|
@ -33,10 +33,10 @@ public class EpidemicTangVo { |
|
|
|
|
|
|
|
public EpidemicVo.Epidemic transform(){ |
|
|
|
EpidemicVo.Epidemic epidemic = new EpidemicVo.Epidemic(); |
|
|
|
epidemic.setWorldDead(this.worldDead); |
|
|
|
epidemic.setWorldConfirm(this.worldConfirm); |
|
|
|
epidemic.setImportedCase(this.importedCase); |
|
|
|
epidemic.setLocalConfirmAdd(this.localConfirmadd); |
|
|
|
// epidemic.setWorldDead(this.worldDead);
|
|
|
|
// epidemic.setWorldConfirm(this.worldConfirm);
|
|
|
|
// epidemic.setImportedCase(this.importedCase);
|
|
|
|
// epidemic.setLocalConfirmAdd(this.localConfirmadd);
|
|
|
|
|
|
|
|
if (CollectionUtil.isNotEmpty(this.middleRisk)) { |
|
|
|
epidemic.setMiddleRiskAreas(getCity(this.middleRisk)); |
|
|
|
@ -47,9 +47,9 @@ public class EpidemicTangVo { |
|
|
|
return epidemic; |
|
|
|
} |
|
|
|
private int getIndex(String risk) { |
|
|
|
String key1 = "盟"; |
|
|
|
String key1 = "市"; |
|
|
|
String key2 = "州"; |
|
|
|
String key3 = "市"; |
|
|
|
String key3 = "盟"; |
|
|
|
return risk.indexOf(key1) > 0 ? risk.indexOf(key1) + 1 : |
|
|
|
risk.indexOf(key2) > 0 ? risk.indexOf(key2) + 1 : |
|
|
|
risk.indexOf(key3) > 0 ? risk.indexOf(key3) + 1 : |
|
|
|
@ -66,5 +66,69 @@ public class EpidemicTangVo { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@Data |
|
|
|
@ApiModel("疫情-汤同伟") |
|
|
|
public static class Epidemic{ |
|
|
|
@ApiModelProperty("统计时间") |
|
|
|
private String lastUpdateTime; |
|
|
|
@ApiModelProperty("总数据") |
|
|
|
private ChinaTotal chinaTotal; |
|
|
|
@ApiModelProperty("新增") |
|
|
|
private ChinaAdd chinaAdd; |
|
|
|
|
|
|
|
public void fill(EpidemicVo.Epidemic epidemic) { |
|
|
|
epidemic.setLastUpdateTime(lastUpdateTime); |
|
|
|
|
|
|
|
epidemic.setImportedCase(chinaTotal.importedCase); |
|
|
|
epidemic.setImportedCaseAdd(chinaAdd.importedCase); |
|
|
|
|
|
|
|
epidemic.setLocalNoInfect(chinaTotal.noInfect); |
|
|
|
epidemic.setLocalNoInfectAdd(chinaAdd.noInfect); |
|
|
|
|
|
|
|
epidemic.setLocalDead(chinaTotal.dead); |
|
|
|
epidemic.setLocalDeadAdd(chinaAdd.dead); |
|
|
|
|
|
|
|
epidemic.setLocalConfirm(chinaTotal.localConfirm); |
|
|
|
epidemic.setLocalConfirmAdd(chinaAdd.localConfirm); |
|
|
|
|
|
|
|
epidemic.setLocalTotalConfirm(chinaTotal.confirm); |
|
|
|
epidemic.setLocalTotalConfirmAdd(chinaAdd.confirm); |
|
|
|
|
|
|
|
epidemic.setLocalNowConfirm(chinaTotal.nowConfirm); |
|
|
|
epidemic.setLocalNowConfirmAdd(chinaAdd.nowConfirm); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
@Data |
|
|
|
@ApiModel("国内总数据-汤同伟") |
|
|
|
public static class ChinaTotal { |
|
|
|
@ApiModelProperty("境外输入") |
|
|
|
private String importedCase; |
|
|
|
@ApiModelProperty("无症状感染者") |
|
|
|
private String noInfect; |
|
|
|
@ApiModelProperty("累计死亡") |
|
|
|
private String dead; |
|
|
|
@ApiModelProperty("本土现有确诊") |
|
|
|
private String localConfirm; |
|
|
|
@ApiModelProperty("累计确诊") |
|
|
|
private String confirm; |
|
|
|
@ApiModelProperty("现有确诊") |
|
|
|
private String nowConfirm; |
|
|
|
} |
|
|
|
@Data |
|
|
|
@ApiModel("国内新增数据-汤同伟") |
|
|
|
public static class ChinaAdd { |
|
|
|
@ApiModelProperty("境外输入") |
|
|
|
private String importedCase; |
|
|
|
@ApiModelProperty("无症状感染者") |
|
|
|
private String noInfect; |
|
|
|
@ApiModelProperty("累计死亡") |
|
|
|
private String dead; |
|
|
|
@ApiModelProperty("本土现有确诊") |
|
|
|
private String localConfirm; |
|
|
|
@ApiModelProperty("累计确诊") |
|
|
|
private String confirm; |
|
|
|
@ApiModelProperty("现有确诊") |
|
|
|
private String nowConfirm; |
|
|
|
} |
|
|
|
} |
|
|
|
|
