日志

src/main/java/common/controller/UserLogController.java

@@ -16,7 +16,7 @@ import java.util.List;
  * Created by zxy on 2017/12/27.
  */
 @Controller
-@RequestMapping(value = "userlog")
+@RequestMapping(value = "system/userlog")
 public class UserLogController
 {
     @Autowired UserLogService userLogService;

src/main/java/tkio/controller/TkioAccountController.java

@@ -5,12 +5,16 @@ import common.model.Payment;
 import common.model.Reminder;
 import common.model.User;
 import common.service.UserService;
+import dic.OperateObjectTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import security.annotation.CurrentAccount;
 import tkio.service.TkioAccountService;
 import util.ResultModel;
+import util.UserLogThread;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * Created by mxq on 2017/12/21.
@@ -29,35 +33,40 @@ public class TkioAccountController {
         return ResultModel.OK(tkioAccountService.findAll(loginAccount));
     }
 
+
     //关闭到期提醒
     @RequestMapping(value = "/forbiden", method = RequestMethod.PUT)
     @ResponseBody
-    public ResultModel forbiden(@CurrentAccount User loginAccount, @RequestBody Reminder resource) {
-
+    public ResultModel forbiden(@CurrentAccount User loginAccount, @RequestBody Reminder resource, HttpServletRequest request) {
+        UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "关闭到期提醒", request);
+        userlog.start();
         return ResultModel.OK(tkioAccountService.forbiden(loginAccount, resource));
     }
 
     //开启到期提醒
     @RequestMapping(value = "/enable", method = RequestMethod.PUT)
     @ResponseBody
-    public ResultModel enable(@CurrentAccount User loginAccount, @RequestBody Reminder resource) {
-
+    public ResultModel enable(@CurrentAccount User loginAccount, @RequestBody Reminder resource, HttpServletRequest request) {
+        UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "开启到期提醒", request);
+        userlog.start();
         return ResultModel.OK(tkioAccountService.enable(loginAccount, resource));
     }
 
     //缴费
     @RequestMapping(value = "/pay", method = RequestMethod.PUT)
     @ResponseBody
-    public ResultModel pay(@CurrentAccount User loginAccount, @RequestBody Payment resource) {
-
+    public ResultModel pay(@CurrentAccount User loginAccount, @RequestBody Payment resource, HttpServletRequest request) {
+        UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "缴费", request);
+        userlog.start();
         return ResultModel.OK(tkioAccountService.pay(loginAccount, resource));
     }
 
     //回访
     @RequestMapping(value = "/visit", method = RequestMethod.PUT)
     @ResponseBody
-    public ResultModel visit(@CurrentAccount User loginAccount, @RequestBody BackVisit resource) {
-
+    public ResultModel visit(@CurrentAccount User loginAccount, @RequestBody BackVisit resource, HttpServletRequest request) {
+        UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "回访", request);
+        userlog.start();
         return ResultModel.OK( tkioAccountService.visit(loginAccount, resource));
     }
     //功能使用查询

src/main/java/track/controller/TrackAccountController.java

@@ -4,6 +4,7 @@ import common.model.BackVisit;
 import common.model.Payment;
 import common.model.Reminder;
 import common.model.User;
+import dic.OperateObjectTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -11,6 +12,9 @@ import security.annotation.CurrentAccount;
 import tkio.service.TkioAccountService;
 import track.service.TrackAccountService;
 import util.ResultModel;
+import util.UserLogThread;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * Created by mxq on 2017/12/21.
@@ -32,32 +36,36 @@ public class TrackAccountController {
     //关闭到期提醒
     @RequestMapping(value = "/forbiden", method = RequestMethod.PUT)
     @ResponseBody
-    public ResultModel forbiden(@CurrentAccount User loginAccount, @RequestBody Reminder resource) {
-
+    public ResultModel forbiden(@CurrentAccount User loginAccount, @RequestBody Reminder resource, HttpServletRequest request) {
+        UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "关闭到期提醒", request);
+        userlog.start();
         return ResultModel.OK(tkioAccountService.forbiden(loginAccount, resource));
     }
 
     //开启到期提醒
     @RequestMapping(value = "/enable", method = RequestMethod.PUT)
     @ResponseBody
-    public ResultModel enable(@CurrentAccount User loginAccount, @RequestBody Reminder resource) {
-
+    public ResultModel enable(@CurrentAccount User loginAccount, @RequestBody Reminder resource, HttpServletRequest request) {
+        UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "开启到期提醒", request);
+        userlog.start();
         return ResultModel.OK(tkioAccountService.enable(loginAccount, resource));
     }
 
     //缴费
     @RequestMapping(value = "/pay", method = RequestMethod.PUT)
     @ResponseBody
-    public ResultModel pay(@CurrentAccount User loginAccount, @RequestBody Payment resource) {
-
+    public ResultModel pay(@CurrentAccount User loginAccount, @RequestBody Payment resource, HttpServletRequest request) {
+        UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "缴费", request);
+        userlog.start();
         return ResultModel.OK(tkioAccountService.pay(loginAccount, resource));
     }
 
     //回访
     @RequestMapping(value = "/visit", method = RequestMethod.PUT)
     @ResponseBody
-    public ResultModel visit(@CurrentAccount User loginAccount, @RequestBody BackVisit resource) {
-
+    public ResultModel visit(@CurrentAccount User loginAccount, @RequestBody BackVisit resource, HttpServletRequest request) {
+        UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "回访", request);
+        userlog.start();
         return ResultModel.OK( tkioAccountService.visit(loginAccount, resource));
     }
     //功能使用查询