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 27f59645..96f595d4 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 @@ -1139,12 +1139,10 @@ public class XhpcHistoryOrderController extends BaseController { } - public static void main(String[] args) { - String tr ="80836000050002012210280905315435"; - String substring = tr.substring(0, 16); - System.out.println("substring:"+substring); + @GetMapping("/getToday") + public AjaxResult getToday(){ + return AjaxResult.success(xhpcHistoryOrderService.getToday()); } - } 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 fbdb98b7..b42de541 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 @@ -137,4 +137,11 @@ public interface XhpcHistoryOrderMapper { //获取跨天最后一帧数据 Map getXhpcRealTimeOrderTwentyFour(@Param("chargingOrderId")Long chargingOrderId,@Param("time")String time); + + //流量方统计 + int getToday(@Param("status") Integer status,@Param("logOperatorId")Long logOperatorId,@Param("time")String time,@Param("tenantId")String tenantId); + + //成都监管平台未推送订单量 + int getChengDuShiToday(); + } 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 f06940a6..26b38b60 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 @@ -134,4 +134,8 @@ public interface IXhpcHistoryOrderService { * 获取登陆用户信息 */ Map getLandUser(Long userId); + + //最近一个月推送情况 + List> getToday(); + } 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 6b615446..11580d01 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 @@ -534,6 +534,54 @@ public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHis return xhpcHistoryOrderMapper.getLandUser(userId); } + @Override + public List> getToday() { + + + LoginUser loginUser = tokenService.getLoginUser(); + Long logUserId = loginUser.getUserid(); + SysUser sysUser = loginUser.getSysUser(); + Long sysUserId = sysUser.getUserId(); + Date date = new Date(); + Date beginOfDay = DateUtil.beginOfDay(date); + String time = DateUtil.formatDateTime(DateUtil.offsetDay(beginOfDay, -30)); + String tenantId = loginUser.getTenantId(); + + int internetNumber =0; + if(tenantId !=null && !"".equals(tenantId)){ + if(UserTypeUtil.SYS_USER_TYPE_FOUR.equals(sysUser.getUserType())){ + //运维管理人员 + internetNumber= xhpcHistoryOrderMapper.getToday(3,logUserId,time,tenantId); + + }else{ + if(sysUser.getUserId() !=UserTypeUtil.USER_ID){ + Long logOperatorId = sysUser.getOperatorId(); + if ("01".equals(sysUser.getUserType())) { + internetNumber= xhpcHistoryOrderMapper.getToday(1,logUserId,time,tenantId); + //运营商看自己的场站 + }else{ + //查询赋值的场站 + internetNumber= xhpcHistoryOrderMapper.getToday(2,logUserId,time,tenantId); + } + }else{ + //全部桩 + internetNumber= xhpcHistoryOrderMapper.getToday(0,logUserId,time,null); + } + } + } + int chengDuShiNUmber = xhpcHistoryOrderMapper.getChengDuShiToday(); + List> list =new ArrayList<>(); + Map map =new HashMap<>(); + map.put("name","流量方未推送订单量"); + map.put("value",internetNumber); + list.add(map); + Map map1 =new HashMap<>(); + map1.put("name","成都监管平台未推送订单量"); + map1.put("value",chengDuShiNUmber); + list.add(map1); + return list; + } + /** * 历史信息费率时段 */ @@ -603,12 +651,6 @@ public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHis } - - - - - - private Map getBigDecimal(String totalPrice, BigDecimal powerPriceTotal, BigDecimal servicePriceTotal, XhpcChargeOrder chargeOrder, Long rateModelId, Date startTime2, Date updateTime2, BigDecimal chargingDegree, List> list) { Map map = new HashMap<>(); 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 0ae07f9a..74022dc3 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml @@ -1624,4 +1624,30 @@ from xhpc_real_time_order where create_time <= #{time} and charging_order_id=#{chargingOrderId} + + + + +