From a561055df8e89e82a911ab7fe5a295df5862d76d Mon Sep 17 00:00:00 2001 From: yuyang Date: Mon, 7 Nov 2022 16:39:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=90=E7=BB=B4=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1-->=E6=9C=AA=E6=8E=A8=E9=80=81=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XhpcWorkHistoryOrderController.java | 2 +- .../XhpcHistoryOrderController.java | 25 +++++++- .../order/mapper/XhpcHistoryOrderMapper.java | 7 ++ .../service/IXhpcHistoryOrderService.java | 7 ++ .../impl/XhpcHistoryOrderServiceImpl.java | 64 +++++++++++++++++++ .../impl/XhpcRealTimeOrderServiceImpl.java | 5 +- .../mapper/XhpcHistoryOrderMapper.xml | 55 ++++++++++++++++ 7 files changed, 161 insertions(+), 4 deletions(-) diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcWorkHistoryOrderController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcWorkHistoryOrderController.java index aceb1eb7..fe49be2f 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcWorkHistoryOrderController.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcWorkHistoryOrderController.java @@ -24,7 +24,7 @@ public class XhpcWorkHistoryOrderController extends BaseController { XhpcWorkHistoryOrderService xhpcWorkHistoryOrderService; /** - * 历史订单 + * 历史异常订单 * @return */ @GetMapping("/getListPage") diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java index 96f595d4..2c837271 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java @@ -1138,11 +1138,32 @@ public class XhpcHistoryOrderController extends BaseController { } } - - @GetMapping("/getToday") public AjaxResult getToday(){ return AjaxResult.success(xhpcHistoryOrderService.getToday()); } + @GetMapping("/getConfirmResultPage") + public TableDataInfo getConfirmResultPage(Integer status) { + List> listPage = xhpcHistoryOrderService.getConfirmResultPage(status); + return getDataTable(listPage); + } + + //修改有争议的订单 + @GetMapping("/updateOrderConfirmResult") + public AjaxResult updateOrderConfirmResult(Long historyOrderId) { + return xhpcHistoryOrderService.updateOrderConfirmResult(historyOrderId); + } + + //修改流量方订单状态，系统自动推送 + @GetMapping("/updateOrderInternetPush") + public AjaxResult updateOrderInternetPush(Long historyOrderId) { + return xhpcHistoryOrderService.updateOrderInternetPush(historyOrderId); + } + + //修改成都市监管平台订单状态，系统自动推送 + @GetMapping("/updateChengDuPush") + public AjaxResult updateChengDuPush(Long historyOrderId) { + return xhpcHistoryOrderService.updateChengDuPush(historyOrderId); + } } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java index b42de541..49ed4308 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java @@ -144,4 +144,11 @@ public interface XhpcHistoryOrderMapper { //成都监管平台未推送订单量 int getChengDuShiToday(); + List> getConfirmResultPage(@Param("status")Integer status,@Param("number") Integer number,@Param("logOperatorId")Long logOperatorId,@Param("tenantId")String tenantId); + + int updateOrderConfirmResult(Long historyOrderId); + + int updateOrderInternetPush(Long historyOrderId); + + int updateChengDuPush(Long historyOrderId); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderService.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderService.java index 26b38b60..a931b9ed 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderService.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderService.java @@ -138,4 +138,11 @@ public interface IXhpcHistoryOrderService { //最近一个月推送情况 List> getToday(); + List> getConfirmResultPage(Integer status); + + AjaxResult updateOrderConfirmResult(Long historyOrderId); + + AjaxResult updateOrderInternetPush(Long historyOrderId); + + AjaxResult updateChengDuPush(Long historyOrderId); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java index 11580d01..639470ba 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java @@ -582,6 +582,70 @@ public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHis return list; } + @Override + public List> getConfirmResultPage(Integer status) { + + List> list =new ArrayList<>(); + LoginUser loginUser = tokenService.getLoginUser(); + Long logUserId = loginUser.getUserid(); + SysUser sysUser = loginUser.getSysUser(); + String tenantId = loginUser.getTenantId(); + + int internetNumber =0; + if(tenantId !=null && !"".equals(tenantId)){ + if(UserTypeUtil.SYS_USER_TYPE_FOUR.equals(sysUser.getUserType())){ + //运维管理人员 + startPage(); + list= xhpcHistoryOrderMapper.getConfirmResultPage(status,3,logUserId,tenantId); + + }else{ + if(sysUser.getUserId() !=UserTypeUtil.USER_ID){ + Long logOperatorId = sysUser.getOperatorId(); + startPage(); + if ("01".equals(sysUser.getUserType())) { + list= xhpcHistoryOrderMapper.getConfirmResultPage(status,1,logOperatorId,tenantId); + //运营商看自己的场站 + }else{ + //查询赋值的场站 + list= xhpcHistoryOrderMapper.getConfirmResultPage(status,2,logUserId,tenantId); + } + }else{ + startPage(); + //全部桩 + list= xhpcHistoryOrderMapper.getConfirmResultPage(status,0,logUserId,null); + } + } + } + return list; + + } + + @Override + public AjaxResult updateOrderConfirmResult(Long historyOrderId) { + int i = xhpcHistoryOrderMapper.updateOrderConfirmResult(historyOrderId); + if(i>0){ + return AjaxResult.success(); + } + return AjaxResult.error("修改推送订单失败请联系管理员"); + } + + @Override + public AjaxResult updateOrderInternetPush(Long historyOrderId) { + int i = xhpcHistoryOrderMapper.updateOrderInternetPush(historyOrderId); + if(i>0){ + return AjaxResult.success(); + } + return AjaxResult.error("修改推送订单失败请联系管理员"); + } + + @Override + public AjaxResult updateChengDuPush(Long historyOrderId) { + int i = xhpcHistoryOrderMapper.updateChengDuPush(historyOrderId); + if(i>0){ + return AjaxResult.success(); + } + return AjaxResult.error("修改推送订单失败请联系管理员"); + } /** * 历史信息费率时段 */ diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java index 82422f44..1e0588ec 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java @@ -1483,7 +1483,10 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe try { int startSoc = Integer.parseInt(xhpcHistoryOrder.getStartSoc()); int endSoc = Integer.parseInt(xhpcHistoryOrder.getEndSoc()); - if((!"40".equals(xhpcHistoryOrder.getStopReasonEvcs()) &&!"41".equals(xhpcHistoryOrder.getStopReasonEvcs())&&!"6E".equals(xhpcHistoryOrder.getStopReasonEvcs()))|| (startSoc>95 || endSoc>95)){ + String stopReason = xhpcHistoryOrder.getStopReasonEvcs(); + if(("40".equals(stopReason) || "41".equals(stopReason)||"6E".equals(stopReason)||"42".equals(stopReason)||"43".equals(stopReason)||"44".equals(stopReason)||"45".equals(stopReason)||"4E".equals(stopReason))){ + + }else{ XhpcWorkHistoryOrderDto xhpcWorkHistoryOrderDto =new XhpcWorkHistoryOrderDto(); BeanUtils.copyProperties(xhpcHistoryOrder,xhpcWorkHistoryOrderDto); String nameByCode = StopReasonEnum.getNameByCode(xhpcHistoryOrder.getStopReasonEvcs()); diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml index 74022dc3..9f1e20be 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml @@ -1650,4 +1650,59 @@ where history_order_id> (select last_push_order from et_auth_sec_token where id=2) + + + + UPDATE xhpc_history_order set confirm_Result =0 where history_order_id=#{historyOrderId} + + + + UPDATE xhpc_history_order set confirm_Result =-1 where history_order_id=#{historyOrderId} + + + + UPDATE et_auth_sec_token set last_push_order =#{historyOrderId} where id=2 +