消息列表修改去掉发送人

ai统计接口增加

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

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)
+    @RequestMapping(value = "eliminateUnreadfull", method = RequestMethod.GET)
-    public ResultVo eliminateUnreadfull(HttpServletRequest request, @RequestParam(value = "msgCategory", required = false)String msgCategory) {
+    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)
+    @RequestMapping(value = "eliminateUnreadone", method = RequestMethod.GET)
-    public ResultVo eliminateUnreadone(HttpServletRequest request, @RequestParam(value = "msgid", required = false)String msgid) {
+    public ResultVo eliminateUnreadone(HttpServletRequest request, @RequestParam(value = "msgid", required = true)String msgid) {
 
         UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
 

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;
 
 /**
  * <p>
@@ -20,4 +21,8 @@ import java.util.List;
 @Mapper
 public interface OcrSearchHistoryMapper extends BaseMapper<OcrSearchHistory> {
         List<String> selectsearch(@Param("search")String search,@Param("assignee") String assignee);
+
+
+
+        Map<Object,Object> toolscount(@Param("userid")String userid);
 }

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;
 
 /**
  * <p>
@@ -28,4 +29,9 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
     public List<String> selectsearch(String search, String assignee) {
         return ocrsearchhistorymapper.selectsearch(search,assignee);
     }
+
+    @Override
+    public Map<Object, Object> toolscount(String userid) {
+        return ocrsearchhistorymapper.toolscount(userid);
+    }
 }

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

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

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