|
@@ -11,6 +11,7 @@ import com.xin.shardingspherejdbcdemo.entity.vo.PageVo;
|
|
import com.xin.shardingspherejdbcdemo.mapper.OrderMapper;
|
|
import com.xin.shardingspherejdbcdemo.mapper.OrderMapper;
|
|
import com.xin.shardingspherejdbcdemo.mapper.UserMapper;
|
|
import com.xin.shardingspherejdbcdemo.mapper.UserMapper;
|
|
import com.xin.shardingspherejdbcdemo.service.UserService;
|
|
import com.xin.shardingspherejdbcdemo.service.UserService;
|
|
|
|
+import com.xin.shardingspherejdbcdemo.utils.EntityUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
@@ -26,14 +27,17 @@ public class UserServiceImpl implements UserService {
|
|
private UserMapper userMapper;
|
|
private UserMapper userMapper;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public PageVo list(int pageNum, int pageSize, String name, Integer age) {
|
|
|
|
|
|
+ public PageVo list(int pageNum, int pageSize, String name, Integer age,Integer year) {
|
|
QueryWrapper queryWrapper = new QueryWrapper();
|
|
QueryWrapper queryWrapper = new QueryWrapper();
|
|
queryWrapper.like("name", name);
|
|
queryWrapper.like("name", name);
|
|
queryWrapper.le("age", age);
|
|
queryWrapper.le("age", age);
|
|
|
|
+ queryWrapper.eq("year", year);
|
|
int count = userMapper.selectCount(queryWrapper);
|
|
int count = userMapper.selectCount(queryWrapper);
|
|
|
|
+ queryWrapper.orderByDesc("create_time");
|
|
queryWrapper.orderByAsc("age");
|
|
queryWrapper.orderByAsc("age");
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
List<User> list = userMapper.selectList(queryWrapper);
|
|
List<User> list = userMapper.selectList(queryWrapper);
|
|
|
|
+
|
|
return PageVo.data(list, count);
|
|
return PageVo.data(list, count);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -42,6 +46,8 @@ public class UserServiceImpl implements UserService {
|
|
public User save(User user) {
|
|
public User save(User user) {
|
|
SnowFlake snowFlake = new SnowFlake(2, 3);
|
|
SnowFlake snowFlake = new SnowFlake(2, 3);
|
|
user.setId(snowFlake.nextId());
|
|
user.setId(snowFlake.nextId());
|
|
|
|
+ int year = EntityUtils.dateTostr(user.getCreateTime());
|
|
|
|
+ user.setYear(year);
|
|
userMapper.insert(user);
|
|
userMapper.insert(user);
|
|
return user;
|
|
return user;
|
|
}
|
|
}
|
|
@@ -73,6 +79,8 @@ public class UserServiceImpl implements UserService {
|
|
public Object order(Order order) {
|
|
public Object order(Order order) {
|
|
SnowFlake snowFlake = new SnowFlake(2, 3);
|
|
SnowFlake snowFlake = new SnowFlake(2, 3);
|
|
order.setId(snowFlake.nextId());
|
|
order.setId(snowFlake.nextId());
|
|
|
|
+ int year = EntityUtils.dateTostr(order.getCreateTime());
|
|
|
|
+ order.setYear(year);
|
|
orderMapper.insert(order);
|
|
orderMapper.insert(order);
|
|
return order;
|
|
return order;
|
|
}
|
|
}
|
|
@@ -80,10 +88,10 @@ public class UserServiceImpl implements UserService {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public Object selectOrder(Long userId, int pageNum, int pageSize, String name) {
|
|
public Object selectOrder(Long userId, int pageNum, int pageSize, String name) {
|
|
- PageHelper.startPage(pageNum, pageSize);
|
|
|
|
|
|
+ //PageHelper.startPage(pageNum, pageSize);
|
|
List<Map<String, String>> list = userMapper.selectOrderByid(userId);
|
|
List<Map<String, String>> list = userMapper.selectOrderByid(userId);
|
|
- long total = new PageInfo(list).getTotal();
|
|
|
|
- return PageVo.data(list, total);
|
|
|
|
|
|
+ //long total = new PageInfo(list).getTotal();
|
|
|
|
+ return list;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|