From 94b2cbec6728051cca79d6a20f0ff4565f15f925 Mon Sep 17 00:00:00 2001 From: lijingtao <18301674552@163.COM> Date: Mon, 18 Mar 2024 23:14:10 +0800 Subject: [PATCH] =?UTF-8?q?ai=E5=AE=A1=E6=89=B9=E5=B7=A5=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocr/controller/OcrAiApprovalTools.java | 8 +++++ .../ocr/dataDao/OcrSearchHistoryMapper.java | 4 +++ .../ocr/service/IOcrSearchHistoryService.java | 2 ++ .../impl/OcrSearchHistoryServiceImpl.java | 32 ++++++++++++++++--- .../mapper/oa/OcrSearchHistoryMapper.xml | 15 +++++++++ 5 files changed, 57 insertions(+), 4 deletions(-) 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 5b97f5ba..932b91b0 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 @@ -44,4 +44,12 @@ public class OcrAiApprovalTools { return ResultVoUtil.success(toolscount); } + @RequestMapping(value = "/aiApprovaltools", method = RequestMethod.GET) + public ResultVo aiApprovaltools(HttpServletRequest request,@RequestParam(value = "taskid", required = true) String taskid) { + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); + + Map selectaisp = iocrsearchhistoryservice.selectaisp(userToken.getUserid(), taskid); + 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 3846a8a6..613e90c6 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 @@ -29,4 +29,8 @@ public interface OcrSearchHistoryMapper extends BaseMapper { Map toolscount(@Param("userid")String userid); + + Map selectaisp(@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 1a82f893..6de2a28c 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 @@ -20,4 +20,6 @@ public interface IOcrSearchHistoryService extends IService { List>> selectsearch(String search,String assignee); Map toolscount(String userid); + + Map selectaisp(String userid,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 24f94f81..786ec169 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.ocr.dataobject.OcrPicture; import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchHistory; import cn.jyjz.xiaoyao.ocr.service.IOcrSearchHistoryService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -7,10 +8,7 @@ import org.springframework.stereotype.Service; import cn.jyjz.xiaoyao.ocr.dataDao.OcrSearchHistoryMapper; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; +import java.util.*; /** *

@@ -46,4 +44,30 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl toolscount(String userid) { return ocrsearchhistorymapper.toolscount(userid); } + + @Override + public Map selectaisp(String userid,String id) { + Map selectaisp = ocrsearchhistorymapper.selectaisp(id); + 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.00")){ + i++; + } + } + + Map map=new HashMap<>(); + 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; + } } 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 04d3cede..ccf1f1b0 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 @@ -83,4 +83,19 @@ (SELECT COUNT(*) FROM ocr_taskchild_picture WHERE USERID = ""#{userid}"" AND STATES = '3') as approved + + + +