diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAiApprovalTools.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAiApprovalTools.java index a71e887b..5da0a6a6 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAiApprovalTools.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAiApprovalTools.java @@ -60,10 +60,11 @@ public class OcrAiApprovalTools { ai审批工单 */ @RequestMapping(value = "/aiApprovaltools", method = RequestMethod.GET) - public ResultVo aiApprovaltools(HttpServletRequest request,@RequestParam(value = "taskid", required = true) String taskid) { + public ResultVo aiApprovaltools(HttpServletRequest request,@RequestParam(value = "taskid", required = true) String taskid, + @RequestParam(value = "nodeType", required = true) Integer nodeType) { UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); - Map selectaisp = iocrsearchhistoryservice.selectaisp(userToken.getUserid(), taskid); + Map selectaisp = iocrsearchhistoryservice.selectaisp(userToken.getUserid(), taskid,nodeType); return ResultVoUtil.success(selectaisp); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java index 3c78666e..9284480c 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java @@ -31,5 +31,7 @@ public interface OcrSearchHistoryMapper extends BaseMapper { Map selectaisp(@Param("id")String id); + List> selectaispList(@Param("id")String id); + String selectaiuser(@Param("userid")String userid); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java index 5624c592..70bb0c88 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java @@ -21,7 +21,7 @@ public interface IOcrSearchHistoryService extends IService { ResultVo toolscount(String tenantid); - Map selectaisp(String userid,String id); + Map selectaisp(String userid,String id,Integer nodeType); ResultVo clearmark(String id); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java index 23bb0b30..6afb6b9b 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java @@ -1,5 +1,6 @@ package cn.jyjz.xiaoyao.ocr.service.impl; +import cn.jyjz.xiaoyao.admin.dataobject.User; import cn.jyjz.xiaoyao.common.base.vo.ResultVo; import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil; import cn.jyjz.xiaoyao.common.redis.cache.ICacheManager; @@ -8,8 +9,10 @@ import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture; import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchHistory; import cn.jyjz.xiaoyao.ocr.service.IOcrSearchHistoryService; import cn.jyjz.xiaoyao.ocr.service.OcrPictureService; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import cn.jyjz.xiaoyao.ocr.dataDao.OcrSearchHistoryMapper; @@ -74,36 +77,73 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl selectaisp(String userid,String id) { +// Map selectaisp = ocrsearchhistorymapper.selectaisp(id); +// if(null==selectaisp){ +// return null; +// } +// String selectaiuser = ocrsearchhistorymapper.selectaiuser(userid); +// +// String[] cps = selectaisp.get("pictureresult").toString().split(","); +// +// List saveList = new ArrayList<>(); +// int i=0; +// for (String childpictureid : cps) { +// if (childpictureid.equals("100")){ +// i++; +// } +// } +// +// Map map=new HashMap<>(); +// map.put("taskid",id); +// map.put("tenantusername",selectaiuser); +// map.put("packagename",selectaisp.get("packagename")); +// map.put("tasks","基线任务"); +//// map.put("similarcount",selectaisp.get("similarcount")); +// map.put("createtime",selectaisp.get("createtime")); +// map.put("similarComplete",i); +// +// return map; +// } + @Override - public Map selectaisp(String userid,String id) { - Map selectaisp = ocrsearchhistorymapper.selectaisp(id); - if(null==selectaisp){ - return null; + public Map selectaisp(String userid, String id,Integer nodeType) { + List> resultList = ocrsearchhistorymapper.selectaispList(id); + if (resultList == null || resultList.isEmpty()) { + return Collections.emptyMap(); } - String selectaiuser = ocrsearchhistorymapper.selectaiuser(userid); - String[] cps = selectaisp.get("pictureresult").toString().split(","); - - List saveList = new ArrayList<>(); - int i=0; - for (String childpictureid : cps) { - if (childpictureid.equals("100")){ - i++; + Map mappedResults = new LinkedHashMap<>(); + String selectaiuser = ocrsearchhistorymapper.selectaiuser(userid); + mappedResults.put("packageId", id); + mappedResults.put("tenantUserName", selectaiuser); + mappedResults.put("packageName", resultList.get(0).get("packageName")); + mappedResults.put("createTime", resultList.get(0).get("createTime")); + int similarComplete = 0; + List pictureIds = new ArrayList<>(); // 存储所有的pictureId + for (Map selectaisp : resultList) { + Object pictureResult = selectaisp.get("pictureResult"); + String pictureResultStr = pictureResult.toString(); + if ("100.0".equals(pictureResultStr)) { + similarComplete++; + } + Object pictureId = selectaisp.get("pictureId"); + if (pictureId != null) { + pictureIds.add(pictureId); } } - - Map map=new HashMap<>(); - map.put("taskid",id); - map.put("tenantusername",selectaiuser); - map.put("packagename",selectaisp.get("packagename")); - map.put("tasks","基线任务"); -// map.put("similarcount",selectaisp.get("similarcount")); - map.put("createtime",selectaisp.get("createtime")); - map.put("similarComplete",i); - - return map; +// List failedPictureIds = fakeInterface.getFailedPictureIds(pictureIds,nodeType); // 假的接口，根据pictureId集合获取不通过的pictureId列表 +// int passedCount = pictureIds.size() - failedPictureIds.size(); // 通过的数量 +// int failedCount = failedPictureIds.size(); // 不通过的数量 + mappedResults.put("similarComplete", similarComplete); +// mappedResults.put("passedCount", passedCount); +// mappedResults.put("failedCount", failedCount); +// mappedResults.put("failedPictureIds", failedPictureIds); + return mappedResults; } + @Override public ResultVo clearmark(String id) { diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml index 6ea6dd23..60723532 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml @@ -66,22 +66,23 @@ (SELECT COUNT(*) FROM ocr_taskchild_picture WHERE TENANTID = ""#{tenantid}"" AND STATES = '3') as approved - - - - - - + - SELECT tp.id as id, - tp.name as packagename, - GROUP_CONCAT(IFNULL(cdr.max_similarity, 0)) as pictureresult, - tp.create_time as createtime + tp.name as packageName, + cdr.picture_id as pictureId, + IFNULL(cdr.max_similarity, 0) as pictureResult, + tp.create_time as createTime FROM ocr_task_package tp LEFT JOIN ocr_check_duplicate_result cdr ON tp.check_duplicate_id = cdr.check_duplicate_id @@ -89,6 +90,7 @@ tp.ID = #{id} +