From d6ea89e9ab9fc9f025b7b34954b1cabbc808324a Mon Sep 17 00:00:00 2001 From: HAHA <1824278510@qq.com> Date: Mon, 19 Sep 2022 13:43:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=89=E6=B1=82=E5=A4=84=E7=90=86,=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/constant/PushToCityGridConstant.java | 5 ++ .../item/result/AppealHandlingResultDTO.java | 52 +++++++++++++++++++ .../item/result/AppealReportResultDTO.java | 4 +- .../item/result/DispatchAuditResultDto.java | 4 +- .../item/result/ReportRejectionResultDTO.java | 4 +- .../item/dao/ItemHandleProcessDao.java | 7 +++ .../item/service/PushToCityGridService.java | 10 +++- .../impl/PushToCityGridServiceImpl.java | 46 ++++++++++++++-- .../mapper/item/ItemHandleProcessDao.xml | 11 ++++ 9 files changed, 136 insertions(+), 7 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealHandlingResultDTO.java diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java index 2c25be7cd..da9f21ca9 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java @@ -47,6 +47,11 @@ public interface PushToCityGridConstant { */ public final static String REPORT_REBUT = "http://ip:port/case/ reportRebut"; + /** + * 诉求处理 + */ + public final static String HANDLE = "http://ip:port/case/ handle"; + /** * 诉求废弃 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealHandlingResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealHandlingResultDTO.java new file mode 100644 index 000000000..62643c860 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealHandlingResultDTO.java @@ -0,0 +1,52 @@ +package com.elink.esua.epdc.dto.item.result; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@NoArgsConstructor +@Data +public class AppealHandlingResultDTO { + + @JsonProperty("sqid") + private String sqid; + @JsonProperty("sqzt") + private String sqzt; + @JsonProperty("dqclhj") + private String dqclhj; + @JsonProperty("sqlx") + private String sqlx; + @JsonProperty("czr") + private CzrDTO czr; + @JsonProperty("czsj") + private Date czsj; + @JsonProperty("cznr") + private String cznr; + @JsonProperty("clzp") + private String clzp; + @JsonProperty("hyjy") + private String hyjy; + @JsonProperty("zrfg") + private String zrfg; + @JsonProperty("bljd") + private String bljd; + + @NoArgsConstructor + @Data + public static class CzrDTO { + @JsonProperty("id") + private String id; + @JsonProperty("xm") + private String xm; + @JsonProperty("ssjgid") + private String ssjgid; + @JsonProperty("ssjgmc") + private String ssjgmc; + @JsonProperty("ssbmid") + private String ssbmid; + @JsonProperty("ssbmmc") + private String ssbmmc; + } +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealReportResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealReportResultDTO.java index 55054cc53..54302fd7f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealReportResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealReportResultDTO.java @@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Date; + @NoArgsConstructor @Data public class AppealReportResultDTO { @@ -17,7 +19,7 @@ public class AppealReportResultDTO { @JsonProperty("czr") private CzrDTO czr; @JsonProperty("czsj") - private String czsj; + private Date czsj; @JsonProperty("cznr") private String cznr; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DispatchAuditResultDto.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DispatchAuditResultDto.java index 7d28fe3a2..add69007d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DispatchAuditResultDto.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/DispatchAuditResultDto.java @@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Date; + @NoArgsConstructor @Data public class DispatchAuditResultDto { @@ -17,7 +19,7 @@ public class DispatchAuditResultDto { @JsonProperty("czr") private CzrDTO czr; @JsonProperty("czsj") - private String czsj; + private Date czsj; @JsonProperty("shjg") private String shjg; @JsonProperty("cznr") diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportRejectionResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportRejectionResultDTO.java index 35f5615e8..2be5b4517 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportRejectionResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportRejectionResultDTO.java @@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Date; + @NoArgsConstructor @Data public class ReportRejectionResultDTO { @@ -17,7 +19,7 @@ public class ReportRejectionResultDTO { @JsonProperty("czr") private CzrDTO czr; @JsonProperty("czsj") - private String czsj; + private Date czsj; @JsonProperty("cznr") private String cznr; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java index 3fc8ef8af..c6e408174 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java @@ -121,4 +121,11 @@ public interface ItemHandleProcessDao extends BaseDao { * @return */ List getReportRejection(String state); + + /** + * 诉求处理 + * @param state + * @return + */ + List getAppealHandling(String state); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java index 5db0cdb71..8848e900f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java @@ -126,5 +126,13 @@ public interface PushToCityGridService { */ void ReportRejection(); - + /** + * 诉求处理 + * + * @param + * @return void + * @author LZN + * @date 2022/9/19 11:01 + */ + void AppealHandling(); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java index a80598c9a..1475e5cde 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java @@ -235,7 +235,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { // 当前处理环节 data.setDqclhj(""); // 审核时间 - data.setCzsj(new Date().toString()); + data.setCzsj(item.getCreatedTime()); // 审核结果 data.setShjg(""); // 审核意见 @@ -322,7 +322,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { // 当前处理环节 data.setDqclhj(CityPushLinkEnum.SQ_CL.getCode()); // 上报时间 - data.setCzsj(new Date().toString()); + data.setCzsj(item.getCreatedTime()); // 上报原因 data.setCznr(""); @@ -360,7 +360,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { // 当前处理环节 data.setDqclhj(""); // 驳回时间 - data.setCzsj(new Date().toString()); + data.setCzsj(item.getCreatedTime()); // 驳回原因 data.setCznr(""); @@ -373,6 +373,46 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { } } + /** + * 诉求处理 + * + * @param + * @return void + * @author LZN + * @date 2022/9/19 11:02 + */ + @Override + public void AppealHandling() { + String state = "0"; + List list = itemHandleProcessDao.getAppealHandling(state); + + for(ItemHandleProcessToCityResultDTO item : list) { + + AppealHandlingResultDTO data = new AppealHandlingResultDTO(); + + data.setSqid(""); + // 诉求状态 + data.setSqzt(CityPushStateEnum.DCL.getCode()); + // 当前处理环节 + data.setDqclhj(CityPushLinkEnum.SQ_CL.getCode()); + // 诉求类型 + data.setSqlx(""); + // 处理时间 + data.setCzsj(item.getCreatedTime()); + // 处理内容 + data.setCznr(""); + // 处理照片 + data.setClzp(""); + + AppealHandlingResultDTO.CzrDTO dto = new AppealHandlingResultDTO.CzrDTO(); + + dto.setId(""); + dto.setXm(""); + + cityGridApi.sendItemToCity(data,PushToCityGridConstant.HANDLE,"上报驳回"); + } + } + @Override public void appealMsg() { // 昨天 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml index dfded96e9..50923b99b 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml @@ -87,4 +87,15 @@ and p.state = #{state} +