疫情

src/main/java/com/ccsens/basicserver/api/EpidemicController.java

@@ -3,8 +3,7 @@ package com.ccsens.basicserver.api;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.ccsens.basicserver.bean.vo.epidemic.EpidemicTangVo;
-import com.ccsens.basicserver.bean.vo.weather.WeatherTangVo;
+import com.ccsens.basicserver.bean.vo.epidemic.EpidemicVo;
-import com.ccsens.basicserver.bean.vo.weather.WeatherVo;
 import com.ccsens.basicserver.util.BasicServerCodeError;
 import com.ccsens.basicserver.util.BasicServerConstant;
 import com.ccsens.util.JsonResponse;
@@ -31,15 +30,26 @@ public class EpidemicController {
     @ApiImplicitParams({
     })
     @RequestMapping(value = "tang", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<WeatherVo.Weather> tang() {
+    public JsonResponse<EpidemicTangVo.EpidemicRisk> tang() {
-        log.info("疫情查询，路径：{}", BasicServerConstant.Tang.WEATHER_AND_EPIDEMIC_URL);
+        log.info("疫情风险地区查询，路径：{}", BasicServerConstant.Tang.WEATHER_AND_EPIDEMIC_URL);
         String result = HttpUtil.get(BasicServerConstant.Tang.WEATHER_AND_EPIDEMIC_URL);
-        log.info("疫情查询返回：{}", result);
+        log.info("疫情风险地区查询返回：{}", result);
         JSONObject resultJson = JSONObject.parseObject(result);
-        if (resultJson.getIntValue(BasicServerConstant.Tang.ERROR_CODE) != BasicServerConstant.Tang.CURRENT_CODE) {
+        if (resultJson.getIntValue(BasicServerConstant.Tang.ERROR_ERROR_CODE) != BasicServerConstant.Tang.CURRENT_CODE) {
             return JsonResponse.newInstance().fail(BasicServerCodeError.THIRD_ERROR.getCode(), resultJson.getString(BasicServerConstant.Tang.ERROR_MSG));
         }
-        EpidemicTangVo.Epidemic epidemic = JSONObject.parseObject(resultJson.getString(BasicServerConstant.Tang.DATA), EpidemicTangVo.Epidemic.class);
+        EpidemicTangVo.EpidemicRisk epidemicRisk = JSONObject.parseObject(resultJson.getString(BasicServerConstant.Tang.DATA), EpidemicTangVo.EpidemicRisk.class);
-        return JsonResponse.newInstance().ok(epidemic.transform());
+        EpidemicVo.Epidemic vo = epidemicRisk.transform();
+        // 查询数据 EPIDEMIC_URL
+        log.info("疫情数据查询：{}", BasicServerConstant.Tang.EPIDEMIC_URL);
+        String epidemicResult = HttpUtil.get(BasicServerConstant.Tang.EPIDEMIC_URL);
+        log.info("疫情数据返回：{}", epidemicResult);
+        JSONObject resultJson2 = JSONObject.parseObject(epidemicResult);
+        if (resultJson2.getIntValue(BasicServerConstant.Tang.ERROR_CODE) != BasicServerConstant.Tang.CURRENT_CODE) {
+            return JsonResponse.newInstance().fail(BasicServerCodeError.THIRD_ERROR.getCode(), resultJson.getString(BasicServerConstant.Tang.ERROR_MSG));
+        }
+        EpidemicTangVo.Epidemic epidemic = JSONObject.parseObject(resultJson2.getString(BasicServerConstant.Tang.DATA), EpidemicTangVo.Epidemic.class);
+        epidemic.fill(vo);
+        return JsonResponse.newInstance().ok(vo);
     }
 }

src/main/java/com/ccsens/basicserver/api/NewsController.java

@@ -46,7 +46,7 @@ public class NewsController {
         log.info("查询地区新闻返回：{}", result);
         JSONObject resultJson = JSONObject.parseObject(result);
 
-        if (resultJson.getIntValue(BasicServerConstant.Tang.ERROR_CODE) != BasicServerConstant.Tang.CURRENT_CODE
+        if (resultJson.getIntValue(BasicServerConstant.Tang.ERROR_ERROR_CODE) != BasicServerConstant.Tang.CURRENT_CODE
                 || param.getPageNo() > resultJson.getJSONObject(BasicServerConstant.Tang.DATA).getIntValue(BasicServerConstant.Tang.PAGE_NO)) {
             return JsonResponse.newInstance().ok(news);
         }

src/main/java/com/ccsens/basicserver/api/WeatherController.java

@@ -39,7 +39,7 @@ public class WeatherController {
         String result = HttpUtil.get(BasicServerConstant.Tang.WEATHER_AND_EPIDEMIC_URL);
         log.info("天气查询返回：{}", result);
         JSONObject resultJson = JSONObject.parseObject(result);
-        if (resultJson.getIntValue(BasicServerConstant.Tang.ERROR_CODE) != BasicServerConstant.Tang.CURRENT_CODE) {
+        if (resultJson.getIntValue(BasicServerConstant.Tang.ERROR_ERROR_CODE) != BasicServerConstant.Tang.CURRENT_CODE) {
             return JsonResponse.newInstance().fail(BasicServerCodeError.THIRD_ERROR.getCode(), resultJson.getString(BasicServerConstant.Tang.ERROR_MSG));
         }
         WeatherTangVo.Weather weather = JSONObject.parseObject(resultJson.getString(BasicServerConstant.Tang.DATA), WeatherTangVo.Weather.class);

src/main/java/com/ccsens/basicserver/bean/vo/epidemic/EpidemicTangVo.java

@@ -16,8 +16,8 @@ import java.util.*;
 public class EpidemicTangVo {
 
     @Data
-    @ApiModel("疫情-汤同伟")
+    @ApiModel("疫情风险-汤同伟")
-    public static class Epidemic{
+    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.setWorldDead(this.worldDead);
-            epidemic.setWorldConfirm(this.worldConfirm);
+//            epidemic.setWorldConfirm(this.worldConfirm);
-            epidemic.setImportedCase(this.importedCase);
+//            epidemic.setImportedCase(this.importedCase);
-            epidemic.setLocalConfirmAdd(this.localConfirmadd);
+//            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;
+    }
 }

src/main/java/com/ccsens/basicserver/bean/vo/epidemic/EpidemicVo.java

@@ -17,14 +17,40 @@ public class EpidemicVo {
     @Data
     @ApiModel("疫情-返回")
     public static class Epidemic{
+        @ApiModelProperty("统计时间")
+        private String lastUpdateTime;
         @ApiModelProperty("全球累计死亡")
         private String worldDead;
         @ApiModelProperty("全球累积确诊")
         private String worldConfirm;
-        @ApiModelProperty("境外输入确诊病例人数")
+
+        @ApiModelProperty("境外输入确诊")
         private String importedCase;
-        @ApiModelProperty("国内昨日新增本土确诊病例人数")
+        @ApiModelProperty("境外输入确诊新增")
+        private String importedCaseAdd;
+
+        @ApiModelProperty("国内无症状感染者总数")
+        private String localNoInfect;
+        @ApiModelProperty("国内累计死亡总数")
+        private String localDead;
+        @ApiModelProperty("国内本土现有确诊总数（不含港澳台境外）")
+        private String localConfirm;
+        @ApiModelProperty("国内累计确诊总数")
+        private String localTotalConfirm;
+        @ApiModelProperty("国内现有确诊总数")
+        private String localNowConfirm;
+
+        @ApiModelProperty("国内无症状感染者新增")
+        private String localNoInfectAdd;
+        @ApiModelProperty("国内本土现有确诊新增（不含港澳台境外）")
         private String localConfirmAdd;
+        @ApiModelProperty("国内累计确诊新增")
+        private String localTotalConfirmAdd;
+        @ApiModelProperty("国内累计死亡总数新增")
+        private String localDeadAdd;
+        @ApiModelProperty("国内现有确诊总数新增")
+        private String localNowConfirmAdd;
+
         @ApiModelProperty("中风险地区")
         private List<String> middleRiskAreas;
         @ApiModelProperty("高风险地区")

src/main/java/com/ccsens/basicserver/util/BasicServerConstant.java

@@ -16,7 +16,9 @@ public class BasicServerConstant extends WebConstant {
 
         public static final String NEWS_URL = "http://110.42.221.18:8081/is/bg/getNews";
         public static final String WEATHER_AND_EPIDEMIC_URL = "http://110.42.221.18:8081/is/bg/getWeatherAndCovid";
-        public static final String ERROR_CODE = "errorCode";
+        public static final String EPIDEMIC_URL = "http://110.42.221.18:84/covid/getChinaCurrent";
+        public static final String ERROR_ERROR_CODE = "errorCode";
+        public static final String ERROR_CODE = "code";
         public static final String ERROR_MSG = "msg";
         public static final String DATA = "data";
         public static final String PAGE_NO = "pageNo";

src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
     active: test
-    include: common, util-test
+    include: common