Browse Source

修改:

1.是否有正在执行的导入任务
master
wangxianzhang 4 years ago
parent
commit
5fc67d7d19
  1. 6
      epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ImportTaskController.java
  2. 5
      epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java

6
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 * @return
*/ */
@GetMapping("processing-check") @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); Boolean r = importTaskService.processingTaskCheck(bizType);
return new Result().ok(r); return new Result().ok(r);
} }

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

Loading…
Cancel
Save