去除异步处理

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

@@ -30,26 +30,28 @@ public class CommonController {
     }
 
     @PostMapping("/action/audit")
-    public DeferredResult commonAudit(@RequestParam("table") String table, @RequestParam("keyvalue") String keyvalue, @RequestParam("status") String status,
+    public void commonAudit(@RequestParam("table") String table, @RequestParam("keyvalue") String keyvalue, @RequestParam("status") String status,
                                       @RequestParam("statuscode") String statuscode, @RequestParam("auditdate") String auditdate, @RequestParam("auditman") String auditman) {
 
-        DeferredResult<String> deferredResult = new DeferredResult<>();
+        /*DeferredResult<String> deferredResult = new DeferredResult<>();
         CompletableFuture.supplyAsync(() -> commonService.commonAudit(table, keyvalue, status, statuscode, auditdate, auditman))
                 .whenCompleteAsync((result, throwable) -> deferredResult.setResult(result));
-        return deferredResult;
+        return deferredResult;*/
+        commonService.commonAudit(table, keyvalue, status, statuscode, auditdate, auditman);
     }
 
     @PostMapping("/action/resAudit")
-    public DeferredResult commonResAudit(@RequestParam("table") String table, @RequestParam("keyvalue") String keyvalue, @RequestParam("status") String status,
+    public void commonResAudit(@RequestParam("table") String table, @RequestParam("keyvalue") String keyvalue, @RequestParam("status") String status,
                                       @RequestParam("statuscode") String statuscode, @RequestParam("auditdate") String auditdate, @RequestParam("auditman") String auditman) {
 
-        DeferredResult<String> deferredResult = new DeferredResult<>();
+       /* DeferredResult<String> deferredResult = new DeferredResult<>();
         CompletableFuture.supplyAsync(() -> commonService.commonResAudit(table, keyvalue, status, statuscode, auditdate, auditman))
                 .whenCompleteAsync((result, throwable) -> deferredResult.setResult(result));
-        return deferredResult;
+        return deferredResult;*/
+        commonService.commonResAudit(table, keyvalue, status, statuscode, auditdate, auditman);
     }
 
-    @GetMapping("/timeout/test")
+    /*@GetMapping("/timeout/test")
     public void timeout(@RequestParam("time") Long time){
         try {
             System.out.println("进入时间:" + time);
@@ -58,5 +60,5 @@ public class CommonController {
         }catch (Exception e){
             e.printStackTrace();
         }
-    }
+    }*/
 }

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

@@ -38,75 +38,83 @@ public class MessageLogController {
     }
 
     @RequestMapping("/save")
-    public DeferredResult<String> save(@RequestBody DocBaseDTO baseDTO) {
+    public void save(@RequestBody DocBaseDTO baseDTO) {
         // Create the deferredResult and initiate a callback object, task, with it
-        DeferredResult<String> deferredResult = new DeferredResult<>();
+       /* DeferredResult<String> deferredResult = new DeferredResult<>();
         CompletableFuture.supplyAsync(() -> messageLogService.save(baseDTO))
                 .whenCompleteAsync((result, throwable) -> deferredResult.setResult(result));
-        return deferredResult;
+        return deferredResult;*/
+        messageLogService.save(baseDTO);
     }
 
     @RequestMapping("/update")
-    public DeferredResult<String> update(@RequestBody DocBaseDTO baseDTO) {
+    public void update(@RequestBody DocBaseDTO baseDTO) {
         // Create the deferredResult and initiate a callback object, task, with it
-        DeferredResult<String> deferredResult = new DeferredResult<>();
+       /* DeferredResult<String> deferredResult = new DeferredResult<>();
         CompletableFuture.supplyAsync(() -> messageLogService.update(baseDTO))
                 .whenCompleteAsync((result, throwable) -> deferredResult.setResult(result));
-        return deferredResult;
+        return deferredResult;*/
+        messageLogService.update(baseDTO);
     }
 
     @RequestMapping("/delete")
-    public DeferredResult<String> delete(@RequestBody DocBaseDTO baseDTO) {
+    public void delete(@RequestBody DocBaseDTO baseDTO) {
         // Create the deferredResult and initiate a callback object, task, with it
-        DeferredResult<String> deferredResult = new DeferredResult<>();
+        /*DeferredResult<String> deferredResult = new DeferredResult<>();
         CompletableFuture.supplyAsync(() -> messageLogService.delete(baseDTO))
                 .whenCompleteAsync((result, throwable) -> deferredResult.setResult(result));
-        return deferredResult;
+        return deferredResult;*/
+        messageLogService.delete(baseDTO);
     }
 
     @RequestMapping("/deleteDetail")
-    public DeferredResult<String> deleteDetail(@RequestBody DocBaseDTO baseDTO) {
+    public void deleteDetail(@RequestBody DocBaseDTO baseDTO) {
         // Create the deferredResult and initiate a callback object, task, with it
-        DeferredResult<String> deferredResult = new DeferredResult<>();
+        /*DeferredResult<String> deferredResult = new DeferredResult<>();
         CompletableFuture.supplyAsync(() -> messageLogService.deleteDetail(baseDTO))
                 .whenCompleteAsync((result, throwable) -> deferredResult.setResult(result));
-        return deferredResult;
+        return deferredResult;*/
+        messageLogService.deleteDetail(baseDTO);
     }
 
     @RequestMapping("/audit")
-    public DeferredResult<String> audit(@RequestBody DocBaseDTO baseDTO) {
+    public void audit(@RequestBody DocBaseDTO baseDTO) {
         // Create the deferredResult and initiate a callback object, task, with it
-        DeferredResult<String> deferredResult = new DeferredResult<>();
+        /*DeferredResult<String> deferredResult = new DeferredResult<>();
         CompletableFuture.supplyAsync(() -> messageLogService.audit(baseDTO))
                 .whenCompleteAsync((result, throwable) -> deferredResult.setResult(result));
-        return deferredResult;
+        return deferredResult;*/
+        messageLogService.audit(baseDTO);
     }
 
     @RequestMapping("/unAudit")
-    public DeferredResult<String> unAudit(@RequestBody DocBaseDTO baseDTO) {
+    public void unAudit(@RequestBody DocBaseDTO baseDTO) {
         // Create the deferredResult and initiate a callback object, task, with it
-        DeferredResult<String> deferredResult = new DeferredResult<>();
+        /*DeferredResult<String> deferredResult = new DeferredResult<>();
         CompletableFuture.supplyAsync(() -> messageLogService.unAudit(baseDTO))
                 .whenCompleteAsync((result, throwable) -> deferredResult.setResult(result));
-        return deferredResult;
+        return deferredResult;*/
+        messageLogService.unAudit(baseDTO);
     }
 
     @RequestMapping("/close")
-    public DeferredResult<String> close(@RequestBody DocBaseDTO baseDTO) {
+    public void close(@RequestBody DocBaseDTO baseDTO) {
         // Create the deferredResult and initiate a callback object, task, with it
-        DeferredResult<String> deferredResult = new DeferredResult<>();
+        /*DeferredResult<String> deferredResult = new DeferredResult<>();
         CompletableFuture.supplyAsync(() -> messageLogService.close(baseDTO))
                 .whenCompleteAsync((result, throwable) -> deferredResult.setResult(result));
-        return deferredResult;
+        return deferredResult;*/
+        messageLogService.close(baseDTO);
     }
 
     @RequestMapping("/open")
-    public DeferredResult<String> open(@RequestBody DocBaseDTO baseDTO) {
+    public void open(@RequestBody DocBaseDTO baseDTO) {
         // Create the deferredResult and initiate a callback object, task, with it
-        DeferredResult<String> deferredResult = new DeferredResult<>();
+        /*DeferredResult<String> deferredResult = new DeferredResult<>();
         CompletableFuture.supplyAsync(() -> messageLogService.open(baseDTO))
                 .whenCompleteAsync((result, throwable) -> deferredResult.setResult(result));
-        return deferredResult;
+        return deferredResult;*/
+        messageLogService.open(baseDTO);
     }
 
     /**
@@ -117,12 +125,13 @@ public class MessageLogController {
     * @Date: 2018/10/25
     */
     @RequestMapping("/customizeLog")
-    public DeferredResult<String> customizeLog(@RequestBody DocBaseDTO baseDTO, @RequestParam Operation operation) {
+    public void customizeLog(@RequestBody DocBaseDTO baseDTO, @RequestParam Operation operation) {
         // Create the deferredResult and initiate a callback object, task, with it
-        DeferredResult<String> deferredResult = new DeferredResult<>();
+        /*DeferredResult<String> deferredResult = new DeferredResult<>();
         System.out.println(operation.getTitle() + "  : " + operation.getResult());
         CompletableFuture.supplyAsync(() -> messageLogService.customizeLog(baseDTO, operation))
                 .whenCompleteAsync((result, throwable) -> deferredResult.setResult(result));
-        return deferredResult;
+        return deferredResult;*/
+        messageLogService.customizeLog(baseDTO, operation);
     }
 }