From 0d9612e587e98b41267de950e6e5fa9df2d95a1c Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Fri, 15 Jun 2018 15:21:21 +0800 Subject: [PATCH] add config operation log --- .../logview/core/OperationLogService.java | 20 ++++++ .../core/impl/OperationLogServiceImpl.java | 66 +++++++++++++++++++ .../web/ConfigOperationController.java | 19 +++--- .../analysis/mappers/BDAnalysisMapper.xml | 1 + src/main/ui/static/config/logview/logview.js | 10 +-- .../templates/config_opertaion_log.html | 46 +++++-------- .../static/config/logview/templates/root.html | 4 ++ 7 files changed, 122 insertions(+), 44 deletions(-) create mode 100644 src/main/java/au/com/royalpay/payment/manage/logview/core/OperationLogService.java create mode 100644 src/main/java/au/com/royalpay/payment/manage/logview/core/impl/OperationLogServiceImpl.java diff --git a/src/main/java/au/com/royalpay/payment/manage/logview/core/OperationLogService.java b/src/main/java/au/com/royalpay/payment/manage/logview/core/OperationLogService.java new file mode 100644 index 000000000..a8b60c127 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/logview/core/OperationLogService.java @@ -0,0 +1,20 @@ +package au.com.royalpay.payment.manage.logview.core; + +import au.com.royalpay.payment.manage.merchants.beans.mongo.ClientConfigLog; + +import com.alibaba.fastjson.JSONObject; +import com.github.miemiedev.mybatis.paginator.domain.PageBounds; + +import java.util.List; + +/** + * @author kira + * @date 2018/6/15 + */ +public interface OperationLogService { + + List query(JSONObject params); + + JSONObject query(JSONObject params, PageBounds pageBounds); + +} 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 new file mode 100644 index 000000000..40bd74e2b --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/logview/core/impl/OperationLogServiceImpl.java @@ -0,0 +1,66 @@ +package au.com.royalpay.payment.manage.logview.core.impl; + +import au.com.royalpay.payment.manage.logview.core.OperationLogService; +import au.com.royalpay.payment.manage.merchants.beans.mongo.ClientConfigLog; +import au.com.royalpay.payment.manage.merchants.core.ClientManager; + +import com.alibaba.fastjson.JSONObject; +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.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.data.mongodb.core.query.Query; +import org.springframework.stereotype.Service; + +import java.util.List; + +import javax.annotation.Resource; + +/** + * @author kira + * @date 2018/6/15 + */ +@Service +public class OperationLogServiceImpl implements OperationLogService { + @Resource + private MongoTemplate mongoTemplate; + @Resource + private ClientManager clientManager; + + @Override + public JSONObject query(JSONObject params, PageBounds pageBounds) { + if (StringUtils.isNotEmpty(params.getString("client_moniker"))) { + JSONObject client = clientManager.getClientInfoByMoniker(params.getString("client_moniker")); + if(client!=null) { + params.put("client_id", client.getIntValue("client_id")); + } + } + Query query = new Query(); + if (params.getIntValue("client_id") != 0) { + query.addCriteria(Criteria.where("clientId").is(params.getIntValue("client_id"))); + } + List clientConfigLogList = mongoTemplate.find(query, ClientConfigLog.class); + return buildPageListResult(clientConfigLogList, + new Paginator(pageBounds.getPage(), pageBounds.getLimit(), (int) mongoTemplate.count(query, ClientConfigLog.class))); + + } + + @Override + public List query(JSONObject params) { + Query query = new Query(); + query.addCriteria(Criteria.where("clientId").is(params.getIntValue("client_id"))); + List clientConfigLogList = mongoTemplate.find(query, ClientConfigLog.class); + Paginator paginator = new Paginator(1, 1, 1); + + return null; + } + + public static JSONObject buildPageListResult(List datas, Paginator paginator) { + JSONObject res = new JSONObject(); + res.put("data", datas); + res.put("pagination", paginator); + return res; + } +} 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 32e839412..3eea7c28d 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,14 +1,13 @@ package au.com.royalpay.payment.manage.logview.web; -import au.com.royalpay.payment.manage.logview.beans.WechatMsgQueryBean; -import au.com.royalpay.payment.manage.logview.core.WechatMsgRepository; -import au.com.royalpay.payment.manage.permission.manager.ManagerMapping; -import au.com.royalpay.payment.tools.permission.enums.ManagerRole; +import au.com.royalpay.payment.manage.logview.core.OperationLogService; import com.alibaba.fastjson.JSONObject; +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; @@ -17,13 +16,15 @@ import javax.annotation.Resource; * Created by Tayl0r on 2017/5/3. */ @RestController -@ManagerMapping(value = "/sys_logs/config/operation", method = RequestMethod.GET, role = ManagerRole.ADMIN) +@RequestMapping(value = "/sys_logs/config/operation") public class ConfigOperationController { @Resource - private WechatMsgRepository wechatMsgRepository; + private OperationLogService operationLogService; - @RequestMapping - public JSONObject listWechatMsgs(WechatMsgQueryBean wechatMsgQueryBean){ - return wechatMsgRepository.listWechatMsgs(wechatMsgQueryBean); + @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)); } } diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml index f5f83a564..b95b87800 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml @@ -144,6 +144,7 @@ INNER JOIN sys_clients c ON c.client_id = b.client_id AND b.start_date <= c.approve_time AND (b.end_date > c.approve_time OR b.end_date IS NULL) WHERE c.approve_time >= #{begin} AND c.approve_time < #{end} AND c.is_valid = 1 AND c.approve_result = 1 + and b.is_valid=1 ]]> and c.org_id=#{org_id} and c.org_id in diff --git a/src/main/ui/static/config/logview/logview.js b/src/main/ui/static/config/logview/logview.js index 023c24d8b..cf5a1a0da 100644 --- a/src/main/ui/static/config/logview/logview.js +++ b/src/main/ui/static/config/logview/logview.js @@ -117,17 +117,17 @@ define(['angular', 'uiRouter'], function (angular) { app.controller('configOperationLogCtrl', ['$scope', '$http', '$filter', function ($scope, $http, $filter) { $scope.pagination = {}; - $scope.params = {date: new Date()}; - $scope.listWechatMsgs = function (page) { + $scope.params = {}; + $scope.listConfiglogs = function (page) { var params = angular.copy($scope.params) || {}; params.page = page || $scope.pagination.page || 1; params.date = $filter('date')(params.date, 'yyyyMMdd'); - $http.get('/sys_logs/wechat_msg', {params: params}).then(function (resp) { - $scope.wechatMsgs = resp.data.data; + $http.get('/sys_logs/config/operation', {params: params}).then(function (resp) { + $scope.logs = resp.data.data; $scope.pagination = resp.data.pagination; }); }; - $scope.listWechatMsgs(); + $scope.listConfiglogs(); }]); return app; 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 d50f52b00..9c45e5586 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 @@ -3,25 +3,7 @@
- -
-
- - -
-
- - -
-
- - +