diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealWhistleReportResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealWhistleReportResultDTO.java new file mode 100644 index 000000000..25837e621 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealWhistleReportResultDTO.java @@ -0,0 +1,82 @@ +package com.elink.esua.epdc.dto.item.result; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +@NoArgsConstructor +@Data +public class AppealWhistleReportResultDTO { + + /** + * 唯一标识 + */ + @JsonProperty("sqid") + private String sqid; + + /** + * 紧急程度 + */ + @JsonProperty("jjcd") + private String jjcd; + + /** + * 诉求来源 + */ + @JsonProperty("sqly") + private String sqly; + + /** + * 诉求类型 + */ + @JsonProperty("sqlx") + private String sqlx; + + /** + * 上报区市 + */ + @JsonProperty("sbqs") + private String sbqs; + + /** + * 诉求人联系方式 + */ + @JsonProperty("sqrlxfs") + private String sqrlxfs; + + /** + * 诉求主要内容 + */ + @JsonProperty("sqzynr") + private String sqzynr; + + /** + * 事件详细地址 + */ + @JsonProperty("sqdz") + private String sqdz; + + /** + * 事件地理坐标 + */ + @JsonProperty("sqxy") + private String sqxy; + + /** + * 诉求登记日期 + */ + @JsonProperty("sqdjrq") + private String sqdjrq; + + /** + * 诉求照片 + */ + @JsonProperty("sqzp") + private String sqzp; + + /** + * 上报说明 + */ + @JsonProperty("sbsm") + private String sbsm; +} 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 9412336b5..66bab7935 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 @@ -57,4 +57,14 @@ public interface PushToCityGridService { */ void appealSupervise(); + /** + * 吹哨上报 + * + * @param + * @return void + * @author zhy + * @date 2022/9/19 9:51 + */ + void appealWhistleReport(); + } 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 9e444ecd6..6c77430a9 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 @@ -18,6 +18,7 @@ package com.elink.esua.epdc.modules.item.service.impl; import com.elink.esua.epdc.commons.tools.constant.NumConstant; +import com.elink.esua.epdc.commons.tools.enums.CityPushEnum; import com.elink.esua.epdc.commons.tools.enums.CityPushLinkEnum; import com.elink.esua.epdc.commons.tools.enums.CityPushStateEnum; import com.elink.esua.epdc.commons.tools.utils.DateUtils; @@ -160,7 +161,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { public void appealSupervise() { // 昨天 String date = DateUtils.format(DateUtils.addDateDays(new Date(), -1)); - // state=作废的流程数据 + // state=诉求督办的流程数据 List list = itemHandleProcessDao.listProcessByStateAndDate(String.valueOf(ItemGridPlatformHandleStatusEnum.HANDLE_OTHER.getValue()), date); List sendData = new ArrayList<>(); // 拼接数据 @@ -181,4 +182,37 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { } + @Override + public void appealWhistleReport() { + // 昨天 + String date = DateUtils.format(DateUtils.addDateDays(new Date(), -1)); + // state=吹哨上报的流程数据 + List list = itemHandleProcessDao.listProcessByStateAndDate(String.valueOf(ItemGridPlatformHandleStatusEnum.HANDLE_OTHER.getValue()), date); + List sendData = new ArrayList<>(); + // 拼接数据 + list.forEach(item -> { + AppealWhistleReportResultDTO dto = new AppealWhistleReportResultDTO(); + + dto.setSqid(item.getItemId()); + dto.setJjcd(CityPushEnum.JJCD_YB.getCode()); + dto.setSqly(CityPushEnum.SQLY_WX.getCode()); + // todo + dto.setSqlx(""); + dto.setSbqs(CityPushEnum.SBQS_SB.getCode()); + dto.setSqrlxfs(""); + dto.setSqzynr(""); + dto.setSqdz(""); + dto.setSqxy(""); + dto.setSqdjrq(""); + dto.setSqzp(""); + dto.setSbsm(""); + + sendData.add(dto); + }); + + // 逐条发送 + sendData.forEach(item -> cityGridApi.sendItemToCity(item, PushToCityGridConstant.APPEAL_WHISTLE_REPORT, "诉求督办")); + + } + }