From ffafdb3eb646bfc9d0564e79f877c699c347a6ce Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Fri, 1 Nov 2024 16:37:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=89=E5=8F=96=E6=9C=80=E7=BB=88=E7=BB=93?= =?UTF-8?q?=E6=9E=9C+=E5=91=8A=E7=9F=A5=E5=B8=82=E9=87=8C=E6=9C=80?= =?UTF-8?q?=E7=BB=88=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-cloud-gateway-shibei | 2 +- .../epdc/constant/PushToCityGridConstant.java | 31 ++++++++++++++-- .../item/result/HotLineBackResultData.java | 30 +++++++++++++++ .../controller/ItemHotlineController.java | 35 ++++++++++-------- .../events/entity/ItemHotlineEntity.java | 5 +++ .../events/service/ItemHotlineService.java | 2 + .../service/impl/ItemHotlineServiceImpl.java | 36 +++++++++++++----- .../item/service/PushToCityGridService.java | 30 +++++++++++++++ .../impl/PushToCityGridServiceImpl.java | 37 +++++++++++++++++++ 9 files changed, 178 insertions(+), 30 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/HotLineBackResultData.java diff --git a/esua-epdc/epdc-cloud-gateway-shibei b/esua-epdc/epdc-cloud-gateway-shibei index 236f63d41..84ef05300 160000 --- a/esua-epdc/epdc-cloud-gateway-shibei +++ b/esua-epdc/epdc-cloud-gateway-shibei @@ -1 +1 @@ -Subproject commit 236f63d41014efef5007b4490c4eaebb35cac26b +Subproject commit 84ef05300dc74abd725e245cc2c785bf388790d0 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 ef845de84..97ff8ab98 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 @@ -185,10 +185,10 @@ public interface PushToCityGridConstant { - /** - * 2.32热线数据评价接口（备用） - */ - String byEVALUATION = URL_PREFIX + "/evaluation"; +// /** +// * 2.32热线数据评价接口（备用） +// */ +// String byEVALUATION = URL_PREFIX + "/evaluation"; @@ -199,4 +199,27 @@ public interface PushToCityGridConstant { + + /** + * 诉求合并申请 + */ + String MERGE = URL_PREFIX + "/merge"; + + + + + + /** + * 2.38热线最终办理结果接收接口–2024-10新增 + */ + String BACKRESULT = URL_PREFIX + "/backResult"; + + + + /** + * 2.39设置诉求最终办理结果已接收接口–2024-10新增 + */ + String UPDATEBACKRESULT = URL_PREFIX + "/updateBackResult"; + + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/HotLineBackResultData.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/HotLineBackResultData.java new file mode 100644 index 000000000..cbe069276 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/HotLineBackResultData.java @@ -0,0 +1,30 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * + * @description: 2.38热线最终办理结果接收接口–2024-10新增 + * @author qushutong + * @date 2024/10/31 14:48 + * @param + * @return + * @Version1.0 + **/ +@Data +public class HotLineBackResultData implements Serializable { + private static final long serialVersionUID = 2077955195500882097L; + + /** + * czsj : 2022-09-01 18:23:00 + * cznr : 处理内容 + * sqid : e2d096bd7e62462ebc28bb89bde737c0 + */ + private Date czsj; + private String cznr; + private String sqid; + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/ItemHotlineController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/ItemHotlineController.java index 547e82eb4..56f77f622 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/ItemHotlineController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/ItemHotlineController.java @@ -45,24 +45,24 @@ import java.util.Map; @RestController @RequestMapping("itemhotline") public class ItemHotlineController { - + @Autowired private ItemHotlineService itemHotlineService; @GetMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params) { PageData page = itemHotlineService.page(params); return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ + public Result get(@PathVariable("id") String id) { ItemHotlineDTO data = itemHotlineService.get(id); return new Result().ok(data); } @PostMapping - public Result save(@RequestBody ItemHotlineDTO dto){ + public Result save(@RequestBody ItemHotlineDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); itemHotlineService.save(dto); @@ -70,7 +70,7 @@ public class ItemHotlineController { } @PutMapping - public Result update(@RequestBody ItemHotlineDTO dto){ + public Result update(@RequestBody ItemHotlineDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); itemHotlineService.update(dto); @@ -78,7 +78,7 @@ public class ItemHotlineController { } @DeleteMapping - public Result delete(@RequestBody String[] ids){ + public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); itemHotlineService.delete(ids); @@ -87,39 +87,40 @@ public class ItemHotlineController { @PostMapping("getHotLine") - public Result getHotLine(){ + public Result getHotLine() { itemHotlineService.getHotLine(); // 拉取驳回重办案件 itemHotlineService.againList(); + //热线最终办理结果接收接口 + itemHotlineService.getBackResult(); + return new Result(); } /** - * + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result * @description: 街道回退市里 * @author qushutong * @date 2024/8/21 16:44 - * @param - * @return com.elink.esua.epdc.commons.tools.utils.Result * @Version1.0 **/ @PostMapping("goBackCity") - public Result goBack(@RequestBody ItemHotlineDTO dto){ + public Result goBack(@RequestBody ItemHotlineDTO dto) { itemHotlineService.goBack(dto); - return new Result(); + return new Result(); } /** - * - * @description: 热线12345 退件 - * @author qushutong - * @date 2024/8/5 18:04 * @param * @return com.elink.esua.epdc.commons.tools.utils.Result + * @description: 热线12345 退件 + * @author qushutong + * @date 2024/8/5 18:04 * @Version1.0 **/ @PostMapping("backHotLine") @@ -127,4 +128,6 @@ public class ItemHotlineController { return itemHotlineService.backHotLine(dto); } + + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/ItemHotlineEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/ItemHotlineEntity.java index b076995dc..2701a54c7 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/ItemHotlineEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/ItemHotlineEntity.java @@ -89,4 +89,9 @@ public class ItemHotlineEntity extends BaseEpdcEntity { private String cbFlag; + // 最终办理结果接收接口 时间 + private Date czsj; + // 最终办理结果接收接口 内容 + private String cznr; + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/ItemHotlineService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/ItemHotlineService.java index 67a7d9798..255a9a007 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/ItemHotlineService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/ItemHotlineService.java @@ -108,4 +108,6 @@ public interface ItemHotlineService extends BaseService { void againList(); void goBack(ItemHotlineDTO dto); + + void getBackResult(); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java index d14fda258..bc1025e81 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java @@ -38,6 +38,7 @@ import com.elink.esua.epdc.dto.item.form.ItemBackHotlineDTO; import com.elink.esua.epdc.dto.item.form.RollBackHotLineFromDTO; import com.elink.esua.epdc.dto.item.form.UpdateAppealSendDTO; import com.elink.esua.epdc.dto.item.result.CenterData; +import com.elink.esua.epdc.dto.item.result.HotLineBackResultData; import com.elink.esua.epdc.dto.oss.UploadHotLineFormDTO; import com.elink.esua.epdc.modules.events.dao.ItemHotlineDao; import com.elink.esua.epdc.modules.events.entity.ItemHotlineEntity; @@ -146,7 +147,7 @@ public class ItemHotlineServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); // wrapper.eq("sqid", item.getSqid()); @@ -270,7 +269,6 @@ public class ItemHotlineServiceImpl extends BaseServiceImpl hotLineBackResultData = pushToCityGridServiceImpl.hotLineBackResult(); + UpdateAppealSendDTO dto = new UpdateAppealSendDTO(); + for (HotLineBackResultData item : hotLineBackResultData) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(item.getSqid()), "sqid", item.getSqid()); + ItemHotlineEntity itemHotlineEntity = baseDao.selectOne(wrapper); + itemHotlineEntity.setCzsj(item.getCzsj()); + itemHotlineEntity.setCznr(item.getCznr()); + baseDao.updateById(itemHotlineEntity); + + // 设置诉求最终办理结果已接收接口 + dto.setSqid(item.getSqid()); + pushToCityGridServiceImpl.updateBackResult(dto); + } + + } } \ No newline at end of file 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 02e88f51a..7308cadb9 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 @@ -24,6 +24,7 @@ import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO; import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.AppealFormDTO; import com.elink.esua.epdc.dto.item.result.CenterData; +import com.elink.esua.epdc.dto.item.result.HotLineBackResultData; import org.bouncycastle.crypto.tls.SRTPProtectionProfile; import java.util.List; @@ -336,4 +337,33 @@ public interface PushToCityGridService { * @Version1.0 **/ String sendUpdateAgain(UpdateAppealSendDTO appealSendDTO); + + + /** + * + * @description: 热线最终办理结果接收接口 + * @author qushutong + * @date 2024/10/31 14:52 + * @param + * @return java.util.List + * @Version1.0 + **/ + List hotLineBackResult(); + + + + + + + /** + * + * @description: 2.39设置诉求最终办理结果已接收接口–2024-10新增 + * @author qushutong + * @date 2024/11/1 16:31 + * @param + * @return java.lang.String + * @Version1.0 + **/ + String updateBackResult(UpdateAppealSendDTO dto); + } 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 e0cfd6267..ee3350d1a 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 @@ -1732,6 +1732,43 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { this.saveLog(appealSendDTO.getSqid(),"12345","设置诉求重办信息已接收接口",PushToCityGridConstant.UPDATEAGAIN,JSONObject.toJSONString(appealSendDTO),resultString); return resultString; } + + @Override + public List hotLineBackResult() { + + HotLineFromDTO hotLineFromDTO = new HotLineFromDTO(); + hotLineFromDTO.setCount(10); + // 正式环境 +/* hotLineFromDTO.setFlag("sbq"); + hotLineFromDTO.setSsqs("sbq2024");*/ + hotLineFromDTO.setFlag("sbq2024"); + hotLineFromDTO.setSsqs("sbq"); + // 测试环境 +// hotLineFromDTO.setPwd("sbq2024"); +// hotLineFromDTO.setUserName("sbq"); + + //热线最终办理结果接收接口 + String resultString = cityGridApi.sendItemToCity(hotLineFromDTO, PushToCityGridConstant.BACKRESULT, "热线最终办理结果接收接口"); + JSONObject res = JSONObject.parseObject(resultString); + // 存日志 + String successFlag = YesOrNoEnum.NO.value(); + if (NumConstant.ZERO_STR.equals(res.get("code").toString())) { + successFlag = YesOrNoEnum.YES.value(); + } + + String dataStr = res.get("data").toString(); + List results = JSON.parseArray(dataStr,HotLineBackResultData.class); + this.saveInterfaceLog("12345办理结果","热线最终办理结果接收接口",PushToCityGridConstant.BACKRESULT,successFlag,JSONObject.toJSONString(hotLineFromDTO),results.size()+""); + return results; + } + + @Override + public String updateBackResult(UpdateAppealSendDTO dto) { + //发送到市平台 + String resultString = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.UPDATEBACKRESULT, "设置诉求重办信息已接收接口"); + this.saveLog(dto.getSqid(),"12345","标记设置诉求最终办理结果信息已接收。。",PushToCityGridConstant.UPDATEBACKRESULT,JSONObject.toJSONString(dto),resultString); + return resultString; + } }