【事件上报】-【获取事件处理进度 返回数据格式修改】-（王童）-2020/12/16

shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/api/ShiBeiCityGridApi.java

@@ -7,11 +7,9 @@ import com.elink.esua.epdc.gird.shibei.dto.SearchCaseProcessByTaskIdDto;
 import com.elink.esua.epdc.gird.shibei.dto.form.SendEventFormDto;
 import com.elink.esua.epdc.gird.shibei.dto.form.SendInputInfoFormDto;
 import com.elink.esua.epdc.gird.shibei.dto.form.SendWenXinEvaluateInfoFormDto;
-import com.elink.esua.epdc.gird.shibei.dto.result.EventProcessResultDto;
+import com.elink.esua.epdc.gird.shibei.dto.result.EventProcessHisResultDto;
 import com.elink.esua.epdc.gird.shibei.dto.result.SendEventResultDto;
 
-import java.util.List;
-
 /**
  * 市北城市网格化平台API接口
  *
@@ -74,7 +72,7 @@ public interface ShiBeiCityGridApi {
     * @author wangtong
     * @date 2020/12/16 18:58
     * @params []
-    * @return com.elink.esua.epdc.gird.shibei.dto.result.EventProcessResultDto
+    * @return com.elink.esua.epdc.gird.shibei.dto.result.EventProcessHisResultDto
     */
-    List<EventProcessResultDto> getHistoryByRecId(String recId);
+    EventProcessHisResultDto getHistoryByRecId(String recId);
 }

shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/api/impl/ShiBeiCityGridApiImpl.java

@@ -2,7 +2,6 @@ package com.elink.esua.epdc.gird.shibei.api.impl;
 
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.elink.esua.epdc.gird.shibei.api.ShiBeiCityGridApi;
 import com.elink.esua.epdc.gird.shibei.contants.ApiConstants;
@@ -12,7 +11,7 @@ import com.elink.esua.epdc.gird.shibei.dto.SearchCaseProcessByTaskIdDto;
 import com.elink.esua.epdc.gird.shibei.dto.form.SendEventFormDto;
 import com.elink.esua.epdc.gird.shibei.dto.form.SendInputInfoFormDto;
 import com.elink.esua.epdc.gird.shibei.dto.form.SendWenXinEvaluateInfoFormDto;
-import com.elink.esua.epdc.gird.shibei.dto.result.EventProcessResultDto;
+import com.elink.esua.epdc.gird.shibei.dto.result.EventProcessHisResultDto;
 import com.elink.esua.epdc.gird.shibei.dto.result.SendEventResultDto;
 import com.elink.esua.epdc.gird.shibei.util.XstreamUtil;
 import com.elink.esua.httpclient.HttpClientUtils;
@@ -25,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.Map;
 
 /*
@@ -148,7 +146,7 @@ public class ShiBeiCityGridApiImpl implements ShiBeiCityGridApi {
     }
 
     @Override
-    public List<EventProcessResultDto> getHistoryByRecId(String recId) {
+    public EventProcessHisResultDto getHistoryByRecId(String recId) {
         String url = ApiConstants.historyUrl +"?recId="+recId;
         LOGGER.info("获取事件处理进度请求地址:" + url);
         HttpResponse response = null;
@@ -162,9 +160,9 @@ public class ShiBeiCityGridApiImpl implements ShiBeiCityGridApi {
         }
         LOGGER.info("获取事件处理进度返回数据:" + response.body());
         JSONObject res = JSONObject.parseObject(response.body());
-        List<EventProcessResultDto> result =  null;
+        EventProcessHisResultDto result = null;
         try {
-            result = JSONArray.parseArray(res.get("HISTORY").toString(), EventProcessResultDto.class);
+            result = (EventProcessHisResultDto) JSONObject.toJavaObject(res, EventProcessHisResultDto.class);
         }catch (Exception e){
             e.printStackTrace();
             LOGGER.error("获取事件处理结果异常：" + e.getMessage());

shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/result/EventProcessHisResultDto.java

@@ -0,0 +1,35 @@
+package com.elink.esua.epdc.gird.shibei.dto.result;
+
+import com.alibaba.fastjson.annotation.JSONField;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @program: esua-epdc
+ * @description:
+ * @author: wangtong
+ * @create: 2020-12-16 19:26
+ **/
+public class EventProcessHisResultDto implements Serializable {
+
+    private static final long serialVersionUID = -8700554713907308891L;
+
+    @JSONField(name = "HISTORY")
+    private List<EventProcessResultDto> HISTORY;
+
+    public List<EventProcessResultDto> getHISTORY() {
+        return HISTORY;
+    }
+
+    public void setHISTORY(List<EventProcessResultDto> HISTORY) {
+        this.HISTORY = HISTORY;
+    }
+
+    @Override
+    public String toString() {
+        return "EventProcessHisResultDto{" +
+                "HISTORY=" + HISTORY +
+                '}';
+    }
+}