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

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ImportTaskController.java

@@ -69,12 +69,12 @@ public class ImportTaskController {
     }
 
     /**
-     * 检查是否有正在执行的任务
-     * @param bizType 业务类型
+     * 检查是否有正在执行的任务。
+     * @param bizType 业务类型，非必填，不传则任意一种导入正在执行都会返回true
      * @return
      */
     @GetMapping("processing-check")
-    public Result processingTaskCheck(@RequestParam("biz_type") String bizType) {
+    public Result processingTaskCheck(@RequestParam(value = "biz_type", required = false) String bizType) {
         Boolean r = importTaskService.processingTaskCheck(bizType);
         return new Result().ok(r);
     }

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java

@@ -14,6 +14,7 @@ import com.epmet.entity.ImportTaskEntity;
 import com.epmet.service.ImportTaskService;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -112,7 +113,9 @@ public class ImportTaskServiceImpl implements ImportTaskService {
     @Override
     public Boolean processingTaskCheck(String bizType) {
         LambdaQueryWrapper<ImportTaskEntity> query = new LambdaQueryWrapper<>();
-        query.eq(ImportTaskEntity::getBizType, bizType);
+        if (StringUtils.isNotBlank(bizType)) {
+            query.eq(ImportTaskEntity::getBizType, bizType);
+        }
         query.eq(ImportTaskEntity::getProcessStatus, ImportTaskConstants.PROCESS_STATUS_PROCESSING);
 
         return importRecordDao.selectCount(query) > 0;

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java

@@ -586,8 +586,7 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
             String url = erroeImport(fileList);
             upImportTask(url, taskId, tokenDto.getUserId(), true);
         } catch (Exception e) {
-            e.printStackTrace();
-            log.error("【社会自组织信息导入】程序错误");
+            log.error("【社会自组织信息导入】程序错误", e);
             upImportTask(null, taskId, tokenDto.getUserId(), false);
         }
     }