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 b3064c6..8061ba5 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 @@ -8,10 +8,13 @@ import com.elink.esua.epdc.gird.shibei.dto.form.EventRejectReDoFormDto; 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.EventProcessBatchHisResultDto; import com.elink.esua.epdc.gird.shibei.dto.result.EventProcessHisResultDto; import com.elink.esua.epdc.gird.shibei.dto.result.EventRejectDoResultDto; import com.elink.esua.epdc.gird.shibei.dto.result.SendEventResultDto; +import java.util.List; + /** * 市北城市网格化平台API接口 * @@ -88,6 +91,16 @@ public interface ShiBeiCityGridApi { */ EventProcessHisResultDto getHistoryByRecId(String recId); + /** + * 批量获取事件处理进度 + * + * @param recIds + * @return com.elink.esua.epdc.gird.shibei.dto.result.EventProcessHisResultDto + * @author zhy + * @date 2022/11/1 10:49 + */ + List getBatchHistoryByRecIds(String recIds); + /** * @describe: 驳回上报事件-再次推送到网格化平台 * @author wangtong 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 32f1ca6..b1aff45 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; @@ -12,6 +13,7 @@ import com.elink.esua.epdc.gird.shibei.dto.form.EventRejectReDoFormDto; 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.EventProcessBatchHisResultDto; import com.elink.esua.epdc.gird.shibei.dto.result.EventProcessHisResultDto; import com.elink.esua.epdc.gird.shibei.dto.result.EventRejectDoResultDto; import com.elink.esua.epdc.gird.shibei.dto.result.SendEventResultDto; @@ -26,6 +28,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.io.IOException; +import java.util.ArrayList; +import java.util.List; import java.util.Map; /** @@ -73,9 +77,9 @@ public class ShiBeiCityGridApiImpl implements ShiBeiCityGridApi { public SendEventResultDto sendEvent(SendEventFormDto sendEventFormDto) { String json = JSONObject.toJSONString(sendEventFormDto); // 百分号解析问题 - json.replace("%","％"); - String data = "content="+ json; - LOGGER.info("发送地址："+ApiConstants.sendEventUrl + "||发送参数:" + data); + json.replace("%", "％"); + String data = "content=" + json; + LOGGER.info("发送地址：" + ApiConstants.sendEventUrl + "||发送参数:" + data); HttpResponse response = null; try { response = HttpRequest.post(ApiConstants.sendEventUrl).body(data) @@ -88,18 +92,18 @@ 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())){ + if (0 == Integer.parseInt(res.get("code").toString())) { try { result = JSONObject.toJavaObject((JSONObject) res.get("data"), SendEventResultDto.class); result.setCode("0"); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); LOGGER.error("事件上报返回结果处理错误：" + e.getMessage()); } - }else{ + } else { try { result = JSONObject.toJavaObject(res, SendEventResultDto.class); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); LOGGER.error("事件上报返回结果处理错误：" + e.getMessage()); } @@ -109,8 +113,8 @@ public class ShiBeiCityGridApiImpl implements ShiBeiCityGridApi { @Override public SendEventResultDto sendEventManual(String data) { - data = "content="+ data; - LOGGER.info("发送地址："+ApiConstants.sendEventUrl + "||发送参数:" + data); + data = "content=" + data; + LOGGER.info("发送地址：" + ApiConstants.sendEventUrl + "||发送参数:" + data); HttpResponse response = null; try { response = HttpRequest.post(ApiConstants.sendEventUrl).body(data) @@ -123,18 +127,18 @@ 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())){ + if (0 == Integer.parseInt(res.get("code").toString())) { try { result = JSONObject.toJavaObject((JSONObject) res.get("data"), SendEventResultDto.class); result.setCode("0"); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); LOGGER.error("事件上报返回结果处理错误：" + e.getMessage()); } - }else{ + } else { try { result = JSONObject.toJavaObject(res, SendEventResultDto.class); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); LOGGER.error("事件上报返回结果处理错误：" + e.getMessage()); } @@ -186,7 +190,7 @@ public class ShiBeiCityGridApiImpl implements ShiBeiCityGridApi { @Override public EventProcessHisResultDto getHistoryByRecId(String recId) { - String url = ApiConstants.historyUrl +"?recId="+recId; + String url = ApiConstants.historyUrl + "?recId=" + recId; LOGGER.info("获取事件处理进度请求地址:" + url); HttpResponse response = null; try { @@ -202,18 +206,44 @@ public class ShiBeiCityGridApiImpl implements ShiBeiCityGridApi { EventProcessHisResultDto result = null; try { result = JSONObject.toJavaObject(res, EventProcessHisResultDto.class); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); LOGGER.error("获取事件处理结果异常：" + e.getMessage()); } return result; } + @Override + public List getBatchHistoryByRecIds(String recIds) { + String url = ApiConstants.batchHistoryUrl + "?recIds=" + recIds; + 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()); + JSONArray dataList = JSONObject.parseArray(res.get("data").toString()); + List results = new ArrayList<>(); + try { + results = dataList.toJavaList(EventProcessBatchHisResultDto.class); + } catch (Exception e) { + e.printStackTrace(); + LOGGER.error("获取事件处理结果异常：" + e.getMessage()); + } + return results; + } + @Override public EventRejectDoResultDto sendReDoEvent(EventRejectReDoFormDto rejectReDoDTO) { String json = JSONObject.toJSONString(rejectReDoDTO); - String data = "content="+ json; - LOGGER.info("发送地址："+ApiConstants.sendEventUrl + "||发送参数:" + data); + String data = "content=" + json; + LOGGER.info("发送地址：" + ApiConstants.sendEventUrl + "||发送参数:" + data); HttpResponse response = null; try { response = HttpRequest.post(ApiConstants.sendEventUrl).body(data) @@ -226,18 +256,18 @@ public class ShiBeiCityGridApiImpl implements ShiBeiCityGridApi { LOGGER.info("事件驳回上报返回数据:" + response.body()); JSONObject res = JSONObject.parseObject(response.body()); EventRejectDoResultDto result = null; - if(0 == Integer.parseInt(res.get("code").toString())){ + if (0 == Integer.parseInt(res.get("code").toString())) { try { - result = JSONObject.toJavaObject(res, EventRejectDoResultDto.class); + result = JSONObject.toJavaObject(res, EventRejectDoResultDto.class); result.setCode("0"); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); LOGGER.error("事件驳回上报返回结果处理错误：" + e.getMessage()); } - }else{ + } else { try { result = JSONObject.toJavaObject(res, EventRejectDoResultDto.class); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); LOGGER.error("事件驳回上报返回结果处理错误：" + e.getMessage()); } 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 f47cefd..34fc0ce 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 @@ -19,32 +19,40 @@ public class ApiConstants { public static final String newSendInputInfo = "http://60.209.152.68:8083/CityGridInterfaceServiceWebService1.0/WebService.asmx/SendInputInfo"; /** - * 事件上报信息 + * 评价事件接口 */ - public static final String sendEventUrl = "http://120.221.72.15:8089/sbwgh/plugin/sbwgh/sendEvent.htm"; -// public static final String sendEventUrl = "http://119.3.182.231:8080/sbwgh/plugin/sbwgh/sendEvent.htm"; + public static final String SendWenXinEvaluateInfo = "http://60.209.152.68:8083/SendToCityGrid/WebService.asmx/SendWenXinEvaluateInfo"; /** - * 获取事件处理进度 + * 案件信息查询 */ - public static final String historyUrl = "http://120.221.72.15:8089/sbwgh/plugin/sbwgh/getHistoryByRecId.htm"; -// public static final String historyUrl = "http://119.3.182.231:8080/sbwgh/plugin/sbwgh/getHistoryByRecId.htm"; + public static final String GetZSBInputInfo = "http://60.209.152.68:8083/SendToCityGrid/WebService.asmx/GetZSBInputInfo"; + /** + * 查询办理进度接口 + */ + public static final String SearchCaseProcessByTaskId = "http://60.209.152.68:8083/CityGridInterfaceServiceWebService1.0/WebService.asmx/SearchCaseProcessByTaskId"; /** - * 评价事件接口 + * 网格化平台地址前缀（119测试,120正式） */ - public static final String SendWenXinEvaluateInfo = "http://60.209.152.68:8083/SendToCityGrid/WebService.asmx/SendWenXinEvaluateInfo"; + public static final String WGH_PREFIX = "http://119.3.182.231:8080/sbwgh/plugin/sbwgh/"; +// public static final String WGH_PREFIX = "http://120.221.72.15:8089/sbwgh/plugin/sbwgh/"; /** - * 案件信息查询 + * 事件上报信息 */ - public static final String GetZSBInputInfo = "http://60.209.152.68:8083/SendToCityGrid/WebService.asmx/GetZSBInputInfo"; + public static final String sendEventUrl = WGH_PREFIX + "sendEvent.htm"; /** - * 查询办理进度接口 + * 获取事件处理进度 */ - public static final String SearchCaseProcessByTaskId = "http://60.209.152.68:8083/CityGridInterfaceServiceWebService1.0/WebService.asmx/SearchCaseProcessByTaskId"; + public static final String historyUrl = WGH_PREFIX + "getHistoryByRecId.htm"; + + /** + * 获取事件处理进度（批量） + */ + public static final String batchHistoryUrl = WGH_PREFIX + "getBatchHistory.htm"; /** * 接受网格化平台项目处理结果：结案/驳回 diff --git a/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/result/EventProcessBatchHisResultDto.java b/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/result/EventProcessBatchHisResultDto.java new file mode 100644 index 0000000..20a3d41 --- /dev/null +++ b/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/result/EventProcessBatchHisResultDto.java @@ -0,0 +1,47 @@ +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 EventProcessBatchHisResultDto implements Serializable { + + private static final long serialVersionUID = -8700554713907308891L; + + @JSONField(name = "RECID") + private String RECID; + + @JSONField(name = "HISTORY") + private List HISTORY; + + public List getHISTORY() { + return HISTORY; + } + + public String getRECID() { + return RECID; + } + + public void setHISTORY(List HISTORY) { + this.HISTORY = HISTORY; + } + + public void setRECID(String RECID) { + this.RECID = RECID; + } + + @Override + public String toString() { + return "EventProcessBatchHisResultDto{" + + "RECID='" + RECID + '\'' + + ", HISTORY=" + HISTORY + + '}'; + } +} \ No newline at end of file