| | |
| | | return R.ok(userService.selectPage(new Page<>(curr, limit), wrapper)); |
| | | } |
| | | |
| | | private void convert(Map<String, Object> map, EntityWrapper wrapper){ |
| | | private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){ |
| | | for (Map.Entry<String, Object> entry : map.entrySet()){ |
| | | if (entry.getKey().endsWith(">")) { |
| | | wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue()))); |
| | | } else if (entry.getKey().endsWith("<")) { |
| | | wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue()))); |
| | | String val = String.valueOf(entry.getValue()); |
| | | if (val.contains(RANGE_TIME_LINK)){ |
| | | String[] dates = val.split(RANGE_TIME_LINK); |
| | | wrapper.ge(entry.getKey(), DateUtils.convert(dates[0])); |
| | | wrapper.le(entry.getKey(), DateUtils.convert(dates[1])); |
| | | } else { |
| | | wrapper.like(entry.getKey(), String.valueOf(entry.getValue())); |
| | | wrapper.like(entry.getKey(), val); |
| | | } |
| | | } |
| | | } |
| | |
| | | return R.error(); |
| | | } |
| | | if (null == user.getId()){ |
| | | user.setStatus(1); |
| | | user.setCreateTime(new Date()); |
| | | userService.insert(user); |
| | | } else { |
| | | userService.updateById(user); |
| | |
| | | @RequestMapping(value = "/user/add/auth") |
| | | @ManagerAuth(memo = "系统用户添加") |
| | | public R add(User user) { |
| | | user.setStatus(1); |
| | | user.setCreateTime(new Date()); |
| | | userService.insert(user); |
| | | return R.ok(); |
| | | } |
| | |
| | | @RequestMapping(value = "/user/update/auth") |
| | | @ManagerAuth(memo = "系统用户修改") |
| | | public R update(User user){ |
| | | if (!getUserId().equals(user.getId())){ |
| | | return R.error("操作越权!"); |
| | | } |
| | | if (Cools.isEmpty(user) || null==user.getId()){ |
| | | return R.error(); |
| | | } |
| | |
| | | if (user.getMobile()!=null) { |
| | | entity.setMobile(user.getMobile()); |
| | | } |
| | | userService.updateById(entity); |
| | | if (user.getRoleId()!=null){ |
| | | entity.setRoleId(user.getRoleId()); |
| | | } |
| | | if (!userService.updateById(entity)){ |
| | | return R.error("修改失败!"); |
| | | } |
| | | |
| | | return R.ok(); |
| | | } |
| | | |
| | | @RequestMapping(value = "/user/delete/auth") |
| | | @ManagerAuth(memo = "系统用户删除") |
| | | public R delete(Integer[] ids){ |
| | | if (Cools.isEmpty(ids)){ |
| | | return R.error(); |
| | | public R delete(@RequestParam(value="ids[]") Long[] ids){ |
| | | for (Long id : ids){ |
| | | userService.deleteById(id); |
| | | } |
| | | userService.deleteBatchIds(Arrays.asList(ids)); |
| | | return R.ok(); |
| | | } |
| | | |