Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenExtractDailyController.java

@@ -39,15 +39,15 @@ public class ScreenExtractDailyController {
      */
     @PostMapping("extractdailyall")
     public Result screenExtractDaily(@RequestBody ExtractOriginFormDTO extractOriginFormDTO) {
-        executorService.submit(() -> {
-            log.info("screenExtractDaily start,param:{}", JSON.toJSONString(extractOriginFormDTO));
-            try {
-                screenExtractService.extractDailyAll(extractOriginFormDTO);
-                log.info("screenExtractDaily end");
-            } catch (Exception e) {
-                log.error("screenExtractDaily exception", e);
-            }
-        });
+
+        log.info("screenExtractDaily start,param:{}", JSON.toJSONString(extractOriginFormDTO));
+        try {
+            screenExtractService.extractDailyAll(extractOriginFormDTO);
+            log.info("screenExtractDaily end");
+        } catch (Exception e) {
+            log.error("screenExtractDaily exception", e);
+        }
+
         return new Result();
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java

@@ -342,7 +342,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
             }
             log.info("===== extractDaily method end customerId:{}======",customerId);
         } catch (Exception e) {
-            log.error("extractDaily exception msg:{}", e);
+            log.error("extractDaily exception msg", e);
         } finally {
             distributedLock.unLock(lock);
         }