轮询接口和可疑文件限制

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java

@@ -19,9 +19,11 @@ import org.springframework.web.bind.annotation.RequestParam;
 import javax.servlet.http.HttpServletRequest;
 import cn.jyjz.xiaoyao.ocr.service.IOcrMsgReadService;
 
+import java.sql.Array;
 import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * ocr控制器
@@ -97,6 +99,22 @@ public class OcrMsgReadController  {
         return ResultVoUtil.success(selectone);
     }
 
+    @ApiOperation(value = "消息轮询", notes = "消息轮询")
+    @RequestMapping(value = "/msgPolling", method = RequestMethod.GET)
+    public ResultVo msgPolling(HttpServletRequest request) {
+
+        UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
+
+        QueryWrapper<OcrMsgRead> wrapperread = new QueryWrapper<>();
+        wrapperread.eq("user_id",userToken.getUserid());
+        List<OcrMsgRead> list = ocrMsgReadService.list(wrapperread);
+
+        QueryWrapper<OcrMsg> wrappermsg = new QueryWrapper<>();
+        wrappermsg.notIn("id", list.stream().map(i->i.getMsgId()).collect(Collectors.toList()));
+        long count = iocrmsgservice.count(wrappermsg);
+
+        return ResultVoUtil.success(count);
+    }
 
     /**
      * 添加

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java

@@ -152,23 +152,29 @@ public class OcrTaskchildDubiousFileController  {
         List<OcrTaskchildDubiousFile> list=new ArrayList<>();
         String[] taskchildid1 = taskchildid.toString().split(",");
         for (String asd:taskchildid1){
-            OcrTaskchildDubiousFile ocrtaskchilddubiousfile=new OcrTaskchildDubiousFile();
-            ocrtaskchilddubiousfile.setTaskchildId(Long.parseLong(asd));
-            ocrtaskchilddubiousfile.setTenantid(Long.parseLong(tenantId));
-            ocrtaskchilddubiousfile.setUserid(Long.parseLong(userToken.getUserid()));
-            ocrtaskchilddubiousfile.setCreatedate(System.currentTimeMillis());
 
-            QueryWrapper<OcrTaskchildPicture> wrapper = new QueryWrapper<>();
+            QueryWrapper<OcrTaskchildDubiousFile> filewrapper = new QueryWrapper<>();
-            wrapper.eq("ID",asd);
+            filewrapper.eq("taskchild_id",asd).eq("userid",userToken.getUserid());
-            OcrTaskchildPicture one = ocrtaskchildpictureservice.getOne(wrapper);
+            OcrTaskchildDubiousFile one1 = ocrTaskchildDubiousFileService.getOne(filewrapper);
-            ocrtaskchilddubiousfile.setPictureId(one.getPictureid());
+            if(!asd.equals(one1.getTaskchildId())){
+                OcrTaskchildDubiousFile ocrtaskchilddubiousfile=new OcrTaskchildDubiousFile();
+                ocrtaskchilddubiousfile.setTaskchildId(Long.parseLong(asd));
+                ocrtaskchilddubiousfile.setTenantid(Long.parseLong(tenantId));
+                ocrtaskchilddubiousfile.setUserid(Long.parseLong(userToken.getUserid()));
+                ocrtaskchilddubiousfile.setCreatedate(System.currentTimeMillis());
 
-            UpdateWrapper<OcrPicture> updatewrapper = new UpdateWrapper<>();
+                QueryWrapper<OcrTaskchildPicture> wrapper = new QueryWrapper<>();
-            updatewrapper.eq("ID", one.getPictureid()).set("suspiciousfile","1");
+                wrapper.eq("ID",asd);
+                OcrTaskchildPicture one = ocrtaskchildpictureservice.getOne(wrapper);
+                ocrtaskchilddubiousfile.setPictureId(one.getPictureid());
 
-            ocrpictureservice.update(updatewrapper);
+                UpdateWrapper<OcrPicture> updatewrapper = new UpdateWrapper<>();
+                updatewrapper.eq("ID", one.getPictureid()).set("suspiciousfile","1");
 
-            list.add(ocrtaskchilddubiousfile);
+                ocrpictureservice.update(updatewrapper);
+
+                list.add(ocrtaskchilddubiousfile);
+            }
         }
 
 

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java

@@ -77,6 +77,9 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
     @Override
     public Map<Object, Object> selectaisp(String userid,String id) {
         Map<Object, Object> selectaisp = ocrsearchhistorymapper.selectaisp(id);
+        if(null==selectaisp){
+            return null;
+        }
         String selectaiuser = ocrsearchhistorymapper.selectaiuser(userid);
 
         String[] cps = selectaisp.get("pictureresult").toString().split(",");