消息加台账导入

“linengliang”

2023-10-29 db1d7484b7114f9f91decef684280866dac34dfe

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java

@@ -2,7 +2,10 @@

import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;

import org.apache.shiro.SecurityUtils;
@@ -14,9 +17,9 @@
import org.jeecg.common.util.SqlInjectionUtil;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.message.websocket.WebSocket;
import org.jeecg.modules.system.entity.SysAnnouncementSend;
import org.jeecg.modules.system.entity.*;
import org.jeecg.modules.system.model.AnnouncementSendModel;
import org.jeecg.modules.system.service.ISysAnnouncementSendService;
import org.jeecg.modules.system.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -51,7 +54,16 @@
   private ISysAnnouncementSendService sysAnnouncementSendService;
   @Autowired
   private WebSocket webSocket;

    @Autowired
    private ISysRoleService sysRoleService;
    @Autowired
    private ISysDictService sysDictService;
    @Autowired
    private ISysDictItemService sysDictItemService;
    @Autowired
    private ISysUserRoleService sysUserRoleService;
    @Autowired
    private ISysUserService sysUserService;
   /**
     * 分页列表查询
    * @param sysAnnouncementSend
@@ -92,7 +104,7 @@
      result.setResult(pageList);
      return result;
   }
	

   /**
     *   添加
    * @param sysAnnouncementSend
@@ -110,7 +122,7 @@
      }
      return result;
   }
	

   /**
     *  编辑
    * @param sysAnnouncementSend
@@ -129,10 +141,10 @@
            result.success("操作成功!");
         }
      }
		

      return result;
   }
	

   /**
     *   通过id删除
    * @param id
@@ -150,10 +162,10 @@
            result.success("删除成功!");
         }
      }
		

      return result;
   }
	

   /**
     *  批量删除
    * @param ids
@@ -170,7 +182,7 @@
      }
      return result;
   }
	

   /**
     * 通过id查询
    * @param id
@@ -188,7 +200,7 @@
      }
      return result;
   }
	

   /**
    * @功能：更新用户系统消息阅读状态
    * @param json
@@ -209,7 +221,7 @@
      result.setSuccess(true);
      return result;
   }
	

   /**
    * @功能：获取我的消息
    * @return
@@ -265,4 +277,20 @@
       AnnouncementSendModel model = sysAnnouncementSendService.getOne(sendId);
       return Result.ok(model);
    }
    @GetMapping("getPrimaryInfo")
    public Result<?> getPrimaryInfo(@RequestParam(name="userId",required=true) String userId){
       SysDict sysDict = sysDictService.getOne(new QueryWrapper<SysDict>().eq("dict_code","info_type"),false);
       List<SysDictItem> sysDictItemList = sysDictItemService.list(new QueryWrapper<SysDictItem>().eq("dict_id",sysDict.getId()));
//       List<String> rollCodeList = sysDictItemList.stream().map(SysDictItem::getItemValue).collect(Collectors.toList());
//       List<SysUserRole> sysUserRoles = sysUserRoleService.list(new QueryWrapper<SysUserRole>().eq("user_id",userId));
//       List<String> roleIds = sysUserRoles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
//       List<SysRole> sysRoles = sysRoleService.list(new QueryWrapper<SysRole>().in("role_code",rollCodeList).in("id",roleIds));
       List<String> msgCategoryList = sysDictItemList.stream().map(SysDictItem::getItemText).collect(Collectors.toList());
        List<SysAnnouncementSend> list = sysAnnouncementSendService.getPrimaryInfo(userId,msgCategoryList);
       for(SysAnnouncementSend sysAnnouncementSend:list){
          sysAnnouncementSend.setReadFlag("1");
          sysAnnouncementSendService.updateById(sysAnnouncementSend);
      }
        return Result.OK(list);
    }
}