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 6721a48d..a71e887b 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 @@ -67,4 +67,11 @@ public class OcrAiApprovalTools { return ResultVoUtil.success(selectaisp); } + @RequestMapping(value = "/aiApprovaltoolsClearmark", method = RequestMethod.GET) + public ResultVo aiApprovaltoolsClearmark(HttpServletRequest request,@RequestParam(value = "taskid", required = true) String taskid) { + + ResultVo clearmark = iocrsearchhistoryservice.clearmark(taskid); + return clearmark; + } + } 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 1ce1b032..641ad9a5 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 @@ -22,4 +22,7 @@ public interface IOcrSearchHistoryService extends IService { ResultVo toolscount(String tenantid); Map selectaisp(String userid,String id); + + + 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 915f8aaa..cc882730 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 @@ -7,6 +7,7 @@ import cn.jyjz.xiaoyao.common.redis.cache.constants.CacheConstants; 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.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -32,6 +33,9 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl>> selectsearch(String search, String assignee) { List> strings1 = ocrsearchhistorymapper.selectsearch1(search); @@ -82,6 +86,7 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl map=new HashMap<>(); + map.put("taskid",id); map.put("tenantusername",selectaiuser); map.put("packagename",selectaisp.get("packagename")); map.put("tasks","基线任务"); @@ -91,4 +96,29 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl selectaisp = ocrsearchhistorymapper.selectaisp(id); + + String[] cps = selectaisp.get("ocpictureid").toString().split(","); + + List saveList = new ArrayList<>(); + + for (String childpictureid : cps) { + OcrPicture ocrPicture = this.ocrPictureService.selectDtoById(Long.parseLong(childpictureid)); + if (ocrPicture.getSimilarityscore()>=90){ + ocrPicture.setJudgeid(null); + ocrPicture.setJudgedesc(null); + ocrPicture.setIztrueorfalse(0); + ocrPicture.setUpdateTime(System.currentTimeMillis()); + + saveList.add(ocrPicture); + } + + } + + return this.ocrPictureService.updateBatchById(saveList) ? ResultVoUtil.success() : ResultVoUtil.error(); + } } 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 2f424803..7c5aee47 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 @@ -81,7 +81,7 @@