update demo

Author: wendell-dev

demo/src/main/java/lazy/fast/code/demo/address/AddressController.java

@@ -4,9 +4,12 @@
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import lazy.fast.code.core.exception.NoContentNotException;
+import lazy.fast.code.core.exception.NotFoundException;
 import lazy.fast.code.core.orm.BaseController;
 import lazy.fast.code.core.orm.BaseService;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -36,14 +39,22 @@ public AddressController(BaseService<Address> baseService) {
     @ApiOperation(value = "获取地址信息列表")
     @GetMapping
     public List<Address> list() {
-        return this.getBaseService().list(null);
+        List<Address> list = this.getBaseService().list(null);
+        if (CollectionUtils.isEmpty(list)) {
+            throw new NoContentNotException();
+        }
+        return list;
     }
 
     @ApiOperation(value = "根据ID获取地址信息")
     @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "地址ID", required = true, paramType = "path")})
     @GetMapping("/{id}")
     public Address get(@PathVariable String id) {
-        return this.getBaseService().get(id);
+        Address address = this.getBaseService().get(id);
+        if (address == null) {
+            throw new NotFoundException();
+        }
+        return address;
     }
 
     @ApiOperation(value = "保存地址信息")

demo/src/main/java/lazy/fast/code/demo/user/UserController.java

@@ -4,9 +4,12 @@
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import lazy.fast.code.core.exception.NoContentNotException;
+import lazy.fast.code.core.exception.NotFoundException;
 import lazy.fast.code.core.orm.BaseController;
 import lazy.fast.code.core.orm.BaseService;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -39,14 +42,22 @@ public UserController(BaseService<User> baseService) {
     @ApiOperation(value = "获取用户信息列表")
     @GetMapping
     public List<User> list() {
-        return this.getBaseService().list(null);
+        List<User> users = this.getBaseService().list(null);
+        if (CollectionUtils.isEmpty(users)) {
+            throw new NoContentNotException();
+        }
+        return users;
     }
 
     @ApiOperation(value = "根据ID获取用户信息")
     @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "用户ID", required = true, paramType = "path")})
     @GetMapping("/{id}")
     public User get(@PathVariable Long id) {
-        return this.getBaseService().get(id);
+        User user = this.getBaseService().get(id);
+        if (user == null) {
+            throw new NotFoundException();
+        }
+        return user;
     }
 
     @ApiOperation(value = "获取用户信息列表 - 使用Repository中的自定义方法")

demo/src/main/java/lazy/fast/code/demo/user/UserServiceImpl.java

@@ -4,7 +4,7 @@
 import lazy.fast.code.core.orm.BaseRepository;
 import lazy.fast.code.core.orm.BaseServiceImpl;
 import lazy.fast.code.demo.address.Address;
-import lazy.fast.code.demo.address.AddressRepository;
+import lazy.fast.code.demo.address.AddressService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -21,18 +21,22 @@
 public class UserServiceImpl extends BaseServiceImpl<User> implements UserService {
 
     private final UserRepository userRepository;
-    private final AddressRepository addressRepository;
+    private final AddressService addressService;
 
     @Autowired
-    public UserServiceImpl(BaseRepository<User> baseRepository, AddressRepository addressRepository) {
+    public UserServiceImpl(BaseRepository<User> baseRepository, AddressService addressService) {
         super(baseRepository);
         this.userRepository = (UserRepository)baseRepository;
-        this.addressRepository = addressRepository;
+        this.addressService = addressService;
     }
 
     @Override
     public List<User> listUsers() {
-        return this.userRepository.listUsers();
+        List<User> users = this.userRepository.listUsers();
+        if (CollectionUtils.isEmpty(users)) {
+            throw new NoContentNotException();
+        }
+        return users;
     }
 
     @Override
@@ -47,8 +51,7 @@ public List<UserAddressDTO> listUserAddress() {
             dto.setUser(o);
             Address address = Address.of();
             address.setUserId(o.getId());
-            List<Address> addressList = this.addressRepository.select(address);
-            dto.setAddressList(addressList);
+            dto.setAddressList(this.addressService.list(address));
             res.add(dto);
         });
         return res;