From 433684cb3a9b859263d615ec17a093a110fb2efd Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 16 Dec 2020 19:22:34 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E3=80=91-=E3=80=90=E8=8E=B7=E5=8F=96=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=A4=84=E7=90=86=E8=BF=9B=E5=BA=A6=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?-=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/12/16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gird/shibei/api/ShiBeiCityGridApi.java | 12 +++ .../api/impl/ShiBeiCityGridApiImpl.java | 45 +++++++++- .../gird/shibei/contants/ApiConstants.java | 5 ++ .../dto/result/EventProcessResultDto.java | 83 +++++++++++++++++++ 4 files changed, 142 insertions(+), 3 deletions(-) create mode 100644 shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/result/EventProcessResultDto.java diff --git a/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/api/ShiBeiCityGridApi.java b/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/api/ShiBeiCityGridApi.java index 9327a59..6cba9f8 100644 --- a/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/api/ShiBeiCityGridApi.java +++ b/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 getHistoryByRecId(String recId); } diff --git a/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/api/impl/ShiBeiCityGridApiImpl.java b/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/api/impl/ShiBeiCityGridApiImpl.java index 0d4bd62..7ded34a 100644 --- a/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/api/impl/ShiBeiCityGridApiImpl.java +++ b/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); - SendEventResultDto result = (SendEventResultDto) JSONObject.toJavaObject(res, SendEventResultDto.class); + try { + 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 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 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 requestGird(String requestUrl, Map parmas, Class clazz) { try { ResultDto result = httpClientUtils.postForm(requestUrl, parmas); diff --git a/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/contants/ApiConstants.java b/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/contants/ApiConstants.java index ca2875b..8968e06 100644 --- a/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/contants/ApiConstants.java +++ b/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"; + /** * 评价事件接口 */ diff --git a/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/result/EventProcessResultDto.java b/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/result/EventProcessResultDto.java new file mode 100644 index 0000000..22f3d91 --- /dev/null +++ b/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 + '\'' + + '}'; + } +} \ No newline at end of file