diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/enums/package-info.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/enums/package-info.java deleted file mode 100644 index a5c47ea1..00000000 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/enums/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -/** - * @author: chenwenjian - * @date: 2023/9/6 15:37 - * @description: - * @modifiedBy: - * @version: 1.0 - */ -package cn.axzo.tyr.client.model.enums; \ No newline at end of file diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/consumer/package-info.java b/tyr-server/src/main/java/cn/axzo/tyr/server/consumer/package-info.java deleted file mode 100644 index eb001a5e..00000000 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/consumer/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.axzo.tyr.server.consumer; \ No newline at end of file diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/app/package-info.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/app/package-info.java deleted file mode 100644 index 49e38f03..00000000 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/app/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.axzo.tyr.server.controller.app; \ No newline at end of file diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/web/UserController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/web/UserController.java deleted file mode 100644 index 7ce449bd..00000000 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/web/UserController.java +++ /dev/null @@ -1,76 +0,0 @@ -package cn.axzo.tyr.server.controller.web; - -import cn.axzo.tyr.server.service.user.UserService; -import cn.axzo.tyr.server.service.dto.request.user.NewUserDTO; -import cn.axzo.tyr.server.service.dto.request.user.UpdateUserDTO; -import cn.axzo.tyr.server.service.dto.request.user.UserQO; -import cn.axzo.tyr.server.service.dto.response.user.UserVO; -import cn.azxo.framework.common.model.CommonPageResponse; -import cn.azxo.framework.common.model.CommonResponse; -import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; - -/** - * @Author: liyong.tian - * @Date: 2022/9/2 - * @Description: - */ -@Slf4j -@Api(tags = "web-用户信息接口") -@ApiSupport(author = "田立勇") -@RequestMapping("/api/v1") -@RestController -@RequiredArgsConstructor -public class UserController { - - private final UserService userService; - - @ApiOperation(value = "创建用户") - @PostMapping("/users") - public CommonResponse createUser(@Valid @RequestBody NewUserDTO dto) { - log.info("REST request to save user : {}", dto); - // 校验入参 - dto.valid(); - UserVO result = userService.create(dto); - return CommonResponse.success(result); - } - - @ApiOperation(value = "修改用户") - @PutMapping("/users/{id}") - public CommonResponse updateUser(@ApiParam("用户ID") @PathVariable Long id, - @Valid @RequestBody UpdateUserDTO dto) { - log.info("REST request to update user : {}", dto); - // 校验入参 - dto.valid(); - UserVO result = userService.update(id, dto); - return CommonResponse.success(result); - } - - @ApiOperation("获取用户列表") - @GetMapping("/users") - public CommonResponse> getUsers(@Valid UserQO userQO) { - CommonPageResponse results = userService.queryByPage(userQO); - return CommonResponse.success(results); - } - - @ApiOperation("获取用户详情") - @GetMapping("/users/{id}") - public CommonResponse getUser(@ApiParam("用户ID") @PathVariable Long id) { - UserVO result = userService.getOne(id); - return CommonResponse.success(result); - } - - @ApiOperation("删除用户") - @DeleteMapping("/users/{id}") - public CommonResponse deleteUser(@ApiParam("用户ID") @PathVariable Long id) { - userService.delete(id); - return CommonResponse.success(); - } -} diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/web/UserResource.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/web/UserResource.java deleted file mode 100644 index 73607e7f..00000000 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/web/UserResource.java +++ /dev/null @@ -1,78 +0,0 @@ -package cn.axzo.tyr.server.controller.web; - -import cn.axzo.framework.domain.page.PageQO; -import cn.axzo.framework.domain.page.PageResp; -import cn.axzo.framework.web.http.ApiResponse; -import cn.axzo.framework.web.http.ApiPageResponse; -import cn.axzo.tyr.server.service.dto.request.user.NewUserDTO; -import cn.axzo.tyr.server.service.dto.request.user.UpdateUserDTO; -import cn.axzo.tyr.server.service.dto.request.user.UserQO1; -import cn.axzo.tyr.server.service.dto.response.user.UserVO; -import cn.axzo.tyr.server.service.user.UserService; -import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; - -/** - * @Author: liyong.tian - * @Date: 2022/10/28 - * @Description: 新项目搭建推荐方式 - */ -@Slf4j -@Api(tags = "web-用户信息接口") -@ApiSupport(author = "田立勇") -@RequestMapping("/api/v2") -@RestController -@RequiredArgsConstructor -public class UserResource { - - private final UserService userService; - - @ApiOperation(value = "创建用户") - @PostMapping("/users") - public ApiResponse createUser(@Valid @RequestBody NewUserDTO dto) { - log.info("REST request to save user : {}", dto); - // 校验入参 - dto.valid(); - UserVO result = userService.create(dto); - return ApiResponse.ok(result); - } - - @ApiOperation(value = "修改用户") - @PutMapping("/users/{id}") - public ApiResponse updateUser(@ApiParam("用户ID") @PathVariable Long id, - @Valid @RequestBody UpdateUserDTO dto) { - log.info("REST request to update user : {}", dto); - // 校验入参 - dto.valid(); - UserVO result = userService.update(id, dto); - return ApiResponse.ok(result); - } - - @ApiOperation("获取用户列表") - @GetMapping("/users") - public ApiPageResponse getUsers(@ModelAttribute UserQO1 userQo, PageQO page) { - PageResp results = userService.find(userQo, page); - return ApiPageResponse.ok(results); - } - - @ApiOperation("获取用户详情") - @GetMapping("/users/{id}") - public ApiResponse getUser(@ApiParam("用户ID") @PathVariable Long id) { - UserVO result = userService.getOne(id); - return ApiResponse.ok(result); - } - - @ApiOperation("删除用户") - @DeleteMapping("/users/{id}") - public ApiResponse deleteUser(@ApiParam("用户ID") @PathVariable Long id) { - userService.delete(id); - return ApiResponse.ok(); - } -} diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/job/package-info.java b/tyr-server/src/main/java/cn/axzo/tyr/server/job/package-info.java deleted file mode 100644 index d3a347ea..00000000 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/job/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.axzo.tyr.server.job; \ No newline at end of file diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/SaasBasicDictDao.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/SaasBasicDictDao.java new file mode 100644 index 00000000..bd32942f --- /dev/null +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/SaasBasicDictDao.java @@ -0,0 +1,17 @@ +package cn.axzo.tyr.server.repository; + +import cn.axzo.tyr.server.repository.entity.SaasBasicDict; +import cn.axzo.tyr.server.repository.mapper.SaasBasicDictMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * @author: chenwenjian + * @date: 2023/9/7 17:43 + * @description: + * @modifiedBy: + * @version: 1.0 + */ +@Service +public class SaasBasicDictDao extends ServiceImpl { +} diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasBasicDict.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasBasicDict.java new file mode 100644 index 00000000..b7f49644 --- /dev/null +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasBasicDict.java @@ -0,0 +1,19 @@ +package cn.axzo.tyr.server.repository.entity; + +import cn.axzo.framework.data.mybatisplus.model.BaseEntity; + +import java.io.Serializable; + +/** + * @author: chenwenjian + * @date: 2023/9/7 17:39 + * @description: + * @modifiedBy: + * @version: 1.0 + */ +public class SaasBasicDict extends BaseEntity implements Serializable { + + private static final long serialVersionUID = 100L; + + +} diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/package-info.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/package-info.java deleted file mode 100644 index f2633475..00000000 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.axzo.tyr.server.repository.entity; \ No newline at end of file diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/mapper/SaasBasicDictMapper.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/mapper/SaasBasicDictMapper.java new file mode 100644 index 00000000..82260d7c --- /dev/null +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/mapper/SaasBasicDictMapper.java @@ -0,0 +1,16 @@ +package cn.axzo.tyr.server.repository.mapper; + +import cn.axzo.tyr.server.repository.entity.SaasBasicDict; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author: chenwenjian + * @date: 2023/9/7 17:41 + * @description: + * @modifiedBy: + * @version: 1.0 + */ +@Mapper +public interface SaasBasicDictMapper extends BaseMapper { +} diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasBasicDictService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasBasicDictService.java new file mode 100644 index 00000000..ae497d5b --- /dev/null +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasBasicDictService.java @@ -0,0 +1,11 @@ +package cn.axzo.tyr.server.service; + +/** + * @author: chenwenjian + * @date: 2023/9/7 17:54 + * @description: + * @modifiedBy: + * @version: 1.0 + */ +public interface SaasBasicDictService { +} diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/converter/EntityConverter.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/converter/EntityConverter.java deleted file mode 100644 index 1dd728f1..00000000 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/converter/EntityConverter.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.axzo.tyr.server.service.converter; - -import java.util.List; - -/** - * @Author: liyong.tian - * @Date: 2022/9/5 - * @Description: - */ -public interface EntityConverter{ - - V toVo(E var); - - List toVo(List var); -} diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/converter/UserConverter.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/converter/UserConverter.java deleted file mode 100644 index af7010d8..00000000 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/converter/UserConverter.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.axzo.tyr.server.service.converter; - -import cn.axzo.tyr.server.service.dto.request.user.NewUserDTO; -import cn.axzo.tyr.server.service.dto.request.user.UpdateUserDTO; -import cn.axzo.tyr.server.service.dto.response.user.UserVO; -import cn.axzo.tyr.server.repository.entity.user.User; -import org.mapstruct.Mapper; -import org.mapstruct.MappingTarget; - -import static org.mapstruct.NullValueCheckStrategy.ALWAYS; - -/** - * @Author: liyong.tian - * @Date: 2022/9/2 - * @Description: - */ -@Mapper( - componentModel = "spring", - nullValueCheckStrategy = ALWAYS -) -public interface UserConverter extends EntityConverter { - - User toEntity(NewUserDTO dto); - - void updateEntity(UpdateUserDTO dto, @MappingTarget User user); -} diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/dto/request/package-info.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/dto/request/package-info.java deleted file mode 100644 index 8f23be65..00000000 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/dto/request/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.axzo.tyr.server.service.dto.request; \ No newline at end of file diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/dto/response/package-info.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/dto/response/package-info.java deleted file mode 100644 index 28c9eaaf..00000000 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/dto/response/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.axzo.tyr.server.service.dto.response; \ No newline at end of file diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/event/package-info.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/event/package-info.java deleted file mode 100644 index 0d058404..00000000 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/event/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.axzo.tyr.server.service.event; \ No newline at end of file diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/manager/package-info.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/manager/package-info.java deleted file mode 100644 index 9270b83b..00000000 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/manager/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.axzo.tyr.server.service.manager; \ No newline at end of file diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/user/UserService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/user/UserService.java deleted file mode 100644 index 1cffffb4..00000000 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/user/UserService.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.axzo.tyr.server.service.user; - -import cn.axzo.framework.domain.page.PageQO; -import cn.axzo.framework.domain.page.PageResp; -import cn.axzo.tyr.server.service.dto.request.user.NewUserDTO; -import cn.axzo.tyr.server.service.dto.request.user.UpdateUserDTO; -import cn.axzo.tyr.server.service.dto.request.user.UserQO; -import cn.axzo.tyr.server.service.dto.request.user.UserQO1; -import cn.axzo.tyr.server.service.dto.response.user.UserVO; -import cn.azxo.framework.common.model.CommonPageResponse; - -/** - * @Author: liyong.tian - * @Date: 2022/9/2 - * @Description: - */ -public interface UserService { - UserVO create(NewUserDTO dto); - - UserVO update(Long id, UpdateUserDTO dto); - - UserVO getOne(Long id); - - void delete(Long id); - - CommonPageResponse queryByPage(UserQO userQO); - - PageResp find(UserQO1 userQo, PageQO page); -} diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/user/impl/UserServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/user/impl/UserServiceImpl.java deleted file mode 100644 index 56fae11d..00000000 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/user/impl/UserServiceImpl.java +++ /dev/null @@ -1,82 +0,0 @@ -package cn.axzo.tyr.server.service.user.impl; - -import cn.axzo.framework.domain.page.PageQO; -import cn.axzo.framework.domain.page.PageResp; -import cn.axzo.framework.domain.web.ApiException; -import cn.axzo.tyr.server.common.enums.ErrorCode; -import cn.axzo.tyr.server.service.dto.request.user.NewUserDTO; -import cn.axzo.tyr.server.service.dto.request.user.UpdateUserDTO; -import cn.axzo.tyr.server.service.dto.request.user.UserQO; -import cn.axzo.tyr.server.service.dto.request.user.UserQO1; -import cn.axzo.tyr.server.service.dto.response.user.UserVO; -import cn.axzo.tyr.server.repository.entity.user.User; -import cn.axzo.tyr.server.repository.UserDao; -import cn.axzo.tyr.server.service.user.UserService; -import cn.axzo.tyr.server.service.converter.UserConverter; -import cn.azxo.framework.common.model.CommonPageResponse; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @Author: liyong.tian - * @Date: 2022/9/2 - * @Description: - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class UserServiceImpl implements UserService { - - private final UserConverter userConverter; - - private final UserDao userDao; - - @Override - public UserVO create(NewUserDTO dto) { - User user = userConverter.toEntity(dto); - userDao.save(user); - return userConverter.toVo(user); - } - - @Override - public UserVO update(Long id, UpdateUserDTO dto) { - User user = userDao.findById(id); - if (user == null) { - throw new ApiException(ErrorCode.USER_NOT_EXISTS, id); - } - userConverter.updateEntity(dto, user); - return userConverter.toVo(user); - } - - @Override - public UserVO getOne(Long id) { - User user = userDao.findById(id); - return userConverter.toVo(user); - } - - @Override - public void delete(Long id) { - userDao.delete(id); - } - - @Override - public CommonPageResponse queryByPage(UserQO userQo) { - IPage page = userDao.queryByPage(userQo); - List userList = page.getRecords(); - if (CollectionUtils.isEmpty(userList)) { - return CommonPageResponse.zero(userQo.getPage(), userQo.getPageSize()); - } - return new CommonPageResponse<>(page.getCurrent(), page.getSize(), page.getTotal(), userConverter.toVo(page.getRecords())); - } - - @Override - public PageResp find(UserQO1 userQo, PageQO page) { - IPage userPage = userDao.find(userQo, page); - return PageResp.list(userPage, userConverter.toVo(userPage.getRecords())); - } -} diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/validator/package-info.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/validator/package-info.java deleted file mode 100644 index b4ae43f2..00000000 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/validator/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.axzo.tyr.server.service.validator; \ No newline at end of file diff --git a/tyr-server/src/test/java/cn/axzo/tyr/server/AppTest.java b/tyr-server/src/test/java/cn/axzo/tyr/server/AppTest.java deleted file mode 100644 index 7a8b5c69..00000000 --- a/tyr-server/src/test/java/cn/axzo/tyr/server/AppTest.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.axzo.tyr.server; - -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -/** - * Unit test for simple App. - */ -@RunWith(SpringRunner.class) -@SpringBootTest -public class AppTest { - -}