From 23a4f56d862b604aa34308282ddc5c514f05284d Mon Sep 17 00:00:00 2001 From: yuyang Date: Mon, 23 May 2022 15:16:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=9F=E8=AE=A1=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/XhpcRealTimeOrderServiceImpl.java | 5 +- .../impl/XhpcStatisticsServiceImpl.java | 186 ++++++++---------- 2 files changed, 84 insertions(+), 107 deletions(-) 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 ac18eb31..887e9dcc 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 @@ -496,6 +496,8 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe Map params1 =new HashMap<>(); if("1".equals(judgeActivity.get("status").toString())){ + judge =true; + logger.info("<<<<<<<<<<<<<<<价格、时间、公式都相同>>>>>>>>>>>>>>>>>"); params1.put("T",money.doubleValue()); params1.put("P",powerPrice.doubleValue()); params1.put("S",servicePrice.doubleValue()); @@ -528,7 +530,8 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe promotionDiscount = money.subtract(activityTotalPriceTotal); xhpcHistoryOrder.setActivityId(judgeActivity.get("activityId").toString()); }else if("2".equals(judgeActivity.get("status").toString())){ - + judge =true; + logger.info("<<<<<<<<<<<<<<<价格、时间都相同>>>>>>>>>>>>>>>>>"); String computeFormula = judgeActivity.get("computeFormula").toString(); BigDecimal powerPrice1 = new BigDecimal(judgeActivity.get("powerPrice").toString()); BigDecimal servicePrice1 = new BigDecimal(judgeActivity.get("servicePrice").toString()); diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java index d1f29208..a2020b9f 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java @@ -44,9 +44,7 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati @Override public List> getTimeIntervalPage(HttpServletRequest request,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) { - if (getJudge(internetUserId, operatorId, type)){ - return new ArrayList<>(); - } + List chargingStationIdList =new ArrayList<>(); if(!"".equals(chargingStationIds) && chargingStationIds !=null){ chargingStationIdList= Arrays.asList(chargingStationIds.split(",")); @@ -164,9 +162,7 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati } @Override public List> getDateIntervalPage(HttpServletRequest request,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) { - if (getJudge(internetUserId, operatorId, type)){ - return new ArrayList<>(); - } + List chargingStationIdList =new ArrayList<>(); if(!"".equals(chargingStationIds) && chargingStationIds !=null){ chargingStationIdList= Arrays.asList(chargingStationIds.split(",")); @@ -197,9 +193,7 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati @Override public List> getStationIntervalPage(HttpServletRequest request,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId,String chargingStationIds, String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) { - if (getJudge(internetUserId, operatorId, type)){ - return new ArrayList<>(); - } + List chargingStationIdList =new ArrayList<>(); if(!"".equals(chargingStationIds) && chargingStationIds !=null){ chargingStationIdList= Arrays.asList(chargingStationIds.split(",")); @@ -233,9 +227,7 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati @Override public List> getOperatorIntervalPage(HttpServletRequest request,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId,String operatorIds, Long operatorId, String startTime, String endTime, Long userId, Integer type) { - if(getJudge(null,operatorId,type)){ - return new ArrayList<>(); - } + List operatorUserId =new ArrayList<>(); if(!"".equals(operatorIds) && operatorIds !=null){ operatorUserId= Arrays.asList(operatorIds.split(",")); @@ -264,9 +256,6 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati @Override public List> getInternetUserIntervalPage(HttpServletRequest request,String internetUserIds, Long internetUserId, String startTime, String endTime, Long userId, Integer type) { - if(getJudge(internetUserId,null,type)){ - return new ArrayList<>(); - } List internetIds =new ArrayList<>(); if(!"".equals(internetUserIds) && internetUserIds !=null){ internetIds= Arrays.asList(internetUserIds.split(",")); @@ -514,9 +503,6 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati @Override public List> getMechanismPage(HttpServletRequest request,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type,Integer source) { - if (getJudge(internetUserId, operatorId, type)){ - return new ArrayList<>(); - } List chargingStationIdList =new ArrayList<>(); if(!"".equals(chargingStationIds) && chargingStationIds !=null){ chargingStationIdList= Arrays.asList(chargingStationIds.split(",")); @@ -566,7 +552,6 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati } private boolean getJudge(Long internetUserId, Long operatorId, Integer type) { - if (type == null) { return true; } @@ -674,32 +659,30 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati @Override public void dateIntervalExport(HttpServletRequest request,HttpServletResponse response,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { List> list =new ArrayList<>(); - if (getJudge(internetUserId, operatorId, type)){ - }else{ - List chargingStationIdList =new ArrayList<>(); - if(!"".equals(chargingStationIds) && chargingStationIds !=null){ - chargingStationIdList= Arrays.asList(chargingStationIds.split(",")); - } - //获取登陆用户 - LoginUser loginUser = tokenService.getLoginUser(request); - SysUser sysUser = loginUser.getSysUser(); - Long sysUserId = sysUser.getUserId(); - //获取登陆用户 - - if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ - if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ - Long logOperatorId = sysUser.getOperatorId(); - //运营商看自己的场站 - list = xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId); - }else{ - //查询赋值的场站 - list = xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId); - } - }else{ - list =xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId); - } + List chargingStationIdList =new ArrayList<>(); + if(!"".equals(chargingStationIds) && chargingStationIds !=null){ + chargingStationIdList= Arrays.asList(chargingStationIds.split(",")); } + //获取登陆用户 + LoginUser loginUser = tokenService.getLoginUser(request); + SysUser sysUser = loginUser.getSysUser(); + Long sysUserId = sysUser.getUserId(); + //获取登陆用户 + + if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ + if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ + Long logOperatorId = sysUser.getOperatorId(); + //运营商看自己的场站 + list = xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId); + }else{ + //查询赋值的场站 + list = xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId); + } + }else{ + list =xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId); + } + // 通过工具类创建writer，默认创建xls格式 BigExcelWriter writer = ExcelUtil.getBigWriter("temp_" + System.currentTimeMillis() + ".xlsx"); writer.addHeaderAlias("createTime", "日期"); @@ -744,33 +727,30 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati @Override public void stationIntervalExport(HttpServletRequest request,HttpServletResponse response,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId, String chargingStationIds,String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { List> list =new ArrayList<>(); - if (getJudge(internetUserId, operatorId, type)){ - }else{ - List chargingStationIdList =new ArrayList<>(); - if(!"".equals(chargingStationIds) && chargingStationIds !=null){ - chargingStationIdList= Arrays.asList(chargingStationIds.split(",")); - } - List operatorUserId =new ArrayList<>(); - if(!"".equals(operatorIds) && operatorIds !=null){ - operatorUserId= Arrays.asList(operatorIds.split(",")); - } - LoginUser loginUser = tokenService.getLoginUser(request); - SysUser sysUser = loginUser.getSysUser(); - Long sysUserId = sysUser.getUserId(); + List chargingStationIdList =new ArrayList<>(); + if(!"".equals(chargingStationIds) && chargingStationIds !=null){ + chargingStationIdList= Arrays.asList(chargingStationIds.split(",")); + } + List operatorUserId =new ArrayList<>(); + if(!"".equals(operatorIds) && operatorIds !=null){ + operatorUserId= Arrays.asList(operatorIds.split(",")); + } + LoginUser loginUser = tokenService.getLoginUser(request); + SysUser sysUser = loginUser.getSysUser(); + Long sysUserId = sysUser.getUserId(); - if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ - if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ - Long logOperatorId = sysUser.getOperatorId(); - //运营商看自己的场站 - list = xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList,operatorUserId,internetUserId,operatorId,startTime,endTime,1,logOperatorId,tenantId); - }else{ - //查询赋值的场站 - list = xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList,operatorUserId,internetUserId,operatorId,startTime,endTime,2,sysUserId,tenantId); - } + if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ + if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ + Long logOperatorId = sysUser.getOperatorId(); + //运营商看自己的场站 + list = xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList,operatorUserId,internetUserId,operatorId,startTime,endTime,1,logOperatorId,tenantId); }else{ - list =xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList,operatorUserId,internetUserId,operatorId,startTime,endTime,0,sysUserId,tenantId); + //查询赋值的场站 + list = xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList,operatorUserId,internetUserId,operatorId,startTime,endTime,2,sysUserId,tenantId); } + }else{ + list =xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList,operatorUserId,internetUserId,operatorId,startTime,endTime,0,sysUserId,tenantId); } // 通过工具类创建writer，默认创建xls格式 @@ -819,29 +799,26 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati @Override public void operatorIntervalExport(HttpServletRequest request,HttpServletResponse response,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId, String operatorIds,Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { List> list =new ArrayList<>(); - if(getJudge(null,operatorId,type)){ - }else{ - List operatorUserId =new ArrayList<>(); - if(!"".equals(operatorIds) && operatorIds !=null){ - operatorUserId= Arrays.asList(operatorIds.split(",")); - } - LoginUser loginUser = tokenService.getLoginUser(request); - SysUser sysUser = loginUser.getSysUser(); - Long sysUserId = sysUser.getUserId(); + List operatorUserId =new ArrayList<>(); + if(!"".equals(operatorIds) && operatorIds !=null){ + operatorUserId= Arrays.asList(operatorIds.split(",")); + } + LoginUser loginUser = tokenService.getLoginUser(request); + SysUser sysUser = loginUser.getSysUser(); + Long sysUserId = sysUser.getUserId(); - if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ - if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ - Long logOperatorId = sysUser.getOperatorId(); - //运营商看自己的场站 - list = xhpcStatisticsServiceMapper.getOperatorIntervalPage(chargingStationId,chargingPileId,terminalId,operatorUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId); - }else{ - //查询赋值的场站 - list = xhpcStatisticsServiceMapper.getOperatorIntervalPage(chargingStationId,chargingPileId,terminalId,operatorUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId); - } + if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ + if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ + Long logOperatorId = sysUser.getOperatorId(); + //运营商看自己的场站 + list = xhpcStatisticsServiceMapper.getOperatorIntervalPage(chargingStationId,chargingPileId,terminalId,operatorUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId); }else{ - list =xhpcStatisticsServiceMapper.getOperatorIntervalPage(chargingStationId,chargingPileId,terminalId,operatorUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId); + //查询赋值的场站 + list = xhpcStatisticsServiceMapper.getOperatorIntervalPage(chargingStationId,chargingPileId,terminalId,operatorUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId); } + }else{ + list =xhpcStatisticsServiceMapper.getOperatorIntervalPage(chargingStationId,chargingPileId,terminalId,operatorUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId); } // 通过工具类创建writer，默认创建xls格式 BigExcelWriter writer = ExcelUtil.getBigWriter("temp_" + System.currentTimeMillis() + ".xlsx"); @@ -1004,30 +981,27 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati @Override public void getMechanismExport(HttpServletRequest request, HttpServletResponse response,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type, Integer source) throws IOException { List> list =new ArrayList<>(); - if (getJudge(internetUserId, operatorId, type)){ - }else{ - List chargingStationIdList =new ArrayList<>(); - if(!"".equals(chargingStationIds) && chargingStationIds !=null){ - chargingStationIdList= Arrays.asList(chargingStationIds.split(",")); - } - //获取登陆用户 - LoginUser loginUser = tokenService.getLoginUser(request); - SysUser sysUser = loginUser.getSysUser(); - Long sysUserId = sysUser.getUserId(); - //获取登陆用户 - if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ - if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ - Long logOperatorId = sysUser.getOperatorId(); - //运营商看自己的场站 - list = xhpcStatisticsServiceMapper.getMechanismPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId,source); - }else{ - //查询赋值的场站 - list = xhpcStatisticsServiceMapper.getMechanismPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId,source); - } + List chargingStationIdList =new ArrayList<>(); + if(!"".equals(chargingStationIds) && chargingStationIds !=null){ + chargingStationIdList= Arrays.asList(chargingStationIds.split(",")); + } + //获取登陆用户 + LoginUser loginUser = tokenService.getLoginUser(request); + SysUser sysUser = loginUser.getSysUser(); + Long sysUserId = sysUser.getUserId(); + //获取登陆用户 + if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ + if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ + Long logOperatorId = sysUser.getOperatorId(); + //运营商看自己的场站 + list = xhpcStatisticsServiceMapper.getMechanismPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId,source); }else{ - list =xhpcStatisticsServiceMapper.getMechanismPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId,source); + //查询赋值的场站 + list = xhpcStatisticsServiceMapper.getMechanismPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId,source); } + }else{ + list =xhpcStatisticsServiceMapper.getMechanismPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId,source); } // 通过工具类创建writer，默认创建xls格式 BigExcelWriter writer = ExcelUtil.getBigWriter("temp_" + System.currentTimeMillis() + ".xlsx");