Skip to content

Commit

Permalink
update package name
Browse files Browse the repository at this point in the history
  • Loading branch information
@Jzow
Jzow committed Aug 30, 2023
1 parent 053358d commit 70585e3
Show file tree
Hide file tree
Showing 366 changed files with 1,618 additions and 1,614 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
<goal>repackage</goal>
</goals>
<configuration>
<mainClass>com.wansensoft.erp.ErpApplication</mainClass>
<mainClass>com.wansensoft.ErpApplication</mainClass>
</configuration>
</execution>
</executions>
Expand Down
6 changes: 3 additions & 3 deletions ...va/com/wansensoft/erp/ErpApplication.java → ...n/java/com/wansensoft/ErpApplication.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.wansensoft.erp;
package com.wansensoft;

import com.wansensoft.erp.utils.ComputerInfo;
import com.wansensoft.utils.ComputerInfo;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
Expand All @@ -12,7 +12,7 @@
import java.io.IOException;

@SpringBootApplication
@MapperScan(basePackages = {"com.wansensoft.erp.datasource.mappers"})
@MapperScan(basePackages = {"com.wansensoft.datasource.mappers"})
@ServletComponentScan
@EnableScheduling
public class ErpApplication{
Expand Down
2 changes: 1 addition & 1 deletion ...wansensoft/erp/config/Swagger2Config.java → ...com/wansensoft/config/Swagger2Config.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.wansensoft.erp.config;
package com.wansensoft.config;

import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand Down
14 changes: 1 addition & 13 deletions ...m/wansensoft/erp/config/TenantConfig.java → ...a/com/wansensoft/config/TenantConfig.java
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,8 @@
package com.wansensoft.erp.config;
package com.wansensoft.config;

import com.baomidou.mybatisplus.core.parser.ISqlParser;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
import com.baomidou.mybatisplus.core.plugins.*;
import com.wansensoft.erp.utils.Tools;
import jakarta.servlet.http.HttpServletRequest;
import net.sf.jsqlparser.expression.Expression;
import net.sf.jsqlparser.expression.LongValue;
import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.reflection.MetaObject;
import org.mybatis.spring.mapper.MapperScannerConfigurer;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;

@Service
public class TenantConfig {
Expand Down
2 changes: 1 addition & 1 deletion ...soft/erp/constants/BusinessConstants.java → ...nsensoft/constants/BusinessConstants.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.wansensoft.erp.constants;
package com.wansensoft.constants;

/**
* @ClassName:BusinessConstants
Expand Down
2 changes: 1 addition & 1 deletion ...oft/erp/constants/ExceptionConstants.java → ...sensoft/constants/ExceptionConstants.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.wansensoft.erp.constants;
package com.wansensoft.constants;

import com.alibaba.fastjson.JSONObject;

Expand Down
16 changes: 8 additions & 8 deletions ...oft/erp/controller/AccountController.java → ...sensoft/controller/AccountController.java
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.wansensoft.erp.controller;
package com.wansensoft.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.wansensoft.erp.datasource.entities.Account;
import com.wansensoft.erp.datasource.vo.AccountVo4InOutList;
import com.wansensoft.erp.service.account.AccountService;
import com.wansensoft.erp.service.systemConfig.SystemConfigService;
import com.wansensoft.erp.utils.BaseResponseInfo;
import com.wansensoft.erp.utils.ErpInfo;
import com.wansensoft.erp.utils.ResponseJsonUtil;
import com.wansensoft.datasource.entities.Account;
import com.wansensoft.datasource.vo.AccountVo4InOutList;
import com.wansensoft.service.account.AccountService;
import com.wansensoft.service.systemConfig.SystemConfigService;
import com.wansensoft.utils.BaseResponseInfo;
import com.wansensoft.utils.ErpInfo;
import com.wansensoft.utils.ResponseJsonUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import jakarta.annotation.Resource;
Expand Down
18 changes: 9 additions & 9 deletions ...erp/controller/AccountHeadController.java → ...oft/controller/AccountHeadController.java
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.wansensoft.erp.controller;
package com.wansensoft.controller;

import com.alibaba.fastjson.JSONObject;
import com.wansensoft.erp.constants.ExceptionConstants;
import com.wansensoft.erp.datasource.entities.AccountHead;
import com.wansensoft.erp.datasource.entities.AccountHeadVo4Body;
import com.wansensoft.erp.datasource.entities.AccountHeadVo4ListEx;
import com.wansensoft.erp.service.accountHead.AccountHeadService;
import com.wansensoft.erp.utils.BaseResponseInfo;
import com.wansensoft.erp.utils.ErpInfo;
import com.wansensoft.erp.utils.ResponseJsonUtil;
import com.wansensoft.datasource.entities.AccountHead;
import com.wansensoft.datasource.entities.AccountHeadVo4Body;
import com.wansensoft.datasource.entities.AccountHeadVo4ListEx;
import com.wansensoft.constants.ExceptionConstants;
import com.wansensoft.service.accountHead.AccountHeadService;
import com.wansensoft.utils.BaseResponseInfo;
import com.wansensoft.utils.ErpInfo;
import com.wansensoft.utils.ResponseJsonUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
Expand Down
14 changes: 7 additions & 7 deletions ...erp/controller/AccountItemController.java → ...oft/controller/AccountItemController.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.wansensoft.erp.controller;
package com.wansensoft.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.wansensoft.erp.constants.BusinessConstants;
import com.wansensoft.erp.datasource.vo.AccountItemVo4List;
import com.wansensoft.erp.service.accountHead.AccountHeadService;
import com.wansensoft.erp.service.accountItem.AccountItemService;
import com.wansensoft.erp.utils.BaseResponseInfo;
import com.wansensoft.erp.utils.StringUtil;
import com.wansensoft.datasource.vo.AccountItemVo4List;
import com.wansensoft.constants.BusinessConstants;
import com.wansensoft.service.accountHead.AccountHeadService;
import com.wansensoft.service.accountItem.AccountItemService;
import com.wansensoft.utils.BaseResponseInfo;
import com.wansensoft.utils.StringUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
Expand Down
21 changes: 10 additions & 11 deletions ...nsoft/erp/controller/DepotController.java → ...ansensoft/controller/DepotController.java
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
package com.wansensoft.erp.controller;
package com.wansensoft.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.wansensoft.erp.datasource.entities.Depot;
import com.wansensoft.erp.datasource.entities.DepotEx;
import com.wansensoft.erp.datasource.entities.MaterialInitialStock;
import com.wansensoft.erp.service.depot.DepotService;
import com.wansensoft.erp.service.material.MaterialService;
import com.wansensoft.erp.service.userBusiness.UserBusinessService;
import com.wansensoft.erp.utils.*;
import com.wansensoft.erp.utils.BaseResponseInfo;
import com.wansensoft.erp.utils.ErpInfo;
import com.wansensoft.erp.utils.ResponseJsonUtil;
import com.wansensoft.datasource.entities.Depot;
import com.wansensoft.datasource.entities.DepotEx;
import com.wansensoft.datasource.entities.MaterialInitialStock;
import com.wansensoft.service.depot.DepotService;
import com.wansensoft.service.material.MaterialService;
import com.wansensoft.service.userBusiness.UserBusinessService;
import com.wansensoft.utils.BaseResponseInfo;
import com.wansensoft.utils.ErpInfo;
import com.wansensoft.utils.ResponseJsonUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
Expand Down
28 changes: 14 additions & 14 deletions ...t/erp/controller/DepotHeadController.java → ...nsoft/controller/DepotHeadController.java
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
package com.wansensoft.erp.controller;
package com.wansensoft.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.wansensoft.erp.constants.BusinessConstants;
import com.wansensoft.erp.constants.ExceptionConstants;
import com.wansensoft.erp.datasource.entities.DepotHead;
import com.wansensoft.erp.datasource.entities.DepotHeadVo4Body;
import com.wansensoft.erp.datasource.vo.DepotHeadVo4InDetail;
import com.wansensoft.erp.datasource.vo.DepotHeadVo4InOutMCount;
import com.wansensoft.erp.datasource.vo.DepotHeadVo4List;
import com.wansensoft.erp.datasource.vo.DepotHeadVo4StatementAccount;
import com.wansensoft.erp.service.depot.DepotService;
import com.wansensoft.erp.service.depotHead.DepotHeadService;
import com.wansensoft.erp.service.redis.RedisService;
import com.wansensoft.erp.service.systemConfig.SystemConfigService;
import com.wansensoft.erp.utils.*;
import com.wansensoft.datasource.entities.DepotHead;
import com.wansensoft.datasource.entities.DepotHeadVo4Body;
import com.wansensoft.datasource.vo.DepotHeadVo4InDetail;
import com.wansensoft.datasource.vo.DepotHeadVo4InOutMCount;
import com.wansensoft.datasource.vo.DepotHeadVo4List;
import com.wansensoft.datasource.vo.DepotHeadVo4StatementAccount;
import com.wansensoft.constants.BusinessConstants;
import com.wansensoft.constants.ExceptionConstants;
import com.wansensoft.service.depot.DepotService;
import com.wansensoft.service.depotHead.DepotHeadService;
import com.wansensoft.service.redis.RedisService;
import com.wansensoft.service.systemConfig.SystemConfigService;
import com.wansensoft.utils.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
Expand Down
36 changes: 16 additions & 20 deletions ...t/erp/controller/DepotItemController.java → ...nsoft/controller/DepotItemController.java
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,22 @@
package com.wansensoft.erp.controller;
package com.wansensoft.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.wansensoft.erp.constants.BusinessConstants;
import com.wansensoft.erp.constants.ExceptionConstants;
import com.wansensoft.erp.datasource.entities.*;
import com.wansensoft.erp.datasource.vo.DepotItemStockWarningCount;
import com.wansensoft.erp.datasource.vo.DepotItemVoBatchNumberList;
import com.wansensoft.erp.exception.BusinessRunTimeException;
import com.wansensoft.erp.service.depot.DepotService;
import com.wansensoft.erp.service.depotHead.DepotHeadService;
import com.wansensoft.erp.service.depotItem.DepotItemService;
import com.wansensoft.erp.service.material.MaterialService;
import com.wansensoft.erp.service.role.RoleService;
import com.wansensoft.erp.service.systemConfig.SystemConfigService;
import com.wansensoft.erp.service.unit.UnitService;
import com.wansensoft.erp.service.user.UserService;
import com.wansensoft.erp.utils.*;
import com.wansensoft.erp.datasource.entities.*;
import com.wansensoft.erp.utils.*;
import com.wansensoft.erp.datasource.entities.*;
import com.wansensoft.erp.utils.*;
import com.wansensoft.datasource.entities.*;
import com.wansensoft.datasource.vo.DepotItemStockWarningCount;
import com.wansensoft.datasource.vo.DepotItemVoBatchNumberList;
import com.wansensoft.constants.BusinessConstants;
import com.wansensoft.constants.ExceptionConstants;
import com.wansensoft.exception.BusinessRunTimeException;
import com.wansensoft.service.depot.DepotService;
import com.wansensoft.service.depotHead.DepotHeadService;
import com.wansensoft.service.depotItem.DepotItemService;
import com.wansensoft.service.material.MaterialService;
import com.wansensoft.service.role.RoleService;
import com.wansensoft.service.systemConfig.SystemConfigService;
import com.wansensoft.service.unit.UnitService;
import com.wansensoft.service.user.UserService;
import com.wansensoft.utils.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import jxl.Sheet;
Expand Down
24 changes: 12 additions & 12 deletions ...ft/erp/controller/FunctionController.java → ...ensoft/controller/FunctionController.java
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package com.wansensoft.erp.controller;
package com.wansensoft.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.wansensoft.erp.datasource.entities.Function;
import com.wansensoft.erp.datasource.entities.SystemConfig;
import com.wansensoft.erp.datasource.entities.UserBusiness;
import com.wansensoft.erp.service.functions.FunctionService;
import com.wansensoft.erp.service.systemConfig.SystemConfigService;
import com.wansensoft.erp.service.userBusiness.UserBusinessService;
import com.wansensoft.erp.utils.BaseResponseInfo;
import com.wansensoft.erp.utils.ErpInfo;
import com.wansensoft.erp.utils.StringUtil;
import com.wansensoft.erp.utils.Tools;
import com.wansensoft.erp.utils.*;
import com.wansensoft.datasource.entities.Function;
import com.wansensoft.datasource.entities.SystemConfig;
import com.wansensoft.datasource.entities.UserBusiness;
import com.wansensoft.service.functions.FunctionService;
import com.wansensoft.service.systemConfig.SystemConfigService;
import com.wansensoft.service.userBusiness.UserBusinessService;
import com.wansensoft.utils.BaseResponseInfo;
import com.wansensoft.utils.ErpInfo;
import com.wansensoft.utils.StringUtil;
import com.wansensoft.utils.Tools;
import com.wansensoft.utils.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
Expand Down
10 changes: 5 additions & 5 deletions ...t/erp/controller/InOutItemController.java → ...nsoft/controller/InOutItemController.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.wansensoft.erp.controller;
package com.wansensoft.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.wansensoft.erp.datasource.entities.InOutItem;
import com.wansensoft.erp.service.inOutItem.InOutItemService;
import com.wansensoft.erp.utils.ErpInfo;
import com.wansensoft.erp.utils.ResponseJsonUtil;
import com.wansensoft.datasource.entities.InOutItem;
import com.wansensoft.service.inOutItem.InOutItemService;
import com.wansensoft.utils.ErpInfo;
import com.wansensoft.utils.ResponseJsonUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
Expand Down
6 changes: 3 additions & 3 deletions ...ntroller/MaterialAttributeController.java → ...ntroller/MaterialAttributeController.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.wansensoft.erp.controller;
package com.wansensoft.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.wansensoft.erp.datasource.entities.MaterialAttribute;
import com.wansensoft.erp.service.materialAttribute.MaterialAttributeService;
import com.wansensoft.datasource.entities.MaterialAttribute;
import com.wansensoft.service.materialAttribute.MaterialAttributeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
Expand Down
14 changes: 7 additions & 7 deletions ...ontroller/MaterialCategoryController.java → ...ontroller/MaterialCategoryController.java
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.wansensoft.erp.controller;
package com.wansensoft.controller;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.wansensoft.erp.constants.ExceptionConstants;
import com.wansensoft.erp.datasource.entities.MaterialCategory;
import com.wansensoft.erp.datasource.vo.TreeNode;
import com.wansensoft.erp.exception.BusinessRunTimeException;
import com.wansensoft.erp.service.materialCategory.MaterialCategoryService;
import com.wansensoft.erp.utils.BaseResponseInfo;
import com.wansensoft.datasource.entities.MaterialCategory;
import com.wansensoft.datasource.vo.TreeNode;
import com.wansensoft.constants.ExceptionConstants;
import com.wansensoft.exception.BusinessRunTimeException;
import com.wansensoft.service.materialCategory.MaterialCategoryService;
import com.wansensoft.utils.BaseResponseInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
Expand Down
24 changes: 12 additions & 12 deletions ...ft/erp/controller/MaterialController.java → ...ensoft/controller/MaterialController.java
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package com.wansensoft.erp.controller;
package com.wansensoft.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.wansensoft.erp.datasource.entities.MaterialExtend;
import com.wansensoft.erp.datasource.entities.MaterialVo4Unit;
import com.wansensoft.erp.datasource.entities.Unit;
import com.wansensoft.erp.service.depot.DepotService;
import com.wansensoft.erp.service.depotItem.DepotItemService;
import com.wansensoft.erp.service.material.MaterialService;
import com.wansensoft.erp.service.unit.UnitService;
import com.wansensoft.erp.utils.BaseResponseInfo;
import com.wansensoft.erp.utils.ErpInfo;
import com.wansensoft.erp.utils.StringUtil;
import com.wansensoft.erp.utils.ResponseJsonUtil;
import com.wansensoft.datasource.entities.MaterialExtend;
import com.wansensoft.datasource.entities.MaterialVo4Unit;
import com.wansensoft.datasource.entities.Unit;
import com.wansensoft.service.depot.DepotService;
import com.wansensoft.service.depotItem.DepotItemService;
import com.wansensoft.service.material.MaterialService;
import com.wansensoft.service.unit.UnitService;
import com.wansensoft.utils.BaseResponseInfo;
import com.wansensoft.utils.ErpInfo;
import com.wansensoft.utils.StringUtil;
import com.wansensoft.utils.ResponseJsonUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
Expand Down
12 changes: 6 additions & 6 deletions .../controller/MaterialExtendController.java → .../controller/MaterialExtendController.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.wansensoft.erp.controller;
package com.wansensoft.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.wansensoft.erp.datasource.entities.MaterialExtend;
import com.wansensoft.erp.datasource.vo.MaterialExtendVo4List;
import com.wansensoft.erp.service.materialExtend.MaterialExtendService;
import com.wansensoft.erp.utils.BaseResponseInfo;
import com.wansensoft.erp.utils.StringUtil;
import com.wansensoft.datasource.entities.MaterialExtend;
import com.wansensoft.datasource.vo.MaterialExtendVo4List;
import com.wansensoft.service.materialExtend.MaterialExtendService;
import com.wansensoft.utils.BaseResponseInfo;
import com.wansensoft.utils.StringUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
Expand Down
8 changes: 4 additions & 4 deletions ...ontroller/MaterialPropertyController.java → ...ontroller/MaterialPropertyController.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.wansensoft.erp.controller;
package com.wansensoft.controller;

import com.wansensoft.erp.datasource.entities.MaterialProperty;
import com.wansensoft.erp.service.materialProperty.MaterialPropertyService;
import com.wansensoft.erp.utils.BaseResponseInfo;
import com.wansensoft.datasource.entities.MaterialProperty;
import com.wansensoft.service.materialProperty.MaterialPropertyService;
import com.wansensoft.utils.BaseResponseInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
Expand Down
Loading

0 comments on commit 70585e3

Please sign in to comment.