diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealSuperviseResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealSuperviseResultDTO.java new file mode 100644 index 000000000..233fce4dd --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealSuperviseResultDTO.java @@ -0,0 +1,34 @@ +package com.elink.esua.epdc.dto.item.result; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +@NoArgsConstructor +@Data +public class AppealSuperviseResultDTO { + + /** + * 诉求标识 + */ + @JsonProperty("sqid") + private String sqid; + + /** + * 督办人 + */ + @JsonProperty("dbr") + private String dbr; + + /** + * 督办时间 + */ + @JsonProperty("dbsj") + private String dbsj; + + /** + * 督办内容 + */ + @JsonProperty("dbnr") + private String dbnr; +} 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 ea2463883..9412336b5 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 @@ -47,5 +47,14 @@ public interface PushToCityGridService { */ void appealScrap(); + /** + * 诉求督办 + * + * @param + * @return void + * @author zhy + * @date 2022/9/19 9:40 + */ + void appealSupervise(); } 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 2165c4a86..9e444ecd6 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,26 +18,17 @@ package com.elink.esua.epdc.modules.item.service.impl; import com.elink.esua.epdc.commons.tools.constant.NumConstant; -import com.elink.esua.epdc.dto.events.PushToCityGridCaseClosedDTO; -import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO; -import com.elink.esua.epdc.dto.item.result.ItemHandleProcessCaseClosedToCityDTO; -import com.elink.esua.epdc.modules.item.dao.ItemHandleProcessDao; -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.enums.CityPushLinkEnum; import com.elink.esua.epdc.commons.tools.enums.CityPushStateEnum; import com.elink.esua.epdc.commons.tools.utils.DateUtils; import com.elink.esua.epdc.constant.PushToCityGridConstant; +import com.elink.esua.epdc.dto.events.PushToCityGridCaseClosedDTO; import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO; -import com.elink.esua.epdc.dto.item.result.AppealScrapResultDTO; -import com.elink.esua.epdc.dto.item.result.AppealDispatchResultDto; -import com.elink.esua.epdc.dto.item.result.ItemHandleProcessToCityResultDTO; +import com.elink.esua.epdc.dto.item.result.*; import com.elink.esua.epdc.enums.ItemGridPlatformHandleStatusEnum; import com.elink.esua.epdc.gird.city.api.CityGridApi; import com.elink.esua.epdc.modules.item.dao.ItemHandleProcessDao; -import com.elink.esua.epdc.modules.item.service.*; -import io.swagger.models.auth.In; +import com.elink.esua.epdc.modules.item.service.PushToCityGridService; import lombok.extern.slf4j.Slf4j; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -165,4 +156,29 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { } } + @Override + public void appealSupervise() { + // 昨天 + 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 -> { + AppealSuperviseResultDTO dto = new AppealSuperviseResultDTO(); + + dto.setSqid(item.getItemId()); + // todo + dto.setDbr(""); + dto.setDbsj(item.getCreatedTime().toString()); + dto.setDbnr(item.getHandleAdvice()); + + sendData.add(dto); + }); + + // 逐条发送 + sendData.forEach(item -> cityGridApi.sendItemToCity(item, PushToCityGridConstant.APPEAL_SUPERVISE, "诉求督办")); + + } + }