修改ai统计修改传参租户id 增加缓存24小时

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";
 

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<Object, Object> toolscount = iocrsearchhistoryservice.toolscount(userToken.getUserid());
+
-        return ResultVoUtil.success(toolscount);
+        ResultVo toolscount = iocrsearchhistoryservice.toolscount(tenantId);
+        return toolscount;
     }
 
     /*

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java

@@ -27,7 +27,7 @@ public interface OcrSearchHistoryMapper extends BaseMapper<OcrSearchHistory> {
 
 
 
-        Map<Object,Object> toolscount(@Param("userid")String userid);
+        Map<Object,Object> toolscount(@Param("tenantid")String tenantid);
 
         Map<Object,Object> selectaisp(@Param("id")String id);
 

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<OcrSearchHistory> {
     Map<Object, List<Map<String,String>>> selectsearch(String search, String assignee);
 
-    Map<Object,Object> toolscount(String userid);
+    ResultVo toolscount(String tenantid);
 
     Map<Object,Object> selectaisp(String userid,String id);
 }

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<OcrSearchHistoryMap
     @Resource
     OcrSearchHistoryMapper ocrsearchhistorymapper;
 
+    @Resource
+    ICacheManager iCacheManager;
+
     @Override
     public Map<Object, List<Map<String,String>>> selectsearch(String search, String assignee) {
         List<Map<String,String>> strings1 = ocrsearchhistorymapper.selectsearch1(search);
@@ -43,8 +51,19 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
     }
 
     @Override
-    public Map<Object, Object> toolscount(String userid) {
+    public ResultVo toolscount(String tenantid) {
-        return ocrsearchhistorymapper.toolscount(userid);
+
+        //系统中记录的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<Object, Object> toolscount = ocrsearchhistorymapper.toolscount(tenantid);
+        return ResultVoUtil.success(toolscount);
     }
 
     @Override

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml

@@ -74,9 +74,9 @@
 
     <select id="toolscount" resultType="map">
         SELECT
-            (SELECT COUNT(*) FROM ocr_taskchild_picture WHERE USERID = ""#{userid}"") as taskTotal,
+            (SELECT COUNT(*) FROM ocr_taskchild_picture WHERE TENANTID = ""#{tenantid}"") as taskTotal,
-            (SELECT COUNT(*) FROM ocr_taskchild_picture WHERE USERID = ""#{userid}"" AND STATES = '2') as treat,
+            (SELECT COUNT(*) FROM ocr_taskchild_picture WHERE TENANTID = ""#{tenantid}"" AND STATES = '2') as treat,
-            (SELECT COUNT(*) FROM ocr_taskchild_picture WHERE USERID = ""#{userid}"" AND STATES = '3') as approved
+            (SELECT COUNT(*) FROM ocr_taskchild_picture WHERE TENANTID = ""#{tenantid}"" AND STATES = '3') as approved
     </select>
 
     <select id="selectaisp" resultType="map">