diff --git a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/api/ShiBeiCityGridApi.java b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/api/ShiBeiCityGridApi.java similarity index 73% rename from esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/api/ShiBeiCityGridApi.java rename to esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/api/ShiBeiCityGridApi.java index 1b50e2483..7e78b3ca5 100644 --- a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/api/ShiBeiCityGridApi.java +++ b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/api/ShiBeiCityGridApi.java @@ -1,10 +1,11 @@ -package com.elink.esua.gird.shibei.api; +package com.elink.esua.epdc.gird.shibei.api; -import com.elink.esua.gird.shibei.dto.GetZSBInputInfoDto; -import com.elink.esua.gird.shibei.dto.GridDto; -import com.elink.esua.gird.shibei.dto.SearchCaseProcessByTaskIdDto; -import com.elink.esua.gird.shibei.dto.form.SendInputInfoFormDto; -import com.elink.esua.gird.shibei.dto.form.SendWenXinEvaluateInfoFormDto; + +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.SendInputInfoFormDto; +import com.elink.esua.epdc.gird.shibei.dto.form.SendWenXinEvaluateInfoFormDto; /** * 市北城市网格化平台API接口 diff --git a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/api/impl/ShiBeiCityGridApiImpl.java b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/api/impl/ShiBeiCityGridApiImpl.java similarity index 88% rename from esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/api/impl/ShiBeiCityGridApiImpl.java rename to esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/api/impl/ShiBeiCityGridApiImpl.java index f145c260d..870c0e151 100644 --- a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/api/impl/ShiBeiCityGridApiImpl.java +++ b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/api/impl/ShiBeiCityGridApiImpl.java @@ -1,13 +1,13 @@ -package com.elink.esua.gird.shibei.api.impl; +package com.elink.esua.epdc.gird.shibei.api.impl; -import com.elink.esua.gird.shibei.api.ShiBeiCityGridApi; -import com.elink.esua.gird.shibei.contants.ApiConstants; -import com.elink.esua.gird.shibei.dto.GetZSBInputInfoDto; -import com.elink.esua.gird.shibei.dto.GridDto; -import com.elink.esua.gird.shibei.dto.SearchCaseProcessByTaskIdDto; -import com.elink.esua.gird.shibei.dto.form.SendInputInfoFormDto; -import com.elink.esua.gird.shibei.dto.form.SendWenXinEvaluateInfoFormDto; -import com.elink.esua.gird.shibei.util.XstreamUtil; +import com.elink.esua.epdc.gird.shibei.api.ShiBeiCityGridApi; +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.SendInputInfoFormDto; +import com.elink.esua.epdc.gird.shibei.dto.form.SendWenXinEvaluateInfoFormDto; +import com.elink.esua.epdc.gird.shibei.util.XstreamUtil; import com.elink.esua.httpclient.HttpClientUtils; import com.elink.esua.httpclient.ResultDto; import com.google.common.collect.Maps; diff --git a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/constant/CommonConstants.java b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/constant/CommonConstants.java similarity index 93% rename from esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/constant/CommonConstants.java rename to esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/constant/CommonConstants.java index fb6797bd6..55e25e6ec 100644 --- a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/constant/CommonConstants.java +++ b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/constant/CommonConstants.java @@ -1,4 +1,4 @@ -package com.elink.esua.gird.shibei.constant; +package com.elink.esua.epdc.gird.shibei.constant; /** * 定义公用常量 diff --git a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/contants/ApiConstants.java b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/contants/ApiConstants.java similarity index 95% rename from esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/contants/ApiConstants.java rename to esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/contants/ApiConstants.java index dc228463a..866e2928b 100644 --- a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/contants/ApiConstants.java +++ b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/contants/ApiConstants.java @@ -1,4 +1,4 @@ -package com.elink.esua.gird.shibei.contants; +package com.elink.esua.epdc.gird.shibei.contants; /** * webservice API接口地址常量 diff --git a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/contants/ResponseConstants.java b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/contants/ResponseConstants.java similarity index 80% rename from esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/contants/ResponseConstants.java rename to esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/contants/ResponseConstants.java index 4ec57d6cd..e6ac9e356 100644 --- a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/contants/ResponseConstants.java +++ b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/contants/ResponseConstants.java @@ -1,4 +1,4 @@ -package com.elink.esua.gird.shibei.contants; +package com.elink.esua.epdc.gird.shibei.contants; /** * 响应常量 diff --git a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/GetZSBInputInfoDto.java b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/GetZSBInputInfoDto.java similarity index 50% rename from esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/GetZSBInputInfoDto.java rename to esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/GetZSBInputInfoDto.java index 204b8d751..3dee296b3 100644 --- a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/GetZSBInputInfoDto.java +++ b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/GetZSBInputInfoDto.java @@ -1,4 +1,4 @@ -package com.elink.esua.gird.shibei.dto; +package com.elink.esua.epdc.gird.shibei.dto; import com.thoughtworks.xstream.annotations.XStreamAlias; @@ -14,13 +14,13 @@ import java.util.List; public class GetZSBInputInfoDto { @XStreamAlias("request") - private List request; + private List request; - public List getRequest() { + public List getRequest() { return request; } - public void setRequest(List request) { + public void setRequest(List request) { this.request = request; } } diff --git a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/GetZSBInputInfoItemDto.java b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/GetZSBInputInfoItemDto.java similarity index 98% rename from esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/GetZSBInputInfoItemDto.java rename to esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/GetZSBInputInfoItemDto.java index c17abff72..ea0516fbc 100644 --- a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/GetZSBInputInfoItemDto.java +++ b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/GetZSBInputInfoItemDto.java @@ -1,4 +1,4 @@ -package com.elink.esua.gird.shibei.dto; +package com.elink.esua.epdc.gird.shibei.dto; import com.thoughtworks.xstream.annotations.XStreamAlias; diff --git a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/GridDto.java b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/GridDto.java similarity index 96% rename from esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/GridDto.java rename to esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/GridDto.java index aa7a2ff3d..194001bd1 100644 --- a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/GridDto.java +++ b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/GridDto.java @@ -1,4 +1,4 @@ -package com.elink.esua.gird.shibei.dto; +package com.elink.esua.epdc.gird.shibei.dto; import com.thoughtworks.xstream.annotations.XStreamAlias; diff --git a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/SearchCaseProcessByTaskIdDto.java b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/SearchCaseProcessByTaskIdDto.java similarity index 54% rename from esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/SearchCaseProcessByTaskIdDto.java rename to esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/SearchCaseProcessByTaskIdDto.java index 630aaac6a..a23c6c4b5 100644 --- a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/SearchCaseProcessByTaskIdDto.java +++ b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/SearchCaseProcessByTaskIdDto.java @@ -1,4 +1,4 @@ -package com.elink.esua.gird.shibei.dto; +package com.elink.esua.epdc.gird.shibei.dto; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamImplicit; @@ -15,13 +15,13 @@ import java.util.List; public class SearchCaseProcessByTaskIdDto { @XStreamImplicit(itemFieldName = "request") - List request; + List request; - public List getRequest() { + public List getRequest() { return request; } - public void setRequest(List request) { + public void setRequest(List request) { this.request = request; } } diff --git a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/SearchCaseProcessByTaskIdItemDto.java b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/SearchCaseProcessByTaskIdItemDto.java similarity index 97% rename from esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/SearchCaseProcessByTaskIdItemDto.java rename to esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/SearchCaseProcessByTaskIdItemDto.java index fc783d6d8..91d380960 100644 --- a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/SearchCaseProcessByTaskIdItemDto.java +++ b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/SearchCaseProcessByTaskIdItemDto.java @@ -1,4 +1,4 @@ -package com.elink.esua.gird.shibei.dto; +package com.elink.esua.epdc.gird.shibei.dto; import com.thoughtworks.xstream.annotations.XStreamAlias; diff --git a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/form/ImageFile.java b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/form/ImageFile.java similarity index 56% rename from esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/form/ImageFile.java rename to esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/form/ImageFile.java index 6bdce6bdc..7a1d4ccf8 100644 --- a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/form/ImageFile.java +++ b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/form/ImageFile.java @@ -1,4 +1,4 @@ -package com.elink.esua.gird.shibei.dto.form; +package com.elink.esua.epdc.gird.shibei.dto.form; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamImplicit; @@ -16,13 +16,13 @@ import java.util.List; public class ImageFile { @XStreamImplicit(itemFieldName = "File") - private List reportFileList; + private List reportFileList; - public List getReportFileList() { + public List getReportFileList() { return reportFileList; } - public void setReportFileList(List reportFileList) { + public void setReportFileList(List reportFileList) { this.reportFileList = reportFileList; } } diff --git a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/form/ReportFile.java b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/form/ReportFile.java similarity index 94% rename from esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/form/ReportFile.java rename to esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/form/ReportFile.java index b961bec38..0a27ba813 100644 --- a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/form/ReportFile.java +++ b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/form/ReportFile.java @@ -1,4 +1,4 @@ -package com.elink.esua.gird.shibei.dto.form; +package com.elink.esua.epdc.gird.shibei.dto.form; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; diff --git a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/form/SendInputInfoFormDto.java b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/form/SendInputInfoFormDto.java similarity index 95% rename from esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/form/SendInputInfoFormDto.java rename to esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/form/SendInputInfoFormDto.java index f2923b11b..f1f98fb5b 100644 --- a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/form/SendInputInfoFormDto.java +++ b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/form/SendInputInfoFormDto.java @@ -1,4 +1,4 @@ -package com.elink.esua.gird.shibei.dto.form; +package com.elink.esua.epdc.gird.shibei.dto.form; import com.thoughtworks.xstream.annotations.XStreamAlias; @@ -148,7 +148,7 @@ public class SendInputInfoFormDto implements Serializable { * 多媒体声音 */ @XStreamAlias("WaveFile") - private WaveFile waveFile; + private com.elink.esua.epdc.gird.shibei.dto.form.WaveFile waveFile; /** * 必填 @@ -345,11 +345,11 @@ public class SendInputInfoFormDto implements Serializable { this.imageFile = imageFile; } - public WaveFile getWaveFile() { + public com.elink.esua.epdc.gird.shibei.dto.form.WaveFile getWaveFile() { return waveFile; } - public void setWaveFile(WaveFile waveFile) { + public void setWaveFile(com.elink.esua.epdc.gird.shibei.dto.form.WaveFile waveFile) { this.waveFile = waveFile; } } diff --git a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/form/SendWenXinEvaluateInfoFormDto.java b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/form/SendWenXinEvaluateInfoFormDto.java similarity index 94% rename from esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/form/SendWenXinEvaluateInfoFormDto.java rename to esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/form/SendWenXinEvaluateInfoFormDto.java index 750c0c45b..afc56cec8 100644 --- a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/form/SendWenXinEvaluateInfoFormDto.java +++ b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/form/SendWenXinEvaluateInfoFormDto.java @@ -1,4 +1,4 @@ -package com.elink.esua.gird.shibei.dto.form; +package com.elink.esua.epdc.gird.shibei.dto.form; import java.io.Serializable; diff --git a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/form/WaveFile.java b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/form/WaveFile.java similarity index 92% rename from esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/form/WaveFile.java rename to esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/form/WaveFile.java index 7587d9a00..d1b3eec00 100644 --- a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/form/WaveFile.java +++ b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/form/WaveFile.java @@ -1,4 +1,4 @@ -package com.elink.esua.gird.shibei.dto.form; +package com.elink.esua.epdc.gird.shibei.dto.form; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamImplicit; diff --git a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/util/XstreamUtil.java b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/util/XstreamUtil.java similarity index 96% rename from esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/util/XstreamUtil.java rename to esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/util/XstreamUtil.java index ce9d9fc67..65fdd2e75 100644 --- a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/util/XstreamUtil.java +++ b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/util/XstreamUtil.java @@ -1,4 +1,4 @@ -package com.elink.esua.gird.shibei.util; +package com.elink.esua.epdc.gird.shibei.util; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.io.xml.DomDriver; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemGridPlatformDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemGridPlatformDTO.java index 3855bf9d0..ca0a0df1d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemGridPlatformDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemGridPlatformDTO.java @@ -51,7 +51,7 @@ public class ItemGridPlatformDTO implements Serializable { /** * 上报人部门ID */ - private Integer reportPersonDeptId; + private Long reportPersonDeptId; /** * 状态 15-网格化平台-上报，20-网格化平台-受理，25-网格化平台-立案，30-网格化平台-派遣，35-网格化平台-中间再派，40-网格化平台-接单，45-网格化平台-处理，50-网格化平台-中间督办，55-网格化平台-催办，55-网格化平台-结案 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemGridPlatformEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemGridPlatformEntity.java index 409c5b269..639fd358d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemGridPlatformEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemGridPlatformEntity.java @@ -51,7 +51,7 @@ public class ItemGridPlatformEntity extends BaseEpdcEntity { /** * 上报人部门ID */ - private Integer reportPersonDeptId; + private Long reportPersonDeptId; /** * 状态 15-网格化平台-上报，20-网格化平台-受理，25-网格化平台-立案，30-网格化平台-派遣，35-网格化平台-中间再派，40-网格化平台-接单，45-网格化平台-处理，50-网格化平台-中间督办，55-网格化平台-催办，55-网格化平台-结案 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 591969104..6e97bcdba 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -49,6 +49,14 @@ import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.*; import com.elink.esua.epdc.enums.ItemGridPlatformHandleStatusEnum; import com.elink.esua.epdc.enums.ItemHandleCategoryEnum; +import com.elink.esua.epdc.gird.shibei.api.ShiBeiCityGridApi; +import com.elink.esua.epdc.gird.shibei.constant.CommonConstants; +import com.elink.esua.epdc.gird.shibei.contants.ApiConstants; +import com.elink.esua.epdc.gird.shibei.dto.GridDto; +import com.elink.esua.epdc.gird.shibei.dto.form.ImageFile; +import com.elink.esua.epdc.gird.shibei.dto.form.ReportFile; +import com.elink.esua.epdc.gird.shibei.dto.form.SendInputInfoFormDto; +import com.elink.esua.epdc.gird.shibei.util.XstreamUtil; import com.elink.esua.epdc.modules.async.NewsTask; import com.elink.esua.epdc.modules.events.dao.ImgDao; import com.elink.esua.epdc.modules.events.entity.ImgEntity; @@ -61,13 +69,6 @@ import com.elink.esua.epdc.modules.issue.service.IssueService; import com.elink.esua.epdc.modules.item.dao.ItemDao; import com.elink.esua.epdc.modules.item.entity.*; import com.elink.esua.epdc.modules.item.service.*; -import com.elink.esua.gird.shibei.api.ShiBeiCityGridApi; -import com.elink.esua.gird.shibei.constant.CommonConstants; -import com.elink.esua.gird.shibei.contants.ApiConstants; -import com.elink.esua.gird.shibei.dto.GridDto; -import com.elink.esua.gird.shibei.dto.form.ImageFile; -import com.elink.esua.gird.shibei.dto.form.SendInputInfoFormDto; -import com.elink.esua.gird.shibei.util.XstreamUtil; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -598,20 +599,20 @@ public class ItemServiceImpl extends BaseServiceImpl implem } else if (ItemHandleCategoryEnum.HANDLE_REPORT.getValue() == dto.getHandleCategory()) { handleProcessEntity.setState(dto.getHandleCategory()); informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_REPORT); - GridDto gridDto=null; - try{ - gridDto=this.reportCase(dto); - }catch(Exception e){ - return new Result().error("上报网格化平台接口失败"+e.getMessage()); + GridDto gridDto = null; + try { + gridDto = this.reportCase(dto); + } catch (Exception e) { + return new Result().error("上报网格化平台接口失败" + e.getMessage()); } - if (null == gridDto||!("0").equals(gridDto.getReturnCode())) { + if (null == gridDto || !("0").equals(gridDto.getReturnCode())) { // 接口没有返回信息，也没有异常信息 - return new Result().error("上报网格化平台接口失败"+gridDto.getReturnDescription()); + return new Result().error("上报网格化平台接口失败" + gridDto.getReturnDescription()); } // 记录处理记录 itemHandleProcessService.insert(handleProcessEntity); // 记录平台上报信息 - this.saveItemGridPlatformInfo(gridDto,handleProcessEntity); + this.saveItemGridPlatformInfo(gridDto, handleProcessEntity); } else { handleProcessEntity.setState(dto.getHandleCategory()); // 更新项目状态 @@ -862,25 +863,25 @@ public class ItemServiceImpl extends BaseServiceImpl implem * @Date 2019/12/25 13:00 **/ private GridDto reportCase(ItemHandleSubmitFormDTO dto) throws Exception { - ItemEntity entity = baseDao.selectById(dto.getId()); - // 组装上报信息 - SendInputInfoFormDto sendInputInfoFormDto = packageReportEntity(entity); - // 接口请求返回实体，getReturnCode 1失败 0成功（非空） - GridDto gridDto = shiBeiCityGridApi.newSendInputInfo(sendInputInfoFormDto); - // 保存接口调用日志 - InterfaceLogEntity interfaceLogEntity = new InterfaceLogEntity(); - interfaceLogEntity.setReferenceId(dto.getId()); - interfaceLogEntity.setBusinessType(InterfaceLogBusinessTypeEnum.REPORT_ITEM.getValue()); - interfaceLogEntity.setInterfaceName(ApiConstants.newSendInputInfo); + ItemEntity entity = baseDao.selectById(dto.getId()); + // 组装上报信息 + SendInputInfoFormDto sendInputInfoFormDto = packageReportEntity(entity); + // 接口请求返回实体，getReturnCode 1失败 0成功（非空） + GridDto gridDto = shiBeiCityGridApi.newSendInputInfo(sendInputInfoFormDto); + // 保存接口调用日志 + InterfaceLogEntity interfaceLogEntity = new InterfaceLogEntity(); + interfaceLogEntity.setReferenceId(dto.getId()); + interfaceLogEntity.setBusinessType(InterfaceLogBusinessTypeEnum.REPORT_ITEM.getValue()); + interfaceLogEntity.setInterfaceName(ApiConstants.newSendInputInfo); if ("1".equals(gridDto.getReturnCode())) {//保存结果 1失败 0成功（非空） interfaceLogEntity.setSuccessFlag(YesOrNoEnum.NO.value()); } else if ("0".equals(gridDto.getReturnCode())) { interfaceLogEntity.setSuccessFlag(YesOrNoEnum.YES.value()); } - interfaceLogEntity.setCallMsgBody(XstreamUtil.objectToXml(sendInputInfoFormDto)); - interfaceLogEntity.setReturnMsgBody(XstreamUtil.objectToXml(gridDto)); - interfaceLogService.insert(interfaceLogEntity); - return gridDto; + interfaceLogEntity.setCallMsgBody(XstreamUtil.objectToXml(sendInputInfoFormDto)); + interfaceLogEntity.setReturnMsgBody(XstreamUtil.objectToXml(gridDto)); + interfaceLogService.insert(interfaceLogEntity); + return gridDto; } /** @@ -908,9 +909,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 发生地址 formDto.setStandardAddress(itemEntity.getIssueAddress()); // 问题描述 - formDto.setDescription("测试999勿删谢谢");// itemEntity.getItemContent() + formDto.setDescription(itemEntity.getItemContent());// 测试999勿删谢谢 // 反映人 - formDto.setReportPerson("测试人员");// itemEntity.getNickName() + formDto.setReportPerson(itemEntity.getNickName());// itemEntity.getNickName()测试人员 // 联系方式 formDto.setContactMode(itemEntity.getMobile()); // 坐标X @@ -922,7 +923,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 操作时间 formDto.setInsertTime(new Date()); // 操作人 - formDto.setInsertUser("尹作梅");// user.getRealName() + formDto.setInsertUser(user.getRealName());// // 外系统编号 formDto.setHotLinesn(itemEntity.getId()); // 先查询网格对应街道id @@ -949,13 +950,13 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (null != imageList && !imageList.isEmpty()) { String url = null; String filename = null; - com.elink.esua.gird.shibei.dto.form.ReportFile reportFile = null; - List reportFiles = new ArrayList<>(); + ReportFile reportFile = null; + List reportFiles = new ArrayList<>(); for (ImgEntity image : imageList) { url = image.getImgUrl(); if (org.apache.commons.lang.StringUtils.isNotBlank(url)) { filename = url.substring(url.lastIndexOf(CommonConstants.CHAR_ASCII_47) + CommonConstants.NUMBER_ONE); - reportFile = new com.elink.esua.gird.shibei.dto.form.ReportFile(); + reportFile = new ReportFile(); reportFile.setName(filename); reportFile.setUrl(url); reportFile.setBase64string(""); @@ -977,25 +978,25 @@ public class ItemServiceImpl extends BaseServiceImpl implem * @Description * @Date 2019/12/25 15:29 **/ - private void saveItemGridPlatformInfo(GridDto gridDto, ItemHandleProcessEntity handleProcessEntity) { - UserDetail user = SecurityUser.getUser(); - ItemGridPlatformEntity itemGridPlatformEntity = new ItemGridPlatformEntity(); - itemGridPlatformEntity.setReferenceId(handleProcessEntity.getItemId()); - itemGridPlatformEntity.setTaskid(gridDto.getTaskId()); - itemGridPlatformEntity.setReportPersonDeptId(Integer.valueOf(String.valueOf(user.getDeptId()))); - itemGridPlatformEntity.setStatus(ItemGridPlatformHandleStatusEnum.HANDLE_SB.getValue()); - itemGridPlatformService.insert(itemGridPlatformEntity); - - GridPlatformHandleLogEntity logEntity = new GridPlatformHandleLogEntity(); - logEntity.setItemGridPlatformId(itemGridPlatformEntity.getId()); - logEntity.setStatus(ItemGridPlatformHandleStatusEnum.HANDLE_SB.getValue()); - logEntity.setItemHandleProcessId(handleProcessEntity.getItemId()); - logEntity.setHandler(user.getRealName()); - logEntity.setHandlingOpinions(handleProcessEntity.getHandleAdvice()); - logEntity.setHandlingDept(handleProcessEntity.getHandlerDept()); - logEntity.setHandlingTime(handleProcessEntity.getCreatedTime()); - gridPlatformHandleLogService.insert(logEntity); - } + private void saveItemGridPlatformInfo(GridDto gridDto, ItemHandleProcessEntity handleProcessEntity) { + UserDetail user = SecurityUser.getUser(); + ItemGridPlatformEntity itemGridPlatformEntity = new ItemGridPlatformEntity(); + itemGridPlatformEntity.setReferenceId(handleProcessEntity.getItemId()); + itemGridPlatformEntity.setTaskid(gridDto.getTaskId()); + itemGridPlatformEntity.setReportPersonDeptId(user.getDeptId()); + itemGridPlatformEntity.setStatus(ItemGridPlatformHandleStatusEnum.HANDLE_SB.getValue()); + itemGridPlatformService.insert(itemGridPlatformEntity); + + GridPlatformHandleLogEntity logEntity = new GridPlatformHandleLogEntity(); + logEntity.setItemGridPlatformId(itemGridPlatformEntity.getId()); + logEntity.setStatus(ItemGridPlatformHandleStatusEnum.HANDLE_SB.getValue()); + logEntity.setItemHandleProcessId(handleProcessEntity.getItemId()); + logEntity.setHandler(user.getRealName()); + logEntity.setHandlingOpinions(handleProcessEntity.getHandleAdvice()); + logEntity.setHandlingDept(handleProcessEntity.getHandlerDept()); + logEntity.setHandlingTime(handleProcessEntity.getCreatedTime()); + gridPlatformHandleLogService.insert(logEntity); + } @Override