From bece7b0dc9005d1bb237cbb22751c42d8fb145ee Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Tue, 7 May 2019 11:47:08 +0800 Subject: [PATCH] =?UTF-8?q?[Y]=20=E5=95=86=E6=88=B7=E6=AC=A0=E6=AC=BE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96=20&=20=E6=B8=85=E7=AE=97?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=85=8D=E8=A7=A6=E5=8F=91,=E9=99=90?= =?UTF-8?q?=E5=88=B6=E6=9C=80=E5=A4=A7=E6=9F=A5=E8=AF=A2=E5=91=A8=E6=9C=9F?= =?UTF-8?q?30=E5=A4=A9=20&=20=E5=BE=AE=E4=BF=A1=E8=A1=8C=E4=B8=9A=E5=85=8D?= =?UTF-8?q?=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/logview/web/LogRiskController.java | 11 ++--- .../clearing/core/impl/CleanServiceImpl.java | 47 ++++--------------- .../scanner/ManagerPermissionScanner.java | 2 +- .../mappers/payment/TransactionMapper.xml | 18 +++---- src/main/ui/static/analysis/clearing-log.js | 6 +-- .../analysis/templates/clearing_logs.html | 4 -- .../static/payment/partner/partner-manage.js | 38 ++------------- 7 files changed, 34 insertions(+), 92 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/logview/web/LogRiskController.java b/src/main/java/au/com/royalpay/payment/manage/logview/web/LogRiskController.java index e6ca8260a..8464fa512 100644 --- a/src/main/java/au/com/royalpay/payment/manage/logview/web/LogRiskController.java +++ b/src/main/java/au/com/royalpay/payment/manage/logview/web/LogRiskController.java @@ -4,15 +4,14 @@ import au.com.royalpay.payment.core.risk.bean.RiskTypeEnum; import au.com.royalpay.payment.manage.logview.beans.LogRiskQueryBean; import au.com.royalpay.payment.manage.mappers.log.LogRiskMapper; import au.com.royalpay.payment.manage.permission.manager.ManagerMapping; -import au.com.royalpay.payment.tools.permission.enums.ManagerRole; import au.com.royalpay.payment.manage.tradelog.beans.PreRefundQueryBean; import au.com.royalpay.payment.manage.tradelog.core.TradeLogService; +import au.com.royalpay.payment.tools.permission.enums.ManagerRole; import au.com.royalpay.payment.tools.utils.PageListUtils; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import org.apache.commons.collections.CollectionUtils; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -30,14 +29,14 @@ public class LogRiskController { @Resource private TradeLogService tradeLogService; - @RequestMapping(value = "/risk_log/list", method = RequestMethod.GET) + @GetMapping(value = "/risk_log/list") public JSONObject listLogRisk(LogRiskQueryBean logRiskQueryBean) { return PageListUtils.buildPageListResult( logRiskMapper.listWithClientInfo(logRiskQueryBean.toParams(), new PageBounds(logRiskQueryBean.getPage(), logRiskQueryBean.getLimit()))); } - @RequestMapping(value = "/risk_log/typeCharts", method = RequestMethod.GET) + @GetMapping(value = "/risk_log/typeCharts") public JSONObject typeCharts(LogRiskQueryBean logRiskQueryBean) { List statisticsRiskLogList = logRiskMapper.statisticsRiskLog(logRiskQueryBean.toParams()); if (CollectionUtils.isEmpty(statisticsRiskLogList)) { @@ -84,7 +83,7 @@ public class LogRiskController { return result; } - @RequestMapping(value = "/pre_refund/list", method = RequestMethod.GET) + @GetMapping(value = "/pre_refund/list") public JSONObject listPreRefund(PreRefundQueryBean preRefundQueryBean) { return PageListUtils.buildPageListResult(tradeLogService.listPreRefundClients(preRefundQueryBean)); } diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java index 4f7b43440..b89d40a3e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java @@ -4,11 +4,7 @@ import au.com.royalpay.payment.core.PaymentApi; import au.com.royalpay.payment.core.exceptions.InvalidShortIdException; import au.com.royalpay.payment.core.tasksupport.SettlementSupport; import au.com.royalpay.payment.manage.management.clearing.core.CleanService; -import au.com.royalpay.payment.manage.mappers.log.ClearingDetailAnalysisMapper; -import au.com.royalpay.payment.manage.mappers.log.ClearingDetailMapper; -import au.com.royalpay.payment.manage.mappers.log.ClearingLogMapper; -import au.com.royalpay.payment.manage.mappers.log.LogSettleMailMapper; -import au.com.royalpay.payment.manage.mappers.log.ValidationLogMapper; +import au.com.royalpay.payment.manage.mappers.log.*; import au.com.royalpay.payment.manage.mappers.payment.TaskManualSettleMapper; import au.com.royalpay.payment.manage.mappers.payment.TransactionMapper; import au.com.royalpay.payment.manage.mappers.system.*; @@ -34,16 +30,15 @@ import au.com.royalpay.payment.tools.locale.LocaleSupport; import au.com.royalpay.payment.tools.lock.Locker; import au.com.royalpay.payment.tools.permission.enums.ManagerRole; import au.com.royalpay.payment.tools.tasksupport.TaskFinishNotifyEvent; +import au.com.royalpay.payment.tools.utils.DateVaildUtil; import au.com.royalpay.payment.tools.utils.PageListUtils; import au.com.royalpay.payment.tools.utils.TimeZoneUtils; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.Order; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; - import org.apache.commons.codec.binary.Base64; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVPrinter; @@ -52,12 +47,7 @@ import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.lang3.time.DateUtils; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.CellStyle; -import org.apache.poi.ss.usermodel.Font; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.joda.time.DateTime; import org.joda.time.Days; @@ -75,37 +65,20 @@ import org.springframework.util.CollectionUtils; import org.thymeleaf.context.Context; import org.thymeleaf.spring4.SpringTemplateEngine; -import java.io.BufferedWriter; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; -import java.io.Writer; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.*; import java.math.BigDecimal; import java.math.RoundingMode; import java.net.URISyntaxException; import java.text.DecimalFormat; import java.text.NumberFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Currency; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Objects; -import java.util.TreeMap; +import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - import static au.com.royalpay.payment.manage.permission.utils.OrgCheckUtils.checkOrgPermission; /** @@ -163,7 +136,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider @Resource private ClientDeviceMapper clientDeviceMapper; - + private static final int MAX_TRACK_DAYS = 31; @Value("${app.settlement.email-to}") private String settlementEmailTo; @Value("${app.settlement.email-cc}") @@ -627,9 +600,9 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider @Override public JSONObject getCleanLogsInClients(ClearingLogQuery query, JSONObject manager) { JSONObject params = query.toParams(); + DateVaildUtil.validDateDuration(params.getDate("from"), params.getDate("to"), MAX_TRACK_DAYS); if (query.getClientMoniker() != null && !query.getClientMoniker().isEmpty()) { JSONObject client = clientManager.getClientInfoByMoniker(query.getClientMoniker()); - Assert.notNull(client); } if (manager.getInteger("org_id") != null) { params.put("org_id", manager.getIntValue("org_id")); @@ -642,9 +615,9 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider @Override public JSONObject analysisCleanLogs(ClearingLogQuery query, JSONObject manager) { JSONObject params = query.toParams(); + DateVaildUtil.validDateDuration(params.getDate("from"), params.getDate("to"), MAX_TRACK_DAYS); if (query.getClientMoniker() != null && !query.getClientMoniker().isEmpty()) { JSONObject client = clientManager.getClientInfoByMoniker(query.getClientMoniker()); - Assert.notNull(client); } if (manager.getInteger("org_id") != null) { params.put("org_id", manager.getIntValue("org_id")); diff --git a/src/main/java/au/com/royalpay/payment/manage/permission/manager/scanner/ManagerPermissionScanner.java b/src/main/java/au/com/royalpay/payment/manage/permission/manager/scanner/ManagerPermissionScanner.java index 367d66c2d..4ef782ded 100644 --- a/src/main/java/au/com/royalpay/payment/manage/permission/manager/scanner/ManagerPermissionScanner.java +++ b/src/main/java/au/com/royalpay/payment/manage/permission/manager/scanner/ManagerPermissionScanner.java @@ -54,7 +54,7 @@ public class ManagerPermissionScanner implements BeanPostProcessor, PermissionRe PermissionNode node = new PermissionNode(controller.getSimpleName(), method.getName()); getRequestInfo(node, clazzRequestMapping, methodMapping); node.setPermissions(clazzPermission, methodPermission); - logger.debug("register permission:" + node.getFuncName() + ":" + node.getRequestId()); + logger.trace("register permission:{}:{}", node.getFuncName(), node.getRequestId()); if (permissionNodes.containsKey(node.getFuncId())) { throw new RuntimeException("Duplicated permission function ID:" + controller.getName() + "." + method.getName()); } diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml index 31b22606e..d2319f3f7 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml @@ -307,14 +307,16 @@ and t.transaction_time < #{to}