【事件上报】-【获取事件处理进度修改】-（王童）-2020/12/16

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

@@ -7,8 +7,11 @@ 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.SendEventResultDto;
 
+import java.util.List;
+
 /**
  * 市北城市网格化平台API接口
  *
@@ -65,4 +68,13 @@ public interface ShiBeiCityGridApi {
      * @param taskId 要查询办理进度的任务号
      */
     SearchCaseProcessByTaskIdDto searchCaseProcessByTaskId(String taskId);
+
+    /**
+    * @describe: 获取事件处理进度
+    * @author wangtong
+    * @date 2020/12/16 18:58
+    * @params []
+    * @return com.elink.esua.epdc.gird.shibei.dto.result.EventProcessResultDto
+    */
+    List<EventProcessResultDto> getHistoryByRecId(String recId);
 }

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

@@ -2,6 +2,7 @@ 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;
@@ -11,6 +12,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.SendEventResultDto;
 import com.elink.esua.epdc.gird.shibei.util.XstreamUtil;
 import com.elink.esua.httpclient.HttpClientUtils;
@@ -23,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
+import java.util.List;
 import java.util.Map;
 
 /*
@@ -82,12 +85,22 @@ public class ShiBeiCityGridApiImpl implements ShiBeiCityGridApi {
         }
         LOGGER.info("事件上报返回数据:" + response.body());
         JSONObject res = JSONObject.parseObject(response.body());
+        SendEventResultDto result = null;
         if(0 == Integer.parseInt(res.get("code").toString())){
-            SendEventResultDto result = (SendEventResultDto) JSONObject.toJavaObject((JSONObject) res.get("data"), SendEventResultDto.class);
+            try {
+                result = (SendEventResultDto) JSONObject.toJavaObject((JSONObject) res.get("data"), SendEventResultDto.class);
+            }catch (Exception e){
+                e.printStackTrace();
+                LOGGER.error("事件上报返回结果处理错误：" + e.getMessage());
+            }
             return result;
         }else{
-            LOGGER.error("事件上报返回信息错误：" + res);
+            try {
-            SendEventResultDto result = (SendEventResultDto) JSONObject.toJavaObject(res, SendEventResultDto.class);
+                result = (SendEventResultDto) JSONObject.toJavaObject(res, SendEventResultDto.class);
+            }catch (Exception e){
+                e.printStackTrace();
+                LOGGER.error("事件上报返回结果处理错误：" + e.getMessage());
+            }
             return result;
         }
     }
@@ -134,6 +147,32 @@ public class ShiBeiCityGridApiImpl implements ShiBeiCityGridApi {
         }
     }
 
+    @Override
+    public List<EventProcessResultDto> getHistoryByRecId(String recId) {
+        String url = ApiConstants.historyUrl +"?recId="+recId;
+        LOGGER.info("获取事件处理进度请求地址:" + url);
+        HttpResponse response = null;
+        try {
+            response = HttpRequest.get(url)
+                    .header("lan", "zh")
+                    .header("Content-type", "application/x-www-form-urlencoded;charset=UTF-8").execute();
+        } catch (Exception e) {
+            e.printStackTrace();
+            LOGGER.error("获取事件处理进度异常：" + e.getMessage());
+        }
+        LOGGER.info("获取事件处理进度返回数据:" + response.body());
+        JSONObject res = JSONObject.parseObject(response.body());
+        List<EventProcessResultDto> result =  null;
+        try {
+            result = JSONArray.parseArray(res.get("HISTORY").toString(), EventProcessResultDto.class);
+        }catch (Exception e){
+            e.printStackTrace();
+            LOGGER.error("获取事件处理结果异常：" + e.getMessage());
+        }
+        return result;
+    }
+
+
     private <T> T requestGird(String requestUrl, Map<String, Object> parmas, Class<T> clazz) {
         try {
             ResultDto result = httpClientUtils.postForm(requestUrl, parmas);

shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/contants/ApiConstants.java

@@ -23,6 +23,11 @@ public class ApiConstants {
      */
     public static final String sendEventUrl = "http://120.221.72.15:8089/sbwgh/plugin/sbwgh/sendEvent.htm";
 
+    /**
+     * 获取事件处理进度
+     */
+    public static final String historyUrl = "http://120.221.72.15:8089/sbwgh/plugin/sbwgh/getHistoryByRecId.htm";
+
     /**
      * 评价事件接口
      */

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

@@ -0,0 +1,83 @@
+package com.elink.esua.epdc.gird.shibei.dto.result;
+
+import com.alibaba.fastjson.annotation.JSONField;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description: 事件办理进度返回结果
+ * @author: wangtong
+ * @create: 2020-12-16 18:51
+ **/
+public class EventProcessResultDto implements Serializable {
+
+    private static final long serialVersionUID = 998896092988887280L;
+
+    /**
+     *
+     */
+    @JSONField(name = "PARTNAME")
+    private String PARTNAME;
+
+    /**
+     *
+     */
+    @JSONField(name = "TASKCNNAME")
+    private String TASKCNNAME;
+
+    /**
+     *
+     */
+    @JSONField(name = "TASKDESC")
+    private String TASKDESC;
+
+    /**
+     *
+     */
+    @JSONField(name = "CREATEDATE")
+    private String CREATEDATE;
+
+
+    public String getPARTNAME() {
+        return PARTNAME;
+    }
+
+    public void setPARTNAME(String PARTNAME) {
+        this.PARTNAME = PARTNAME;
+    }
+
+    public String getTASKCNNAME() {
+        return TASKCNNAME;
+    }
+
+    public void setTASKCNNAME(String TASKCNNAME) {
+        this.TASKCNNAME = TASKCNNAME;
+    }
+
+    public String getTASKDESC() {
+        return TASKDESC;
+    }
+
+    public void setTASKDESC(String TASKDESC) {
+        this.TASKDESC = TASKDESC;
+    }
+
+    public String getCREATEDATE() {
+        return CREATEDATE;
+    }
+
+    public void setCREATEDATE(String CREATEDATE) {
+        this.CREATEDATE = CREATEDATE;
+    }
+
+    @Override
+    public String toString() {
+        return "EventProcessResultDto{" +
+                "PARTNAME='" + PARTNAME + '\'' +
+                ", TASKCNNAME='" + TASKCNNAME + '\'' +
+                ", TASKDESC='" + TASKDESC + '\'' +
+                ", CREATEDATE='" + CREATEDATE + '\'' +
+                '}';
+    }
+}