From f7dbf030f239db25c178e4b7ed647b3ef0e0ede2 Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Fri, 21 Feb 2025 20:25:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B4=A6=E6=88=B7=E5=92=8C?= =?UTF-8?q?=E7=A7=9F=E6=88=B7=E7=9A=84service=E7=9A=84=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jsh/erp/controller/AccountController.java | 2 +- .../main/java/com/jsh/erp/controller/TenantController.java | 2 +- .../src/main/java/com/jsh/erp/controller/UserController.java | 2 +- .../com/jsh/erp/service/{ => account}/AccountService.java | 2 +- .../java/com/jsh/erp/service/depotHead/DepotHeadService.java | 2 +- .../java/com/jsh/erp/service/{ => tenant}/TenantService.java | 4 +--- .../src/main/java/com/jsh/erp/service/user/UserService.java | 2 +- 7 files changed, 7 insertions(+), 9 deletions(-) rename jshERP-boot/src/main/java/com/jsh/erp/service/{ => account}/AccountService.java (99%) rename jshERP-boot/src/main/java/com/jsh/erp/service/{ => tenant}/TenantService.java (98%) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/AccountController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/AccountController.java index 4a0a1a9e..abeb30d7 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/AccountController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/AccountController.java @@ -8,7 +8,7 @@ import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.datasource.entities.Account; import com.jsh.erp.datasource.vo.AccountVo4InOutList; import com.jsh.erp.datasource.vo.AccountVo4List; -import com.jsh.erp.service.AccountService; +import com.jsh.erp.service.account.AccountService; import com.jsh.erp.service.systemConfig.SystemConfigService; import com.jsh.erp.utils.*; import io.swagger.annotations.Api; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/TenantController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/TenantController.java index 8984f705..dd0d8aeb 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/TenantController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/TenantController.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.datasource.entities.Tenant; import com.jsh.erp.datasource.entities.TenantEx; -import com.jsh.erp.service.TenantService; +import com.jsh.erp.service.tenant.TenantService; import com.jsh.erp.utils.Constants; import com.jsh.erp.utils.ErpInfo; import com.jsh.erp.utils.StringUtil; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java index 68560093..e071ff98 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java @@ -13,7 +13,7 @@ import com.jsh.erp.exception.BusinessParamCheckingException; import com.jsh.erp.exception.BusinessRunTimeException; import com.jsh.erp.service.redis.RedisService; import com.jsh.erp.service.role.RoleService; -import com.jsh.erp.service.TenantService; +import com.jsh.erp.service.tenant.TenantService; import com.jsh.erp.service.user.UserService; import com.jsh.erp.utils.BaseResponseInfo; import com.jsh.erp.utils.ErpInfo; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/AccountService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountService.java similarity index 99% rename from jshERP-boot/src/main/java/com/jsh/erp/service/AccountService.java rename to jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountService.java index 9a64f7cc..f028c0cf 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/AccountService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountService.java @@ -1,4 +1,4 @@ -package com.jsh.erp.service; +package com.jsh.erp.service.account; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index 3b5b3b5a..9b4ba96a 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -11,7 +11,7 @@ import com.jsh.erp.datasource.mappers.DepotItemMapperEx; import com.jsh.erp.datasource.vo.*; import com.jsh.erp.exception.BusinessRunTimeException; import com.jsh.erp.exception.JshException; -import com.jsh.erp.service.AccountService; +import com.jsh.erp.service.account.AccountService; import com.jsh.erp.service.accountHead.AccountHeadService; import com.jsh.erp.service.accountItem.AccountItemService; import com.jsh.erp.service.depot.DepotService; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/TenantService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantService.java similarity index 98% rename from jshERP-boot/src/main/java/com/jsh/erp/service/TenantService.java rename to jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantService.java index 1137ba7b..efc97d66 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/TenantService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantService.java @@ -1,4 +1,4 @@ -package com.jsh.erp.service; +package com.jsh.erp.service.tenant; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -11,7 +11,6 @@ import com.jsh.erp.datasource.mappers.TenantMapper; import com.jsh.erp.datasource.mappers.TenantMapperEx; import com.jsh.erp.datasource.mappers.UserBusinessMapperEx; import com.jsh.erp.datasource.mappers.UserMapperEx; -import com.jsh.erp.datasource.vo.AccountVo4List; import com.jsh.erp.exception.JshException; import com.jsh.erp.service.log.LogService; import com.jsh.erp.service.user.UserService; @@ -27,7 +26,6 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; import java.util.List; @Service diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java index 60cacbf3..e8b01909 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java @@ -20,7 +20,7 @@ import com.jsh.erp.exception.BusinessRunTimeException; import com.jsh.erp.exception.JshException; import com.jsh.erp.service.log.LogService; import com.jsh.erp.service.orgaUserRel.OrgaUserRelService; -import com.jsh.erp.service.TenantService; +import com.jsh.erp.service.tenant.TenantService; import com.jsh.erp.service.userBusiness.UserBusinessService; import com.jsh.erp.utils.ExceptionCodeConstants; import com.jsh.erp.utils.StringUtil;