Bladeren bron

AI任务查询修改

wangchao 4 jaren geleden
bovenliggende
commit
ce044f9769

+ 6 - 2
security-protection-service/src/main/java/com/ai/bss/security/protection/controller/SysConfigAiTaskController.java

@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody;
18 18
import org.springframework.web.bind.annotation.RequestMapping;
19 19
import org.springframework.web.bind.annotation.ResponseBody;
20 20
21
import java.util.Arrays;
21 22
import java.util.HashMap;
22 23
import java.util.List;
23 24
import java.util.Map;
@ -53,13 +54,16 @@ public class SysConfigAiTaskController {
53 54
		int pageNumber = aiQuery.getPageNumber() < 1 ? 1 : aiQuery.getPageNumber();
54 55
		// 每页条数
55 56
		int pageSize = aiQuery.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE : aiQuery.getPageSize();
56
57 57
		Map<String, Object> params = new HashMap<>();
58
59
		if(null!=aiQuery.getAiTaskStatus()&&!"".equals(aiQuery.getAiTaskStatus())){
60
			List<String> statusList = Arrays.asList(aiQuery.getAiTaskStatus());
61
			params.put("statusList",statusList);
62
		}
58 63
		params.put("workOrgId",aiQuery.getWorkOrgId());
59 64
		params.put("name",aiQuery.getName());
60 65
		params.put("nameAsLike",aiQuery.getNameAsLike());
61 66
		params.put("aiIdenModel",aiQuery.getAiIdenModel());
62
		params.put("statusList",aiQuery.getStatusList());
63 67
64 68
		CommonResponse<PageBean<Map<String, Object>>> commonResponse = sysConfigAiTaskService.queryPageAiTask(params, pageNumber, pageSize);
65 69

+ 1 - 1
security-protection-service/src/main/java/com/ai/bss/security/protection/model/AiQuery.java

@ -57,5 +57,5 @@ public class AiQuery {
57 57
58 58
    private String relateEmployeeNameAsLike; // 员工名称(模糊匹配)
59 59
60
60
    private String aiTaskStatus; // AI任务执行状态
61 61
}

+ 12 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/SysConfigAiTaskServiceImpl.java

@ -36,7 +36,19 @@ public class SysConfigAiTaskServiceImpl implements SysConfigAiTaskService {
36 36
37 37
    @Override
38 38
    public CommonResponse<PageBean<Map<String, Object>>> queryPageAiTask(Map<String, Object> params, int pageNumber, int pageSize) {
39
        CommonResponse<List<AiModel>> aiModelList = aiTaskQuery.findAiModelList(new CommonRequest<Void>(null));
40
39 41
        CommonResponse<PageBean<Map<String, Object>>> queryResult = aiTaskQuery.queryAiTask(new CommonRequest<>(params, pageNumber, pageSize));
42
        List<Map<String, Object>> aiTaskList = queryResult.getData().getData();
43
        if(null!=aiTaskList&&aiTaskList.size()>0){
44
            aiTaskList.forEach((aiTask)->{
45
                aiModelList.getData().forEach((aiModel)->{
46
                    if(null!=aiTask.get("aiIdenModel")&& aiTask.get("aiIdenModel").equals(aiModel.getAiIdenModel() )){
47
                        aiTask.put("aiIdenModel", aiModel.getName());
48
                    }
49
                });
50
            });
51
        }
40 52
        return queryResult;
41 53
    }
42 54