优化消息通知模块的接口

jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java

@@ -494,6 +494,7 @@ public class UserController {
             data.put("expireTime", Tools.parseDateToStr(tenant.getExpireTime()));
             data.put("userCurrentNum", userCurrentNum);
             data.put("userNumLimit", tenant.getUserNumLimit());
+            data.put("tenantId", tenant.getTenantId());
             res.code = 200;
             res.data = data;
         } catch (Exception e) {

jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MsgMapperEx.java

@@ -9,19 +9,17 @@ import java.util.List;
 public interface MsgMapperEx {
 
     List<MsgEx> selectByConditionMsg(
+            @Param("userId") Long userId,
             @Param("name") String name,
             @Param("offset") Integer offset,
             @Param("rows") Integer rows);
 
     Long countsByMsg(
+            @Param("userId") Long userId,
             @Param("name") String name);
 
     int batchDeleteMsgByIds(@Param("ids") String ids[]);
 
-    int insertSelectiveByTask(Msg record);
-
-    int checkIsNameExistByTask(@Param("msgTitle") String msgTitle);
-
     Long getMsgCountByStatus(
             @Param("status") String status,
             @Param("userId") Long userId);

jshERP-boot/src/main/java/com/jsh/erp/service/msg/MsgService.java

@@ -82,7 +82,7 @@ public class MsgService {
         try{
             User userInfo = userService.getCurrentUser();
             if(!BusinessConstants.DEFAULT_MANAGER.equals(userInfo.getLoginName())) {
-                list = msgMapperEx.selectByConditionMsg(name, offset, rows);
+                list = msgMapperEx.selectByConditionMsg(userInfo.getId(), name, offset, rows);
                 if (null != list) {
                     for (MsgEx msgEx : list) {
                         if (msgEx.getCreateTime() != null) {
@@ -105,7 +105,7 @@ public class MsgService {
         try{
             User userInfo = userService.getCurrentUser();
             if(!BusinessConstants.DEFAULT_MANAGER.equals(userInfo.getLoginName())) {
-                result = msgMapperEx.countsByMsg(name);
+                result = msgMapperEx.countsByMsg(userInfo.getId(), name);
             }
         }catch(Exception e){
             logger.error("异常码[{}],异常提示[{}],异常[{}]",
@@ -235,7 +235,8 @@ public class MsgService {
             User userInfo = userService.getCurrentUser();
             if(!BusinessConstants.DEFAULT_MANAGER.equals(userInfo.getLoginName())) {
                 MsgExample example = new MsgExample();
-                example.createCriteria().andStatusEqualTo(status).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+                example.createCriteria().andStatusEqualTo(status).andUserIdEqualTo(userInfo.getId())
+                        .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
                 List<Msg> list = msgMapper.selectByExample(example);
                 if (null != list) {
                     for (Msg msg : list) {

jshERP-boot/src/main/resources/mapper_xml/MsgMapperEx.xml

@@ -8,6 +8,9 @@
         FROM jsh_msg
         WHERE 1=1
         and ifnull(delete_Flag,'0') !='1'
+        <if test="userId != null">
+            and user_id = #{userId}
+        </if>
         <if test="name != null">
             <bind name="bindName" value="'%'+name+'%'"/>
             and msg_title like #{bindName}
@@ -17,17 +20,22 @@
             limit #{offset},#{rows}
         </if>
     </select>
+
     <select id="countsByMsg" resultType="java.lang.Long">
         SELECT
         COUNT(id)
         FROM jsh_msg
         WHERE 1=1
         and ifnull(delete_Flag,'0') !='1'
+        <if test="userId != null">
+            and user_id = #{userId}
+        </if>
         <if test="name != null">
             <bind name="bindName" value="'%'+name+'%'"/>
             and msg_title like #{bindName}
         </if>
     </select>
+
     <update id="batchDeleteMsgByIds">
         update jsh_msg
         set delete_Flag='1'
@@ -39,29 +47,6 @@
         )
     </update>
 
-    <insert id="insertSelectiveByTask" parameterType="com.jsh.erp.datasource.entities.Msg">
-        insert into jsh_msg(msg_title,msg_content,create_time,type,status,tenant_id)
-        values (
-            #{msgTitle,jdbcType=VARCHAR},
-            #{msgContent,jdbcType=VARCHAR},
-            #{createTime,jdbcType=TIMESTAMP},
-            #{type,jdbcType=VARCHAR},
-            #{status,jdbcType=VARCHAR},
-            #{tenantId,jdbcType=BIGINT}
-        )
-    </insert>
-
-    <select id="checkIsNameExistByTask" resultType="java.lang.Integer">
-        SELECT
-        COUNT(id)
-        FROM jsh_msg
-        WHERE 1=1
-        and ifnull(delete_Flag,'0') !='1'
-        <if test="msgTitle != null">
-            and msg_title = #{msgTitle}
-        </if>
-    </select>
-
     <select id="getMsgCountByStatus" resultType="java.lang.Long">
         SELECT
         COUNT(id)
@@ -71,5 +56,8 @@
         <if test="status != null">
             and status = #{status}
         </if>
+        <if test="userId != null">
+            and user_id = #{userId}
+        </if>
     </select>
 </mapper>