From 94c85bc7b5c134f0e684d032c6f76ebb5e3ad6bd Mon Sep 17 00:00:00 2001 From: HAHA <1824278510@qq.com> Date: Tue, 20 Sep 2022 15:12:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85sqid=EF=BC=8Ccontroller?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/feign/ItemFeignClient.java | 1 + .../controller/PushToCityGridController.java | 84 +++++++++++++++++++ .../item/dao/ItemHandleProcessDao.java | 2 +- .../item/service/PushToCityGridService.java | 14 ++-- .../impl/PushToCityGridServiceImpl.java | 22 +++-- .../mapper/item/ItemHandleProcessDao.xml | 9 +- 6 files changed, 115 insertions(+), 17 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java index ec8533924..1806bb2e6 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java @@ -147,3 +147,4 @@ public interface ItemFeignClient { @PostMapping(value = "events/shareenterprise/company", consumes = MediaType.APPLICATION_JSON_VALUE) Result> getCompany(ShareEnterpriseFormDTO formDTO); } + diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java new file mode 100644 index 000000000..7eb7eacd6 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java @@ -0,0 +1,84 @@ +package com.elink.esua.epdc.modules.item.controller; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.modules.item.service.PushToCityGridService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.management.relation.RelationSupport; + +@RestController +@RequestMapping("PushToCity") +public class PushToCityGridController { + + @Autowired + private PushToCityGridService pushToCityGridService; + + /** + * 诉求结案 + * + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author LZN + * @date 2022/9/20 10:47 + */ + @PostMapping("caseClosed") + public Result Closed(){ + return pushToCityGridService.caseClosedSentoCity(); + } + + /** + * 派遣审核 + * + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author LZN + * @date 2022/9/20 10:48 + */ + @PostMapping("DispatchAudit") + public Result DispatchAudit(){ + return pushToCityGridService.DispatchAudit(); + } + + /** + * 诉求上报 + * + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author LZN + * @date 2022/9/20 10:48 + */ + @PostMapping("AppealReporting") + public Result AppealReporting(){ + return pushToCityGridService.AppealReporting(); + } + + /** + * 上报驳回 + * + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author LZN + * @date 2022/9/20 10:52 + */ + @PostMapping("ReportRejection") + public Result ReportRejection(){ + return pushToCityGridService.ReportRejection(); + } + + /** + * 诉求处理 + * + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author LZN + * @date 2022/9/20 10:53 + */ + @PostMapping("AppealHandling") + public Result AppealHandling(){ + return pushToCityGridService.AppealHandling(); + } +} 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 612c73de9..e8d35b939 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 @@ -73,7 +73,7 @@ public interface ItemHandleProcessDao extends BaseDao { * @author LZN * @date 2022/9/16 15:11 */ - List getHandler(Integer isPartyMember); + List getHandler(@Param("state") Integer isPartyMember); /** 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 a9c59481c..e6a43df2f 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 @@ -18,6 +18,8 @@ package com.elink.esua.epdc.modules.item.service; +import com.elink.esua.epdc.commons.tools.utils.Result; + /** * 青岛市青诉即办平台接入 * @@ -28,9 +30,9 @@ public interface PushToCityGridService { /** * 诉求结案 - * @param isPartyMember + * @param */ - void caseClosedSentoCity(Integer isPartyMember); + Result caseClosedSentoCity(); /** * 诉求派遣 @@ -64,7 +66,7 @@ public interface PushToCityGridService { * @author LZN * @date 2022/9/19 9:44 */ - void DispatchAudit(); + Result DispatchAudit(); /** * 吹哨上报 @@ -104,7 +106,7 @@ public interface PushToCityGridService { * @author LZN * @date 2022/9/19 10:22 */ - void AppealReporting(); + Result AppealReporting(); /** * 事件感知 @@ -124,7 +126,7 @@ public interface PushToCityGridService { * @author LZN * @date 2022/9/19 10:43 */ - void ReportRejection(); + Result ReportRejection(); /** * 诉求处理 @@ -134,7 +136,7 @@ public interface PushToCityGridService { * @author LZN * @date 2022/9/19 11:01 */ - void AppealHandling(); + Result AppealHandling(); /** * 2.8 诉求退件 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 c531abc5b..fce44ea74 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 @@ -22,6 +22,7 @@ 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; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.constant.PushToCityGridConstant; import com.elink.esua.epdc.dto.events.PushToCityGridCaseClosedDTO; import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO; @@ -129,14 +130,14 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { /** * 诉求结案 * - * @param isPartyMember + * @param * @return void * @author LZN * @date 2022/9/16 14:45 */ @Override - public void caseClosedSentoCity(Integer isPartyMember) { - isPartyMember = ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue(); + public Result caseClosedSentoCity() { + int isPartyMember = ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue(); List itemProcessDto = itemHandleProcessDao.getHandler(isPartyMember); // 组装数据(未完成) todo @@ -163,6 +164,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { data.setCzr(czr); cityGridApi.sendItemToCity(data,PushToCityGridConstant.CASE_CLOSED,"诉求结案"); } + return new Result(); } @Override @@ -224,8 +226,8 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { * @date 2022/9/19 9:44 */ @Override - public void DispatchAudit() { - String state = "11"; + public Result DispatchAudit() { + String state = "1001"; List list = itemHandleProcessDao.getDispatchAudit(state); // 添加值 todo @@ -254,6 +256,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { data.setCzr(dto); cityGridApi.sendItemToCity(data,PushToCityGridConstant.DISP_ATCH_AUDIT,"派遣审核"); } + return new Result(); } @Override @@ -311,7 +314,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { * @date 2022/9/19 10:22 */ @Override - public void AppealReporting() { + public Result AppealReporting() { int state = ItemGridPlatformHandleStatusEnum.HANDLE_SB.getValue(); List list = itemHandleProcessDao.getAppealReporting(state); @@ -340,6 +343,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { data.setCzr(dto); cityGridApi.sendItemToCity(data,PushToCityGridConstant.APPEAL_REPORT,"诉求上报"); } + return new Result(); } /** @@ -351,7 +355,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { * @date 2022/9/19 10:44 */ @Override - public void ReportRejection() { + public Result ReportRejection() { int state = ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue(); List list = itemHandleProcessDao.getReportRejection(state); @@ -380,6 +384,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { data.setCzr(dto); cityGridApi.sendItemToCity(data,PushToCityGridConstant.REPORT_REBUT,"上报驳回"); } + return new Result(); } /** @@ -391,7 +396,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { * @date 2022/9/19 11:02 */ @Override - public void AppealHandling() { + public Result AppealHandling() { int state = ItemGridPlatformHandleStatusEnum.HANDLE_BL.getValue(); List list = itemHandleProcessDao.getAppealHandling(state); @@ -437,6 +442,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { data.setCzr(dto); cityGridApi.sendItemToCity(data,PushToCityGridConstant.HANDLE,"诉求处理"); } + return new Result(); } @Override 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 4496856f8..919d6a8b3 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 @@ -22,13 +22,14 @@