| | |
| | | role = user.getRole(); |
| | | id = user.getId(); |
| | | } |
| | | User user1 = userDao.selectOne(new QueryWrapper<User>().eq("user_mobile", phone_info.getPurePhoneNumber())); |
| | | HashMap<String, Object> loginMessage = new HashMap<>(); |
| | | loginMessage.put("id", id); |
| | | loginMessage.put("token", token); |
| | | loginMessage.put("role", role); |
| | | loginMessage.put("time",user1.getUserIdcard()); |
| | | return R.ok(loginMessage); |
| | | } |
| | | |
| | |
| | | @GetMapping("/user/group/list") |
| | | public R getUserMessage(@RequestParam Integer id, @RequestParam String newDate, @RequestParam String lastDate) { |
| | | ArrayList<Map<String, Object>> list = new ArrayList<>(); |
| | | reportService.list((new QueryWrapper<Report>().eq("user_id", id))) |
| | | reportService.list((new QueryWrapper<Report>().eq("user_id", id)).groupBy("user_id")) |
| | | .forEach(item -> |
| | | { |
| | | GroupUser groupUser = groupUserService.getOne(new QueryWrapper<GroupUser>().eq("user_id", item.getId())); |
| | |
| | | |
| | | @GetMapping("/group/user/sendMsg") |
| | | public R sendUserMsg(@RequestParam Integer id, @RequestParam Integer groupId, @RequestParam String msg) { |
| | | if (StringUtils.isBlank(msg)){ |
| | | return R.failed("msg is blank"); |
| | | } |
| | | Message message = new Message(); |
| | | message.setUserId(id); |
| | | message.setText(msg); |