From ce5e9c574fd135aeeec05ddedfb1ca04a8edb82c Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Tue, 19 Jun 2018 16:49:01 +0800 Subject: [PATCH] update mongo log --- .../beans/ConfigOperationQueryBean.java | 84 +++++++++++++++++++ .../core/impl/OperationLogServiceImpl.java | 3 + .../web/ConfigOperationController.java | 8 +- src/main/ui/static/config/logview/logview.js | 10 ++- .../templates/config_opertaion_log.html | 33 +++++++- 5 files changed, 129 insertions(+), 9 deletions(-) create mode 100644 src/main/java/au/com/royalpay/payment/manage/logview/beans/ConfigOperationQueryBean.java diff --git a/src/main/java/au/com/royalpay/payment/manage/logview/beans/ConfigOperationQueryBean.java b/src/main/java/au/com/royalpay/payment/manage/logview/beans/ConfigOperationQueryBean.java new file mode 100644 index 000000000..e36fb9e86 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/logview/beans/ConfigOperationQueryBean.java @@ -0,0 +1,84 @@ +package au.com.royalpay.payment.manage.logview.beans; + +import au.com.royalpay.payment.core.exceptions.ParamInvalidException; + +import com.alibaba.fastjson.JSONObject; + +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; + +import java.text.ParseException; + +/** + * Created by yixian on 2016-10-18. + */ +public class ConfigOperationQueryBean { + private static final String[] pattern = {"yyyyMMdd"}; + private String begin; + private String end; + private int page = 1; + private int limit = 20; + private String client_moniker; + + public JSONObject toJSON() { + JSONObject res = new JSONObject(); + if (begin != null) { + try { + res.put("begin", DateUtils.parseDate(begin, pattern)); + } catch (ParseException e) { + throw new ParamInvalidException("begin", "error.payment.valid.invalid_time"); + } + } + if (end != null) { + try { + res.put("end", DateUtils.parseDate(end, pattern)); + } catch (ParseException e) { + throw new ParamInvalidException("end", "error.payment.valid.invalid_time"); + } + } + if(StringUtils.isNotEmpty(this.client_moniker)){ + res.put("client_moniker",this.client_moniker); + } + return res; + } + + public String getBegin() { + return begin; + } + + public void setBegin(String begin) { + this.begin = begin; + } + + public String getEnd() { + return end; + } + + public void setEnd(String end) { + this.end = end; + } + + public int getPage() { + return page; + } + + public void setPage(int page) { + this.page = page; + } + + public int getLimit() { + return limit; + } + + public void setLimit(int limit) { + this.limit = limit; + } + + public String getClient_moniker() { + return client_moniker; + } + + public void setClient_moniker(String client_moniker) { + this.client_moniker = client_moniker; + } +} diff --git a/src/main/java/au/com/royalpay/payment/manage/logview/core/impl/OperationLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/logview/core/impl/OperationLogServiceImpl.java index 40bd74e2b..13a79832b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/logview/core/impl/OperationLogServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/logview/core/impl/OperationLogServiceImpl.java @@ -9,6 +9,7 @@ import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.Paginator; import org.apache.commons.lang3.StringUtils; +import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; @@ -38,9 +39,11 @@ public class OperationLogServiceImpl implements OperationLogService { } } Query query = new Query(); + query.with(new Sort(new Sort.Order(Sort.Direction.DESC,"createTime"))); if (params.getIntValue("client_id") != 0) { query.addCriteria(Criteria.where("clientId").is(params.getIntValue("client_id"))); } + query.addCriteria(Criteria.where("createTime").gt(params.getDate("begin")).lt(params.getDate("end"))); List clientConfigLogList = mongoTemplate.find(query, ClientConfigLog.class); return buildPageListResult(clientConfigLogList, new Paginator(pageBounds.getPage(), pageBounds.getLimit(), (int) mongoTemplate.count(query, ClientConfigLog.class))); diff --git a/src/main/java/au/com/royalpay/payment/manage/logview/web/ConfigOperationController.java b/src/main/java/au/com/royalpay/payment/manage/logview/web/ConfigOperationController.java index 3eea7c28d..694374aab 100644 --- a/src/main/java/au/com/royalpay/payment/manage/logview/web/ConfigOperationController.java +++ b/src/main/java/au/com/royalpay/payment/manage/logview/web/ConfigOperationController.java @@ -1,5 +1,6 @@ package au.com.royalpay.payment.manage.logview.web; +import au.com.royalpay.payment.manage.logview.beans.ConfigOperationQueryBean; import au.com.royalpay.payment.manage.logview.core.OperationLogService; import com.alibaba.fastjson.JSONObject; @@ -7,7 +8,6 @@ import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -22,9 +22,7 @@ public class ConfigOperationController { private OperationLogService operationLogService; @RequestMapping(method = RequestMethod.GET) - public JSONObject list(@RequestParam(required = false) String client_moniker,@RequestParam(defaultValue = "1") int page,@RequestParam(defaultValue = "10") int limit){ - JSONObject params = new JSONObject(); - params.put("client_moniker",client_moniker); - return operationLogService.query(params,new PageBounds(page,limit)); + public JSONObject list(ConfigOperationQueryBean configOperationQueryBean){ + return operationLogService.query(configOperationQueryBean.toJSON(),new PageBounds(configOperationQueryBean.getPage(),configOperationQueryBean.getLimit())); } } diff --git a/src/main/ui/static/config/logview/logview.js b/src/main/ui/static/config/logview/logview.js index cf5a1a0da..ec7a739ec 100644 --- a/src/main/ui/static/config/logview/logview.js +++ b/src/main/ui/static/config/logview/logview.js @@ -117,11 +117,17 @@ define(['angular', 'uiRouter'], function (angular) { app.controller('configOperationLogCtrl', ['$scope', '$http', '$filter', function ($scope, $http, $filter) { $scope.pagination = {}; - $scope.params = {}; + $scope.params = {begin:new Date().setDate(new Date().getDate()-1),end:new Date()}; $scope.listConfiglogs = function (page) { var params = angular.copy($scope.params) || {}; params.page = page || $scope.pagination.page || 1; - params.date = $filter('date')(params.date, 'yyyyMMdd'); + if (params.begin != null) { + params.begin = $filter('date')(params.begin, 'yyyyMMdd'); + } + if (params.end != null) { + params.end = $filter('date')(params.end, 'yyyyMMdd'); + } + params.page = page || $scope.pagination.page || 1; $http.get('/sys_logs/config/operation', {params: params}).then(function (resp) { $scope.logs = resp.data.data; $scope.pagination = resp.data.pagination; diff --git a/src/main/ui/static/config/logview/templates/config_opertaion_log.html b/src/main/ui/static/config/logview/templates/config_opertaion_log.html index 9c45e5586..427ac75ea 100644 --- a/src/main/ui/static/config/logview/templates/config_opertaion_log.html +++ b/src/main/ui/static/config/logview/templates/config_opertaion_log.html @@ -1,3 +1,17 @@ +
+

Config Operation Logs

+
    +
  1. + Basic Config +
    2. +
  2. + Log Views +
    3. +
  3. Config Operation Logs
    4. +
+
+ +
@@ -5,7 +19,21 @@
-
@@ -52,4 +80,5 @@
Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}
- \ No newline at end of file + +
\ No newline at end of file