diff --git a/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/InterfaceLogBusinessTypeEnum.java b/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/InterfaceLogBusinessTypeEnum.java index db77804..c5d3be9 100644 --- a/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/InterfaceLogBusinessTypeEnum.java +++ b/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/InterfaceLogBusinessTypeEnum.java @@ -10,7 +10,8 @@ public enum InterfaceLogBusinessTypeEnum { PULL_ITEM_HANDLE_PROCESS("2", "查询网格化平台处理情况"), SYNC_TASK_DISPATCH("3","派遣"), SYNC_TASK_END("4","结案"), - ACCEPT_ITEM_PROCESS("5","接受网格化平台项目处理结果"); + ACCEPT_ITEM_PROCESS("5","接受网格化平台项目处理结果"), + REJECT_RE_DO("6","驳回重办"); private String value; private String name; 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 65f55d0..5a40f68 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 @@ -4,10 +4,12 @@ package com.elink.esua.epdc.gird.shibei.api; import com.elink.esua.epdc.gird.shibei.dto.GetZSBInputInfoDto; import com.elink.esua.epdc.gird.shibei.dto.GridDto; import com.elink.esua.epdc.gird.shibei.dto.SearchCaseProcessByTaskIdDto; +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.EventProcessHisResultDto; +import com.elink.esua.epdc.gird.shibei.dto.result.EventRejectDoResultDto; import com.elink.esua.epdc.gird.shibei.dto.result.SendEventResultDto; /** @@ -75,4 +77,13 @@ public interface ShiBeiCityGridApi { * @return com.elink.esua.epdc.gird.shibei.dto.result.EventProcessHisResultDto */ EventProcessHisResultDto getHistoryByRecId(String recId); + + /** + * @describe: 驳回上报事件-再次推送到网格化平台 + * @author wangtong + * @date 2022/9/13 13:52 + * @params [sendEventFormDto] + * @return com.elink.esua.epdc.gird.shibei.dto.result.EventRejectDoResultDto + */ + EventRejectDoResultDto sendReDoEvent(EventRejectReDoFormDto rejectReDoDTO); } 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 3554ade..837c85e 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 @@ -8,10 +8,12 @@ import com.elink.esua.epdc.gird.shibei.contants.ApiConstants; import com.elink.esua.epdc.gird.shibei.dto.GetZSBInputInfoDto; import com.elink.esua.epdc.gird.shibei.dto.GridDto; import com.elink.esua.epdc.gird.shibei.dto.SearchCaseProcessByTaskIdDto; +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.EventProcessHisResultDto; +import com.elink.esua.epdc.gird.shibei.dto.result.EventRejectDoResultDto; 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; @@ -171,6 +173,43 @@ public class ShiBeiCityGridApiImpl implements ShiBeiCityGridApi { return result; } + @Override + public EventRejectDoResultDto sendReDoEvent(EventRejectReDoFormDto rejectReDoDTO) { + String json = JSONObject.toJSONString(rejectReDoDTO); + String data = "content="+ json; + LOGGER.info("发送参数:" + data); + LOGGER.info("发送地址："+ApiConstants.sendEventUrl); + HttpResponse response = null; + try { + response = HttpRequest.post(ApiConstants.sendEventUrl).body(data) + .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()); + EventRejectDoResultDto result = null; + if(0 == Integer.parseInt(res.get("code").toString())){ + try { + result = JSONObject.toJavaObject(res, EventRejectDoResultDto.class); + result.setCode("0"); + }catch (Exception e){ + e.printStackTrace(); + LOGGER.error("事件驳回上报返回结果处理错误：" + e.getMessage()); + } + }else{ + try { + result = JSONObject.toJavaObject(res, EventRejectDoResultDto.class); + }catch (Exception e){ + e.printStackTrace(); + LOGGER.error("事件驳回上报返回结果处理错误：" + e.getMessage()); + } + } + return result; + } + private T requestGird(String requestUrl, Map parmas, Class clazz) { try { diff --git a/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/form/EventRejectReDoFormDto.java b/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/form/EventRejectReDoFormDto.java new file mode 100644 index 0000000..739df84 --- /dev/null +++ b/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/form/EventRejectReDoFormDto.java @@ -0,0 +1,80 @@ +package com.elink.esua.epdc.gird.shibei.dto.form; + +import com.alibaba.fastjson.annotation.JSONField; + +import java.io.Serializable; +import java.util.List; + +/** + * @program: esua-epdc + * @description: 事件驳回重办信息 + * @author: wangtong + * @create: 2020-12-15 15:14 + **/ +public class EventRejectReDoFormDto implements Serializable { + + private static final long serialVersionUID = 8360383317020883379L; + + /** + *推送类型，驳回重办的固定值： + */ + @JSONField(name = "SENDTYPE") + private String SENDTYPE = "BHCB"; + + + /** + *唯一标识 + */ + @JSONField(name = "RECID") + private String RECID; + + /** + *图片 + */ + @JSONField(name = "IMAGES") + private List IMAGES; + + private List handleList; + + public String getSENDTYPE() { + return SENDTYPE; + } + + public void setSENDTYPE(String SENDTYPE) { + this.SENDTYPE = SENDTYPE; + } + + public String getRECID() { + return RECID; + } + + public void setRECID(String RECID) { + this.RECID = RECID; + } + + public List getIMAGES() { + return IMAGES; + } + + public void setIMAGES(List IMAGES) { + this.IMAGES = IMAGES; + } + + public List getHandleList() { + return handleList; + } + + public void setHandleList(List handleList) { + this.handleList = handleList; + } + + @Override + public String toString() { + return "EventRejectReDoFormDto{" + + "SENDTYPE='" + SENDTYPE + '\'' + + ", RECID='" + RECID + '\'' + + ", IMAGES=" + IMAGES + + ", handleList=" + handleList + + '}'; + } +} diff --git a/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/result/EventRejectDoResultDto.java b/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/result/EventRejectDoResultDto.java new file mode 100644 index 0000000..5109d8e --- /dev/null +++ b/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/result/EventRejectDoResultDto.java @@ -0,0 +1,61 @@ +package com.elink.esua.epdc.gird.shibei.dto.result; + +import java.io.Serializable; + +/** + * @program: esua-epdc + * @description: 事件上报返回信息 + * @author: wangtong + * @create: 2020-12-16 09:36 + **/ +public class EventRejectDoResultDto implements Serializable { + + private static final long serialVersionUID = 3306121784989678594L; + + + /** + * 请求状态码，0为成功，-1为失败 + */ + private String code; + + /** + * 请求消息 + */ + private String message; + + + private Object data; + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public Object getData() { + return data; + } + + public void setData(Object data) { + this.data = data; + } + + @Override + public String toString() { + return "EventRejectDoResultDto{" + + "code='" + code + '\'' + + ", message='" + message + '\'' + + ", data=" + data + + '}'; + } +}