From 270c53210db53af988d0aba3bf158a4fd4125755 Mon Sep 17 00:00:00 2001 From: adiao <1819192616@qq.com> Date: Sun, 9 Apr 2023 07:32:25 +0800 Subject: [PATCH] app fix --- .../app/api/{ => ServiceApi}/UserService.java | 2 +- .../{IntegrationTool2.java => Integration.java} | 4 ++-- .../mapper/{AssetMapper.java => AssetTypeMapper.java} | 7 ++++--- app-dao/src/main/resources/mappers/AssetTypeMapper.xml | 10 ++++++++++ .../java/co/depsystem/app/service/UserServiceImpl.java | 2 +- .../co/depsystem/app/demos/web/BasicController.java | 4 ++-- .../main/java/co/depsystem/app/web/UserController.java | 2 +- 7 files changed, 21 insertions(+), 10 deletions(-) rename app-api/src/main/java/co/depsystem/app/api/{ => ServiceApi}/UserService.java (94%) rename app-api/src/main/java/co/depsystem/app/api/WebUtil/{IntegrationTool2.java => Integration.java} (79%) rename app-dao/src/main/java/co/depsystem/app/Dao/mapper/{AssetMapper.java => AssetTypeMapper.java} (50%) create mode 100644 app-dao/src/main/resources/mappers/AssetTypeMapper.xml diff --git a/app-api/src/main/java/co/depsystem/app/api/UserService.java b/app-api/src/main/java/co/depsystem/app/api/ServiceApi/UserService.java similarity index 94% rename from app-api/src/main/java/co/depsystem/app/api/UserService.java rename to app-api/src/main/java/co/depsystem/app/api/ServiceApi/UserService.java index 64e8081..f19e581 100644 --- a/app-api/src/main/java/co/depsystem/app/api/UserService.java +++ b/app-api/src/main/java/co/depsystem/app/api/ServiceApi/UserService.java @@ -1,4 +1,4 @@ -package co.depsystem.app.api; +package co.depsystem.app.api.ServiceApi; import co.depsystem.app.api.Model.UserModel; diff --git a/app-api/src/main/java/co/depsystem/app/api/WebUtil/IntegrationTool2.java b/app-api/src/main/java/co/depsystem/app/api/WebUtil/Integration.java similarity index 79% rename from app-api/src/main/java/co/depsystem/app/api/WebUtil/IntegrationTool2.java rename to app-api/src/main/java/co/depsystem/app/api/WebUtil/Integration.java index 455f26b..fb47704 100644 --- a/app-api/src/main/java/co/depsystem/app/api/WebUtil/IntegrationTool2.java +++ b/app-api/src/main/java/co/depsystem/app/api/WebUtil/Integration.java @@ -1,6 +1,6 @@ /** * @author JOJO - * @class IntegrationTool2 + * @class Integration * @date 2023/3/19 * @apiNote */ @@ -12,7 +12,7 @@ import co.depsystem.app.Demos.web.User; /** * 请求整合 */ -public class IntegrationTool2 { +public class Integration { public void IntergrationHttp(String token, User user){ } diff --git a/app-dao/src/main/java/co/depsystem/app/Dao/mapper/AssetMapper.java b/app-dao/src/main/java/co/depsystem/app/Dao/mapper/AssetTypeMapper.java similarity index 50% rename from app-dao/src/main/java/co/depsystem/app/Dao/mapper/AssetMapper.java rename to app-dao/src/main/java/co/depsystem/app/Dao/mapper/AssetTypeMapper.java index 4dcd818..90e4d5f 100644 --- a/app-dao/src/main/java/co/depsystem/app/Dao/mapper/AssetMapper.java +++ b/app-dao/src/main/java/co/depsystem/app/Dao/mapper/AssetTypeMapper.java @@ -1,15 +1,16 @@ /** * @author JOJO - * @class AssetMapper + * @class AssetTypeMapper * @date 2023/4/7 * @apiNote */ package co.depsystem.app.Dao.mapper; +import co.depsystem.app.Dao.dataobject.AssetTypeDO; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface AssetMapper { - +public interface AssetTypeMapper { + AssetTypeDO getAssetType(); } diff --git a/app-dao/src/main/resources/mappers/AssetTypeMapper.xml b/app-dao/src/main/resources/mappers/AssetTypeMapper.xml new file mode 100644 index 0000000..8a23fca --- /dev/null +++ b/app-dao/src/main/resources/mappers/AssetTypeMapper.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/app-service/src/main/java/co/depsystem/app/service/UserServiceImpl.java b/app-service/src/main/java/co/depsystem/app/service/UserServiceImpl.java index 7742518..95474db 100644 --- a/app-service/src/main/java/co/depsystem/app/service/UserServiceImpl.java +++ b/app-service/src/main/java/co/depsystem/app/service/UserServiceImpl.java @@ -7,7 +7,7 @@ import co.depsystem.app.Demos.web.User; import org.springframework.stereotype.Component; import co.depsystem.app.Dao.dataobject.UserDO; import co.depsystem.app.Dao.mapper.UserMapper; -import co.depsystem.app.api.UserService; +import co.depsystem.app.api.ServiceApi.UserService; import co.depsystem.app.api.Model.UserModel; diff --git a/app-web/src/main/java/co/depsystem/app/demos/web/BasicController.java b/app-web/src/main/java/co/depsystem/app/demos/web/BasicController.java index 9205c8e..5fad391 100644 --- a/app-web/src/main/java/co/depsystem/app/demos/web/BasicController.java +++ b/app-web/src/main/java/co/depsystem/app/demos/web/BasicController.java @@ -17,7 +17,7 @@ package co.depsystem.app.demos.web; import co.depsystem.app.Demos.web.User; -import co.depsystem.app.api.UserService; +import co.depsystem.app.api.ServiceApi.UserService; import co.depsystem.app.api.Common.ResponseResult; import co.depsystem.app.api.WebUtil.CaptchaGenerator; import org.springframework.http.HttpHeaders; @@ -25,7 +25,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import co.depsystem.app.Demos.web.User; + import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayOutputStream; diff --git a/app-web/src/main/java/co/depsystem/app/web/UserController.java b/app-web/src/main/java/co/depsystem/app/web/UserController.java index d237847..0672bb6 100644 --- a/app-web/src/main/java/co/depsystem/app/web/UserController.java +++ b/app-web/src/main/java/co/depsystem/app/web/UserController.java @@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import co.depsystem.app.api.UserService; +import co.depsystem.app.api.ServiceApi.UserService; import co.depsystem.app.api.Model.UserModel; import javax.annotation.Resource;