From dbec394c92d8319f91520426a504daf79af5ce31 Mon Sep 17 00:00:00 2001 From: ljt <18301674552@163.com> Date: Wed, 20 Mar 2024 16:14:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ai=E7=BB=9F=E8=AE=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BC=A0=E5=8F=82=E7=A7=9F=E6=88=B7id=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=BC=93=E5=AD=9824=E5=B0=8F=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../redis/cache/constants/CacheConstants.java | 6 +++++ .../ocr/controller/OcrAiApprovalTools.java | 13 +++++++++-- .../ocr/dataDao/OcrSearchHistoryMapper.java | 2 +- .../ocr/service/IOcrSearchHistoryService.java | 3 ++- .../impl/OcrSearchHistoryServiceImpl.java | 23 +++++++++++++++++-- .../mapper/oa/OcrSearchHistoryMapper.xml | 6 ++--- 6 files changed, 44 insertions(+), 9 deletions(-) diff --git a/jyjz-common/jyjz-common-redis/src/main/java/cn/jyjz/xiaoyao/common/redis/cache/constants/CacheConstants.java b/jyjz-common/jyjz-common-redis/src/main/java/cn/jyjz/xiaoyao/common/redis/cache/constants/CacheConstants.java index 995b8ed0..4102415f 100644 --- a/jyjz-common/jyjz-common-redis/src/main/java/cn/jyjz/xiaoyao/common/redis/cache/constants/CacheConstants.java +++ b/jyjz-common/jyjz-common-redis/src/main/java/cn/jyjz/xiaoyao/common/redis/cache/constants/CacheConstants.java @@ -20,6 +20,12 @@ public interface CacheConstants { //缓存超时时间，单位：秒,目前验证码使用 int CACHE_TIME = 300;//300; + //缓存超时时间，单位：秒,目前ai统计使用 24小时 + int TOOLSCOUNT_TENANTID_CACHE_TIME = 86400; + + //保存ai统计租户id对象 + String TOOLSCOUNT_TENANTID_MODEL_NAME = "toolscountmodel_tenantid"; + //缓存中验证码存放的关键字 String CACHE_CODE = "CODEKAP"; 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 59408fb6..6721a48d 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 @@ -7,6 +7,7 @@ import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil; import cn.jyjz.xiaoyao.common.base.vo.UserToken; import cn.jyjz.xiaoyao.ocr.service.IOcrSearchHistoryService; import cn.jyjz.xiaoyao.framework.security.sms.MsmService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -41,10 +42,18 @@ public class OcrAiApprovalTools { */ @RequestMapping(value = "/toolsCount", method = RequestMethod.GET) public ResultVo toolsCount(HttpServletRequest request) { + + String tenantId = request.getHeader("X-Tenant-Id"); + if(StringUtils.isBlank(tenantId)){ + return ResultVoUtil.error("租户主键不能为空"); + } + + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); - Map toolscount = iocrsearchhistoryservice.toolscount(userToken.getUserid()); - return ResultVoUtil.success(toolscount); + + ResultVo toolscount = iocrsearchhistoryservice.toolscount(tenantId); + return toolscount; } /* 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 17238f69..4a702bb0 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 @@ -27,7 +27,7 @@ public interface OcrSearchHistoryMapper extends BaseMapper { - Map toolscount(@Param("userid")String userid); + Map toolscount(@Param("tenantid")String tenantid); Map selectaisp(@Param("id")String id); 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 8307cfe3..1ce1b032 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 @@ -1,6 +1,7 @@ package cn.jyjz.xiaoyao.ocr.service; +import cn.jyjz.xiaoyao.common.base.vo.ResultVo; import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchHistory; import com.baomidou.mybatisplus.extension.service.IService; @@ -18,7 +19,7 @@ import java.util.Map; public interface IOcrSearchHistoryService extends IService { Map>> selectsearch(String search, String assignee); - Map toolscount(String userid); + ResultVo toolscount(String tenantid); 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 89000659..915f8aaa 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,9 +1,14 @@ package cn.jyjz.xiaoyao.ocr.service.impl; +import cn.jyjz.xiaoyao.common.base.vo.ResultVo; +import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil; +import cn.jyjz.xiaoyao.common.redis.cache.ICacheManager; +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 com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import cn.jyjz.xiaoyao.ocr.dataDao.OcrSearchHistoryMapper; @@ -24,6 +29,9 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl>> selectsearch(String search, String assignee) { List> strings1 = ocrsearchhistorymapper.selectsearch1(search); @@ -43,8 +51,19 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl toolscount(String userid) { - return ocrsearchhistorymapper.toolscount(userid); + public ResultVo toolscount(String tenantid) { + + //系统中记录的ai统计租户id + String counttenantid = iCacheManager.get(CacheConstants.TOOLSCOUNT_TENANTID_MODEL_NAME,tenantid); + if(!StringUtils.isBlank(counttenantid)){ + return ResultVoUtil.error("true"); + } + + //用户登录信息写入缓存 + iCacheManager.put(CacheConstants.TOOLSCOUNT_TENANTID_MODEL_NAME,tenantid,"true",CacheConstants.TOOLSCOUNT_TENANTID_CACHE_TIME); + + Map toolscount = ocrsearchhistorymapper.toolscount(tenantid); + return ResultVoUtil.success(toolscount); } @Override 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 6cb3270d..2f424803 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 @@ -74,9 +74,9 @@