From 7e667bbf9f82b263c95588a1aaec9da7e67dcf8b Mon Sep 17 00:00:00 2001 From: lijingtao <18301674552@163.COM> Date: Sun, 17 Mar 2024 16:35:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=8E=BB=E6=8E=89=E5=8F=91=E9=80=81=E4=BA=BA=20ai?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocr/controller/OcrAiApprovalTools.java | 47 +++++++++++++++++++ .../ocr/controller/OcrMsgReadController.java | 8 ++-- .../ocr/dataDao/OcrSearchHistoryMapper.java | 5 ++ .../impl/OcrSearchHistoryServiceImpl.java | 6 +++ .../main/resources/mapper/oa/OcrMsgMapper.xml | 1 - .../mapper/oa/OcrSearchHistoryMapper.xml | 7 +++ 6 files changed, 69 insertions(+), 5 deletions(-) create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAiApprovalTools.java 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 new file mode 100644 index 0000000..5b97f5b --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAiApprovalTools.java @@ -0,0 +1,47 @@ +package cn.jyjz.xiaoyao.ocr.controller; + +import cn.jyjz.xiaoyao.common.base.service.UserTokenService; +import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil; +import cn.jyjz.xiaoyao.common.base.vo.ResultVo; +import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil; +import cn.jyjz.xiaoyao.common.base.vo.UserToken; +import cn.jyjz.xiaoyao.ocr.service.IOcrSearchHistoryService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.util.Map; + +/** + * ocr控制器 + * + * @author 你的肉 + * @Date 2024-03-17 19:53:30 + */ +@CrossOrigin +@RestController +@RequestMapping("/ocr/aitools") +public class OcrAiApprovalTools { + + + @Autowired + private UserTokenService userTokenService; + + @Autowired + IOcrSearchHistoryService iocrsearchhistoryservice; + + /** + * 统计 + * + * @param request + * @return + */ + @RequestMapping(value = "/toolsCount", method = RequestMethod.GET) + public ResultVo toolsCount(HttpServletRequest request) { + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); + + Map toolscount = iocrsearchhistoryservice.toolscount(userToken.getUserid()); + return ResultVoUtil.success(toolscount); + } + +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java index 5f30ad2..3d2fc7d 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java @@ -104,8 +104,8 @@ public class OcrMsgReadController { * @return */ @ApiOperation(value = "消除未读所有", notes = "消除未读所有") - @RequestMapping(value = "eliminateUnreadfull", method = RequestMethod.POST) - public ResultVo eliminateUnreadfull(HttpServletRequest request, @RequestParam(value = "msgCategory", required = false)String msgCategory) { + @RequestMapping(value = "eliminateUnreadfull", method = RequestMethod.GET) + public ResultVo eliminateUnreadfull(HttpServletRequest request, @RequestParam(value = "msgCategory", required = true)String msgCategory) { UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); @@ -136,8 +136,8 @@ public class OcrMsgReadController { } @ApiOperation(value = "消除未读单个", notes = "消除未读单个") - @RequestMapping(value = "eliminateUnreadone", method = RequestMethod.POST) - public ResultVo eliminateUnreadone(HttpServletRequest request, @RequestParam(value = "msgid", required = false)String msgid) { + @RequestMapping(value = "eliminateUnreadone", method = RequestMethod.GET) + public ResultVo eliminateUnreadone(HttpServletRequest request, @RequestParam(value = "msgid", required = true)String msgid) { UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); 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 ce145ec..83c966b 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 @@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** *

@@ -20,4 +21,8 @@ import java.util.List; @Mapper public interface OcrSearchHistoryMapper extends BaseMapper { List selectsearch(@Param("search")String search,@Param("assignee") String assignee); + + + + Map toolscount(@Param("userid")String userid); } 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 82ee3c3..dcc8206 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 @@ -9,6 +9,7 @@ import cn.jyjz.xiaoyao.ocr.dataDao.OcrSearchHistoryMapper; import javax.annotation.Resource; import java.util.Collection; import java.util.List; +import java.util.Map; /** *

@@ -28,4 +29,9 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl selectsearch(String search, String assignee) { return ocrsearchhistorymapper.selectsearch(search,assignee); } + + @Override + public Map toolscount(String userid) { + return ocrsearchhistorymapper.toolscount(userid); + } } diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrMsgMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrMsgMapper.xml index a22365a..091a553 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrMsgMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrMsgMapper.xml @@ -51,7 +51,6 @@ SELECT m.id as id, m.titile as titile, - u.USERNAME as userName, m.bus_json as busJson, r.read_flag as readFlag, m.send_time as sendTime 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 8f5925d..aebb9dd 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 @@ -40,4 +40,11 @@ + +