日志代码更新

applications/commons/commons-api/src/main/java/com/usoftchina/saas/commons/api/MessageLogService.java

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.commons.api;
 
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
+import com.usoftchina.saas.commons.po.Operation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -40,5 +41,5 @@ public interface MessageLogService {
     public String open(@RequestBody DocBaseDTO baseDTO);
 
     @RequestMapping("/messagelog/customizeLog")
-    public DeferredResult<String> customizeLog(@RequestBody DocBaseDTO baseDTO, @RequestParam("content") String content);
+    public String customizeLog(@RequestBody DocBaseDTO baseDTO, @RequestParam("operation") Operation operation);
 }

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/controller/MessageLogController.java

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.commons.controller;
 
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
+import com.usoftchina.saas.commons.po.Operation;
 import com.usoftchina.saas.commons.service.MessageLogService;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -103,10 +104,11 @@ public class MessageLogController {
     * @Date: 2018/10/25
     */
     @RequestMapping("/customizeLog")
-    public DeferredResult<String> customizeLog(@RequestBody DocBaseDTO baseDTO, @RequestParam("content") String content) {
+    public DeferredResult<String> customizeLog(@RequestBody DocBaseDTO baseDTO, @RequestParam Operation operation) {
         // Create the deferredResult and initiate a callback object, task, with it
         DeferredResult<String> deferredResult = new DeferredResult<>();
-        CompletableFuture.supplyAsync(() -> messageLogService.customizeLog(baseDTO, content))
+        System.out.println(operation.getTitle() + "  : " + operation.getResult());
+        CompletableFuture.supplyAsync(() -> messageLogService.customizeLog(baseDTO, operation))
                 .whenCompleteAsync((result, throwable) -> deferredResult.setResult(result));
         return deferredResult;
     }

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/service/MessageLogService.java

@@ -4,6 +4,7 @@ import com.usoftchina.saas.base.service.CommonBaseService;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.mapper.MessagelogMapper;
 import com.usoftchina.saas.commons.po.Messagelog;
+import com.usoftchina.saas.commons.po.Operation;
 
 public interface MessageLogService extends CommonBaseService<MessagelogMapper, Messagelog>{
     String save(DocBaseDTO baseDTO);
@@ -22,5 +23,5 @@ public interface MessageLogService extends CommonBaseService<MessagelogMapper, M
 
     String open(DocBaseDTO baseDTO);
 
-    String customizeLog(DocBaseDTO baseDTO, String content);
+    String customizeLog(DocBaseDTO baseDTO, Operation operation);
 }

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/service/impl/MessageLogServiceImpl.java

@@ -68,18 +68,8 @@ public class MessageLogServiceImpl extends CommonBaseServiceImpl<MessagelogMappe
     }
 
     @Override
-    public String customizeLog(DocBaseDTO baseDTO, String content) {
-        Messagelog msg = new Messagelog();
-        msg.setMl_caller(baseDTO.getName());
-        msg.setMl_content(content);
-        msg.setMl_result(content);
-        msg.setMl_code(baseDTO.getCode());
-        msg.setCompanyId(BaseContextHolder.getCompanyId());
-        msg.setCreateTime(new Date());
-        msg.setCreatorId(BaseContextHolder.getUserId());
-        msg.setMl_keyvalue(baseDTO.getId());
-        getMapper().insert(msg);
-        return "success";
+    public String customizeLog(DocBaseDTO baseDTO, Operation operation) {
+        return log(operation, baseDTO);
     }
 
     private String log(Operation operation, DocBaseDTO baseDTO) {