优化service的目录结构

jshERP-boot/src/main/java/com/jsh/erp/controller/AccountController.java

@@ -7,8 +7,8 @@ import com.jsh.erp.base.TableDataInfo;
 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.account.AccountService;
+import com.jsh.erp.service.AccountService;
-import com.jsh.erp.service.systemConfig.SystemConfigService;
+import com.jsh.erp.service.SystemConfigService;
 import com.jsh.erp.utils.BaseResponseInfo;
 import com.jsh.erp.utils.Constants;
 import com.jsh.erp.utils.ErpInfo;

jshERP-boot/src/main/java/com/jsh/erp/controller/AccountHeadController.java

@@ -7,7 +7,7 @@ import com.jsh.erp.constants.ExceptionConstants;
 import com.jsh.erp.datasource.entities.AccountHead;
 import com.jsh.erp.datasource.entities.AccountHeadVo4Body;
 import com.jsh.erp.datasource.entities.AccountHeadVo4ListEx;
-import com.jsh.erp.service.accountHead.AccountHeadService;
+import com.jsh.erp.service.AccountHeadService;
 import com.jsh.erp.utils.BaseResponseInfo;
 import com.jsh.erp.utils.Constants;
 import com.jsh.erp.utils.ErpInfo;

jshERP-boot/src/main/java/com/jsh/erp/controller/AccountItemController.java

@@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.constants.BusinessConstants;
 import com.jsh.erp.datasource.vo.AccountItemVo4List;
-import com.jsh.erp.service.accountHead.AccountHeadService;
+import com.jsh.erp.service.AccountHeadService;
-import com.jsh.erp.service.accountItem.AccountItemService;
+import com.jsh.erp.service.AccountItemService;
 import com.jsh.erp.utils.BaseResponseInfo;
 import com.jsh.erp.utils.StringUtil;
 import io.swagger.annotations.Api;
@@ -21,9 +21,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author ji sheng hua 752*718*920

jshERP-boot/src/main/java/com/jsh/erp/controller/DepotController.java

@@ -7,9 +7,9 @@ import com.jsh.erp.base.TableDataInfo;
 import com.jsh.erp.datasource.entities.Depot;
 import com.jsh.erp.datasource.entities.DepotEx;
 import com.jsh.erp.datasource.entities.MaterialInitialStock;
-import com.jsh.erp.service.depot.DepotService;
+import com.jsh.erp.service.DepotService;
-import com.jsh.erp.service.material.MaterialService;
+import com.jsh.erp.service.MaterialService;
-import com.jsh.erp.service.userBusiness.UserBusinessService;
+import com.jsh.erp.service.UserBusinessService;
 import com.jsh.erp.utils.BaseResponseInfo;
 import com.jsh.erp.utils.Constants;
 import com.jsh.erp.utils.ErpInfo;

jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java

@@ -12,11 +12,11 @@ import com.jsh.erp.datasource.vo.DepotHeadVo4InDetail;
 import com.jsh.erp.datasource.vo.DepotHeadVo4InOutMCount;
 import com.jsh.erp.datasource.vo.DepotHeadVo4List;
 import com.jsh.erp.datasource.vo.DepotHeadVo4StatementAccount;
-import com.jsh.erp.service.depot.DepotService;
+import com.jsh.erp.service.DepotService;
-import com.jsh.erp.service.depotHead.DepotHeadService;
+import com.jsh.erp.service.DepotHeadService;
-import com.jsh.erp.service.material.MaterialService;
+import com.jsh.erp.service.MaterialService;
-import com.jsh.erp.service.systemConfig.SystemConfigService;
+import com.jsh.erp.service.SystemConfigService;
-import com.jsh.erp.service.user.UserService;
+import com.jsh.erp.service.UserService;
 import com.jsh.erp.utils.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java

@@ -9,14 +9,14 @@ import com.jsh.erp.datasource.vo.DepotItemStockWarningCount;
 import com.jsh.erp.datasource.vo.DepotItemVoBatchNumberList;
 import com.jsh.erp.datasource.vo.InOutPriceVo;
 import com.jsh.erp.exception.BusinessRunTimeException;
-import com.jsh.erp.service.depot.DepotService;
+import com.jsh.erp.service.DepotService;
-import com.jsh.erp.service.depotHead.DepotHeadService;
+import com.jsh.erp.service.DepotHeadService;
-import com.jsh.erp.service.depotItem.DepotItemService;
+import com.jsh.erp.service.DepotItemService;
-import com.jsh.erp.service.material.MaterialService;
+import com.jsh.erp.service.MaterialService;
-import com.jsh.erp.service.role.RoleService;
+import com.jsh.erp.service.RoleService;
-import com.jsh.erp.service.systemConfig.SystemConfigService;
+import com.jsh.erp.service.SystemConfigService;
-import com.jsh.erp.service.unit.UnitService;
+import com.jsh.erp.service.UnitService;
-import com.jsh.erp.service.user.UserService;
+import com.jsh.erp.service.UserService;
 import com.jsh.erp.utils.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

jshERP-boot/src/main/java/com/jsh/erp/controller/FunctionController.java

@@ -8,9 +8,9 @@ import com.jsh.erp.datasource.entities.Function;
 import com.jsh.erp.datasource.entities.FunctionEx;
 import com.jsh.erp.datasource.entities.SystemConfig;
 import com.jsh.erp.datasource.entities.UserBusiness;
-import com.jsh.erp.service.functions.FunctionService;
+import com.jsh.erp.service.FunctionService;
-import com.jsh.erp.service.systemConfig.SystemConfigService;
+import com.jsh.erp.service.SystemConfigService;
-import com.jsh.erp.service.userBusiness.UserBusinessService;
+import com.jsh.erp.service.UserBusinessService;
 import com.jsh.erp.utils.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

jshERP-boot/src/main/java/com/jsh/erp/controller/InOutItemController.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.base.BaseController;
 import com.jsh.erp.base.TableDataInfo;
 import com.jsh.erp.datasource.entities.InOutItem;
-import com.jsh.erp.service.inOutItem.InOutItemService;
+import com.jsh.erp.service.InOutItemService;
 import com.jsh.erp.utils.Constants;
 import com.jsh.erp.utils.ErpInfo;
 import com.jsh.erp.utils.StringUtil;

jshERP-boot/src/main/java/com/jsh/erp/controller/LogController.java

@@ -5,7 +5,7 @@ import com.jsh.erp.base.BaseController;
 import com.jsh.erp.base.TableDataInfo;
 import com.jsh.erp.datasource.entities.Log;
 import com.jsh.erp.datasource.vo.LogVo4List;
-import com.jsh.erp.service.log.LogService;
+import com.jsh.erp.service.LogService;
 import com.jsh.erp.utils.Constants;
 import com.jsh.erp.utils.ErpInfo;
 import com.jsh.erp.utils.StringUtil;

jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialAttributeController.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.base.BaseController;
 import com.jsh.erp.base.TableDataInfo;
 import com.jsh.erp.datasource.entities.MaterialAttribute;
-import com.jsh.erp.service.materialAttribute.MaterialAttributeService;
+import com.jsh.erp.service.MaterialAttributeService;
 import com.jsh.erp.utils.Constants;
 import com.jsh.erp.utils.ErpInfo;
 import com.jsh.erp.utils.StringUtil;

jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialCategoryController.java

@@ -7,7 +7,7 @@ import com.jsh.erp.base.BaseController;
 import com.jsh.erp.base.TableDataInfo;
 import com.jsh.erp.datasource.entities.MaterialCategory;
 import com.jsh.erp.datasource.vo.TreeNode;
-import com.jsh.erp.service.materialCategory.MaterialCategoryService;
+import com.jsh.erp.service.MaterialCategoryService;
 import com.jsh.erp.utils.BaseResponseInfo;
 import com.jsh.erp.utils.Constants;
 import com.jsh.erp.utils.ErpInfo;

jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java

@@ -8,13 +8,13 @@ import com.jsh.erp.datasource.entities.Material;
 import com.jsh.erp.datasource.entities.MaterialExtend;
 import com.jsh.erp.datasource.entities.MaterialVo4Unit;
 import com.jsh.erp.datasource.entities.Unit;
-import com.jsh.erp.service.depot.DepotService;
+import com.jsh.erp.service.DepotService;
-import com.jsh.erp.service.depotItem.DepotItemService;
+import com.jsh.erp.service.DepotItemService;
-import com.jsh.erp.service.material.MaterialService;
+import com.jsh.erp.service.MaterialService;
-import com.jsh.erp.service.role.RoleService;
+import com.jsh.erp.service.RoleService;
-import com.jsh.erp.service.systemConfig.SystemConfigService;
+import com.jsh.erp.service.SystemConfigService;
-import com.jsh.erp.service.unit.UnitService;
+import com.jsh.erp.service.UnitService;
-import com.jsh.erp.service.user.UserService;
+import com.jsh.erp.service.UserService;
 import com.jsh.erp.utils.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialExtendController.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.datasource.entities.MaterialExtend;
 import com.jsh.erp.datasource.vo.MaterialExtendVo4List;
-import com.jsh.erp.service.materialExtend.MaterialExtendService;
+import com.jsh.erp.service.MaterialExtendService;
 import com.jsh.erp.utils.BaseResponseInfo;
 import com.jsh.erp.utils.ErpInfo;
 import com.jsh.erp.utils.StringUtil;

jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialPropertyController.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.base.BaseController;
 import com.jsh.erp.base.TableDataInfo;
 import com.jsh.erp.datasource.entities.MaterialProperty;
-import com.jsh.erp.service.materialProperty.MaterialPropertyService;
+import com.jsh.erp.service.MaterialPropertyService;
 import com.jsh.erp.utils.BaseResponseInfo;
 import com.jsh.erp.utils.Constants;
 import com.jsh.erp.utils.ErpInfo;

jshERP-boot/src/main/java/com/jsh/erp/controller/MsgController.java

@@ -5,7 +5,7 @@ import com.jsh.erp.base.BaseController;
 import com.jsh.erp.base.TableDataInfo;
 import com.jsh.erp.datasource.entities.Msg;
 import com.jsh.erp.datasource.entities.MsgEx;
-import com.jsh.erp.service.msg.MsgService;
+import com.jsh.erp.service.MsgService;
 import com.jsh.erp.utils.BaseResponseInfo;
 import com.jsh.erp.utils.Constants;
 import com.jsh.erp.utils.ErpInfo;

jshERP-boot/src/main/java/com/jsh/erp/controller/OrganizationController.java

@@ -6,8 +6,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.constants.BusinessConstants;
 import com.jsh.erp.datasource.entities.Organization;
 import com.jsh.erp.datasource.vo.TreeNode;
-import com.jsh.erp.service.organization.OrganizationService;
+import com.jsh.erp.service.OrganizationService;
-import com.jsh.erp.service.user.UserService;
+import com.jsh.erp.service.UserService;
 import com.jsh.erp.utils.BaseResponseInfo;
 import com.jsh.erp.utils.ErpInfo;
 import io.swagger.annotations.Api;

jshERP-boot/src/main/java/com/jsh/erp/controller/PersonController.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.base.BaseController;
 import com.jsh.erp.base.TableDataInfo;
 import com.jsh.erp.datasource.entities.Person;
-import com.jsh.erp.service.person.PersonService;
+import com.jsh.erp.service.PersonService;
 import com.jsh.erp.utils.BaseResponseInfo;
 import com.jsh.erp.utils.Constants;
 import com.jsh.erp.utils.ErpInfo;

jshERP-boot/src/main/java/com/jsh/erp/controller/PlatformConfigController.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.base.BaseController;
 import com.jsh.erp.base.TableDataInfo;
 import com.jsh.erp.datasource.entities.PlatformConfig;
-import com.jsh.erp.service.platformConfig.PlatformConfigService;
+import com.jsh.erp.service.PlatformConfigService;
 import com.jsh.erp.utils.BaseResponseInfo;
 import com.jsh.erp.utils.Constants;
 import com.jsh.erp.utils.ErpInfo;

jshERP-boot/src/main/java/com/jsh/erp/controller/PluginController.java

@@ -5,7 +5,7 @@ import com.gitee.starblues.integration.operator.PluginOperator;
 import com.gitee.starblues.integration.operator.module.PluginInfo;
 import com.jsh.erp.constants.BusinessConstants;
 import com.jsh.erp.datasource.entities.User;
-import com.jsh.erp.service.user.UserService;
+import com.jsh.erp.service.UserService;
 import com.jsh.erp.utils.BaseResponseInfo;
 import com.jsh.erp.utils.ComputerInfo;
 import com.jsh.erp.utils.StringUtil;

jshERP-boot/src/main/java/com/jsh/erp/controller/RoleController.java

@@ -6,8 +6,8 @@ import com.jsh.erp.base.BaseController;
 import com.jsh.erp.base.TableDataInfo;
 import com.jsh.erp.datasource.entities.Role;
 import com.jsh.erp.datasource.entities.RoleEx;
-import com.jsh.erp.service.role.RoleService;
+import com.jsh.erp.service.RoleService;
-import com.jsh.erp.service.userBusiness.UserBusinessService;
+import com.jsh.erp.service.UserBusinessService;
 import com.jsh.erp.utils.Constants;
 import com.jsh.erp.utils.ErpInfo;
 import com.jsh.erp.utils.StringUtil;

jshERP-boot/src/main/java/com/jsh/erp/controller/SequenceController.java

@@ -1,7 +1,6 @@
 package com.jsh.erp.controller;
 
-import com.jsh.erp.service.depotHead.DepotHeadService;
+import com.jsh.erp.service.SequenceService;
-import com.jsh.erp.service.sequence.SequenceService;
 import com.jsh.erp.utils.BaseResponseInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

jshERP-boot/src/main/java/com/jsh/erp/controller/SerialNumberController.java

@@ -3,9 +3,9 @@ package com.jsh.erp.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.datasource.entities.DepotItem;
 import com.jsh.erp.datasource.entities.SerialNumberEx;
-import com.jsh.erp.service.depotHead.DepotHeadService;
+import com.jsh.erp.service.DepotHeadService;
-import com.jsh.erp.service.depotItem.DepotItemService;
+import com.jsh.erp.service.DepotItemService;
-import com.jsh.erp.service.serialNumber.SerialNumberService;
+import com.jsh.erp.service.SerialNumberService;
 import com.jsh.erp.utils.BaseResponseInfo;
 import com.jsh.erp.utils.Tools;
 import io.swagger.annotations.Api;

jshERP-boot/src/main/java/com/jsh/erp/controller/SupplierController.java

@@ -5,10 +5,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.base.BaseController;
 import com.jsh.erp.base.TableDataInfo;
 import com.jsh.erp.datasource.entities.Supplier;
-import com.jsh.erp.service.supplier.SupplierService;
+import com.jsh.erp.service.SupplierService;
-import com.jsh.erp.service.systemConfig.SystemConfigService;
+import com.jsh.erp.service.SystemConfigService;
-import com.jsh.erp.service.user.UserService;
+import com.jsh.erp.service.UserService;
-import com.jsh.erp.service.userBusiness.UserBusinessService;
+import com.jsh.erp.service.UserBusinessService;
 import com.jsh.erp.utils.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

jshERP-boot/src/main/java/com/jsh/erp/controller/SystemConfigController.java

@@ -4,12 +4,8 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.base.BaseController;
 import com.jsh.erp.base.TableDataInfo;
-import com.jsh.erp.constants.BusinessConstants;
 import com.jsh.erp.datasource.entities.SystemConfig;
-import com.jsh.erp.service.depot.DepotService;
+import com.jsh.erp.service.SystemConfigService;
-import com.jsh.erp.service.systemConfig.SystemConfigService;
-import com.jsh.erp.service.user.UserService;
-import com.jsh.erp.service.userBusiness.UserBusinessService;
 import com.jsh.erp.utils.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -30,7 +26,6 @@ import java.awt.image.BufferedImage;
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

jshERP-boot/src/main/java/com/jsh/erp/controller/TenantController.java

@@ -5,7 +5,7 @@ import com.jsh.erp.base.BaseController;
 import com.jsh.erp.base.TableDataInfo;
 import com.jsh.erp.datasource.entities.Tenant;
 import com.jsh.erp.datasource.entities.TenantEx;
-import com.jsh.erp.service.tenant.TenantService;
+import com.jsh.erp.service.TenantService;
 import com.jsh.erp.utils.Constants;
 import com.jsh.erp.utils.ErpInfo;
 import com.jsh.erp.utils.StringUtil;

jshERP-boot/src/main/java/com/jsh/erp/controller/UnitController.java

@@ -3,9 +3,8 @@ package com.jsh.erp.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.base.BaseController;
 import com.jsh.erp.base.TableDataInfo;
-import com.jsh.erp.constants.BusinessConstants;
 import com.jsh.erp.datasource.entities.Unit;
-import com.jsh.erp.service.unit.UnitService;
+import com.jsh.erp.service.UnitService;
 import com.jsh.erp.utils.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -15,7 +14,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

jshERP-boot/src/main/java/com/jsh/erp/controller/UserBusinessController.java

@@ -2,7 +2,7 @@ package com.jsh.erp.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.datasource.entities.UserBusiness;
-import com.jsh.erp.service.userBusiness.UserBusinessService;
+import com.jsh.erp.service.UserBusinessService;
 import com.jsh.erp.utils.BaseResponseInfo;
 import com.jsh.erp.utils.ErpInfo;
 import io.swagger.annotations.Api;

jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java

@@ -13,10 +13,10 @@ import com.jsh.erp.datasource.entities.UserEx;
 import com.jsh.erp.datasource.vo.TreeNodeEx;
 import com.jsh.erp.exception.BusinessParamCheckingException;
 import com.jsh.erp.exception.BusinessRunTimeException;
-import com.jsh.erp.service.redis.RedisService;
+import com.jsh.erp.service.RedisService;
-import com.jsh.erp.service.role.RoleService;
+import com.jsh.erp.service.RoleService;
-import com.jsh.erp.service.tenant.TenantService;
+import com.jsh.erp.service.TenantService;
-import com.jsh.erp.service.user.UserService;
+import com.jsh.erp.service.UserService;
 import com.jsh.erp.utils.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

jshERP-boot/src/main/java/com/jsh/erp/filter/LogCostFilter.java

@@ -1,6 +1,6 @@
 package com.jsh.erp.filter;
 
-import com.jsh.erp.service.redis.RedisService;
+import com.jsh.erp.service.RedisService;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;

jshERP-boot/src/main/java/com/jsh/erp/service/AccountHeadService.java

@@ -1,4 +1,4 @@
-package com.jsh.erp.service.accountHead;
+package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -11,12 +11,6 @@ import com.jsh.erp.datasource.mappers.AccountItemMapperEx;
 import com.jsh.erp.datasource.mappers.AccountMapper;
 import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.exception.JshException;
-import com.jsh.erp.service.accountItem.AccountItemService;
-import com.jsh.erp.service.log.LogService;
-import com.jsh.erp.service.orgaUserRel.OrgaUserRelService;
-import com.jsh.erp.service.supplier.SupplierService;
-import com.jsh.erp.service.systemConfig.SystemConfigService;
-import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.PageUtils;
 import com.jsh.erp.utils.StringUtil;
 import com.jsh.erp.utils.Tools;

jshERP-boot/src/main/java/com/jsh/erp/service/AccountItemService.java

@@ -1,4 +1,4 @@
-package com.jsh.erp.service.accountItem;
+package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -6,17 +6,12 @@ import com.jsh.erp.constants.BusinessConstants;
 import com.jsh.erp.constants.ExceptionConstants;
 import com.jsh.erp.datasource.entities.AccountItem;
 import com.jsh.erp.datasource.entities.AccountItemExample;
-import com.jsh.erp.datasource.entities.DepotHead;
 import com.jsh.erp.datasource.entities.User;
 import com.jsh.erp.datasource.mappers.AccountItemMapper;
 import com.jsh.erp.datasource.mappers.AccountItemMapperEx;
 import com.jsh.erp.datasource.vo.AccountItemVo4List;
 import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.exception.JshException;
-import com.jsh.erp.service.depotHead.DepotHeadService;
-import com.jsh.erp.service.log.LogService;
-import com.jsh.erp.service.user.UserService;
-import com.jsh.erp.utils.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -27,7 +22,6 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 

jshERP-boot/src/main/java/com/jsh/erp/service/AccountService.java

@@ -1,4 +1,4 @@
-package com.jsh.erp.service.account;
+package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.base.PageDomain;
@@ -11,9 +11,6 @@ import com.jsh.erp.datasource.vo.AccountVo4InOutList;
 import com.jsh.erp.datasource.vo.AccountVo4List;
 import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.exception.JshException;
-import com.jsh.erp.service.log.LogService;
-import com.jsh.erp.service.systemConfig.SystemConfigService;
-import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.PageUtils;
 import com.jsh.erp.utils.StringUtil;
 import com.jsh.erp.utils.Tools;

jshERP-boot/src/main/java/com/jsh/erp/service/DepotItemService.java

@@ -1,4 +1,4 @@
-package com.jsh.erp.service.depotItem;
+package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -12,15 +12,6 @@ import com.jsh.erp.datasource.vo.DepotItemVoBatchNumberList;
 import com.jsh.erp.datasource.vo.InOutPriceVo;
 import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.exception.JshException;
-import com.jsh.erp.service.depot.DepotService;
-import com.jsh.erp.service.depotHead.DepotHeadService;
-import com.jsh.erp.service.log.LogService;
-import com.jsh.erp.service.material.MaterialService;
-import com.jsh.erp.service.materialExtend.MaterialExtendService;
-import com.jsh.erp.service.serialNumber.SerialNumberService;
-import com.jsh.erp.service.systemConfig.SystemConfigService;
-import com.jsh.erp.service.unit.UnitService;
-import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.StringUtil;
 import com.jsh.erp.utils.Tools;
 import org.slf4j.Logger;

jshERP-boot/src/main/java/com/jsh/erp/service/DepotService.java

@@ -1,4 +1,4 @@
-package com.jsh.erp.service.depot;
+package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -8,10 +8,6 @@ import com.jsh.erp.datasource.entities.*;
 import com.jsh.erp.datasource.mappers.*;
 import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.exception.JshException;
-import com.jsh.erp.service.log.LogService;
-import com.jsh.erp.service.systemConfig.SystemConfigService;
-import com.jsh.erp.service.user.UserService;
-import com.jsh.erp.service.userBusiness.UserBusinessService;
 import com.jsh.erp.utils.PageUtils;
 import com.jsh.erp.utils.StringUtil;
 import org.slf4j.Logger;

jshERP-boot/src/main/java/com/jsh/erp/service/FunctionService.java

@@ -1,4 +1,4 @@
-package com.jsh.erp.service.functions;
+package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.constants.BusinessConstants;
@@ -9,9 +9,6 @@ import com.jsh.erp.datasource.entities.User;
 import com.jsh.erp.datasource.mappers.FunctionMapper;
 import com.jsh.erp.datasource.mappers.FunctionMapperEx;
 import com.jsh.erp.exception.JshException;
-import com.jsh.erp.service.log.LogService;
-import com.jsh.erp.service.systemConfig.SystemConfigService;
-import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.PageUtils;
 import com.jsh.erp.utils.StringUtil;
 import org.slf4j.Logger;

jshERP-boot/src/main/java/com/jsh/erp/service/InOutItemService.java

@@ -1,4 +1,4 @@
-package com.jsh.erp.service.inOutItem;
+package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.constants.BusinessConstants;
@@ -12,8 +12,6 @@ import com.jsh.erp.datasource.mappers.InOutItemMapper;
 import com.jsh.erp.datasource.mappers.InOutItemMapperEx;
 import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.exception.JshException;
-import com.jsh.erp.service.log.LogService;
-import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.PageUtils;
 import com.jsh.erp.utils.StringUtil;
 import org.slf4j.Logger;

jshERP-boot/src/main/java/com/jsh/erp/service/LogService.java

@@ -1,4 +1,4 @@
-package com.jsh.erp.service.log;
+package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.constants.BusinessConstants;
@@ -8,8 +8,6 @@ import com.jsh.erp.datasource.mappers.LogMapper;
 import com.jsh.erp.datasource.mappers.LogMapperEx;
 import com.jsh.erp.datasource.vo.LogVo4List;
 import com.jsh.erp.exception.JshException;
-import com.jsh.erp.service.redis.RedisService;
-import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.PageUtils;
 import com.jsh.erp.utils.StringUtil;
 import com.jsh.erp.utils.Tools;

jshERP-boot/src/main/java/com/jsh/erp/service/MaterialAttributeService.java

@@ -1,4 +1,4 @@
-package com.jsh.erp.service.materialAttribute;
+package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -9,7 +9,6 @@ import com.jsh.erp.datasource.mappers.MaterialAttributeMapper;
 import com.jsh.erp.datasource.mappers.MaterialAttributeMapperEx;
 import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.exception.JshException;
-import com.jsh.erp.service.log.LogService;
 import com.jsh.erp.utils.PageUtils;
 import com.jsh.erp.utils.StringUtil;
 import org.slf4j.Logger;

jshERP-boot/src/main/java/com/jsh/erp/service/MaterialCategoryService.java

@@ -1,4 +1,4 @@
-package com.jsh.erp.service.materialCategory;
+package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.constants.BusinessConstants;
@@ -13,8 +13,6 @@ import com.jsh.erp.datasource.mappers.MaterialMapperEx;
 import com.jsh.erp.datasource.vo.TreeNode;
 import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.exception.JshException;
-import com.jsh.erp.service.log.LogService;
-import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.PageUtils;
 import com.jsh.erp.utils.StringUtil;
 import org.slf4j.Logger;

jshERP-boot/src/main/java/com/jsh/erp/service/MaterialExtendService.java

@@ -1,409 +1,406 @@
-package com.jsh.erp.service.materialExtend;
+package com.jsh.erp.service;
-
+
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.jsh.erp.constants.BusinessConstants;
+import com.jsh.erp.constants.BusinessConstants;
-import com.jsh.erp.constants.ExceptionConstants;
+import com.jsh.erp.constants.ExceptionConstants;
-import com.jsh.erp.datasource.entities.MaterialExtend;
+import com.jsh.erp.datasource.entities.MaterialExtend;
-import com.jsh.erp.datasource.entities.MaterialExtendExample;
+import com.jsh.erp.datasource.entities.MaterialExtendExample;
-import com.jsh.erp.datasource.entities.User;
+import com.jsh.erp.datasource.entities.User;
-import com.jsh.erp.datasource.mappers.MaterialExtendMapper;
+import com.jsh.erp.datasource.mappers.MaterialExtendMapper;
-import com.jsh.erp.datasource.mappers.MaterialExtendMapperEx;
+import com.jsh.erp.datasource.mappers.MaterialExtendMapperEx;
-import com.jsh.erp.datasource.vo.MaterialExtendVo4List;
+import com.jsh.erp.datasource.vo.MaterialExtendVo4List;
-import com.jsh.erp.exception.BusinessRunTimeException;
+import com.jsh.erp.exception.BusinessRunTimeException;
-import com.jsh.erp.exception.JshException;
+import com.jsh.erp.exception.JshException;
-import com.jsh.erp.service.log.LogService;
+import com.jsh.erp.utils.StringUtil;
-import com.jsh.erp.service.redis.RedisService;
+import org.slf4j.Logger;
-import com.jsh.erp.service.user.UserService;
+import org.slf4j.LoggerFactory;
-import com.jsh.erp.utils.StringUtil;
+import org.springframework.stereotype.Service;
-import org.slf4j.Logger;
+import org.springframework.transaction.annotation.Transactional;
-import org.slf4j.LoggerFactory;
+import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.ServletRequestAttributes;
-import org.springframework.transaction.annotation.Transactional;
+
-import org.springframework.web.context.request.RequestContextHolder;
+import javax.annotation.Resource;
-import org.springframework.web.context.request.ServletRequestAttributes;
+import javax.servlet.http.HttpServletRequest;
-
+import java.util.ArrayList;
-import javax.annotation.Resource;
+import java.util.Date;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
-import java.util.ArrayList;
+
-import java.util.Date;
+
-import java.util.List;
+@Service
-
+public class MaterialExtendService {
-
+    private Logger logger = LoggerFactory.getLogger(MaterialExtendService.class);
-@Service
+
-public class MaterialExtendService {
+    @Resource
-    private Logger logger = LoggerFactory.getLogger(MaterialExtendService.class);
+    private MaterialExtendMapper materialExtendMapper;
-
+    @Resource
-    @Resource
+    private MaterialExtendMapperEx materialExtendMapperEx;
-    private MaterialExtendMapper materialExtendMapper;
+    @Resource
-    @Resource
+    private UserService userService;
-    private MaterialExtendMapperEx materialExtendMapperEx;
+    @Resource
-    @Resource
+    private RedisService redisService;
-    private UserService userService;
+    
-    @Resource
+    public MaterialExtend getMaterialExtend(long id)throws Exception {
-    private RedisService redisService;
+        MaterialExtend result=null;
-    
+        try{
-    public MaterialExtend getMaterialExtend(long id)throws Exception {
+            result=materialExtendMapper.selectByPrimaryKey(id);
-        MaterialExtend result=null;
+        }catch(Exception e){
-        try{
+            JshException.readFail(logger, e);
-            result=materialExtendMapper.selectByPrimaryKey(id);
+        }
-        }catch(Exception e){
+        return result;
-            JshException.readFail(logger, e);
+    }
-        }
+    public List<MaterialExtendVo4List> getDetailList(Long materialId) {
-        return result;
+        List<MaterialExtendVo4List> list=null;
-    }
+        try{
-    public List<MaterialExtendVo4List> getDetailList(Long materialId) {
+            list = materialExtendMapperEx.getDetailList(materialId);
-        List<MaterialExtendVo4List> list=null;
+        }catch(Exception e){
-        try{
+            JshException.readFail(logger, e);
-            list = materialExtendMapperEx.getDetailList(materialId);
+        }
-        }catch(Exception e){
+        return list;
-            JshException.readFail(logger, e);
+    }
-        }
+
-        return list;
+    public List<MaterialExtend> getListByMIds(List<Long> idList) {
-    }
+        List<MaterialExtend> meList = null;
-
+        try{
-    public List<MaterialExtend> getListByMIds(List<Long> idList) {
+            Long [] idArray= StringUtil.listToLongArray(idList);
-        List<MaterialExtend> meList = null;
+            if(idArray!=null && idArray.length>0) {
-        try{
+                meList = materialExtendMapperEx.getListByMId(idArray);
-            Long [] idArray= StringUtil.listToLongArray(idList);
+            }
-            if(idArray!=null && idArray.length>0) {
+        }catch(Exception e){
-                meList = materialExtendMapperEx.getListByMId(idArray);
+            JshException.readFail(logger, e);
-            }
+        }
-        }catch(Exception e){
+        return meList;
-            JshException.readFail(logger, e);
+    }
-        }
+
-        return meList;
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    }
+    public String saveDetials(JSONObject obj, String sortList, Long materialId, String type) throws Exception {
-
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+        JSONArray meArr = obj.getJSONArray("meList");
-    public String saveDetials(JSONObject obj, String sortList, Long materialId, String type) throws Exception {
+        JSONArray insertedJson = new JSONArray();
-        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        JSONArray updatedJson = new JSONArray();
-        JSONArray meArr = obj.getJSONArray("meList");
+        JSONArray deletedJson = obj.getJSONArray("meDeleteIdList");
-        JSONArray insertedJson = new JSONArray();
+        JSONArray sortJson = JSONArray.parseArray(sortList);
-        JSONArray updatedJson = new JSONArray();
+        if (null != meArr) {
-        JSONArray deletedJson = obj.getJSONArray("meDeleteIdList");
+            if("insert".equals(type)){
-        JSONArray sortJson = JSONArray.parseArray(sortList);
+                for (int i = 0; i < meArr.size(); i++) {
-        if (null != meArr) {
+                    JSONObject tempJson = meArr.getJSONObject(i);
-            if("insert".equals(type)){
+                    insertedJson.add(tempJson);
-                for (int i = 0; i < meArr.size(); i++) {
+                }
-                    JSONObject tempJson = meArr.getJSONObject(i);
+            } else if("update".equals(type)){
-                    insertedJson.add(tempJson);
+                for (int i = 0; i < meArr.size(); i++) {
-                }
+                    JSONObject tempJson = meArr.getJSONObject(i);
-            } else if("update".equals(type)){
+                    String tempId = tempJson.getString("id");
-                for (int i = 0; i < meArr.size(); i++) {
+                    if(tempId.length()>19){
-                    JSONObject tempJson = meArr.getJSONObject(i);
+                        insertedJson.add(tempJson);
-                    String tempId = tempJson.getString("id");
+                    } else {
-                    if(tempId.length()>19){
+                        updatedJson.add(tempJson);
-                        insertedJson.add(tempJson);
+                    }
-                    } else {
+                }
-                        updatedJson.add(tempJson);
+            }
-                    }
+        }
-                }
+        if (null != deletedJson) {
-            }
+            StringBuffer bf=new StringBuffer();
-        }
+            for (int i = 0; i < deletedJson.size(); i++) {
-        if (null != deletedJson) {
+                bf.append(deletedJson.getString(i));
-            StringBuffer bf=new StringBuffer();
+                if(i<(deletedJson.size()-1)){
-            for (int i = 0; i < deletedJson.size(); i++) {
+                    bf.append(",");
-                bf.append(deletedJson.getString(i));
+                }
-                if(i<(deletedJson.size()-1)){
+            }
-                    bf.append(",");
+            this.batchDeleteMaterialExtendByIds(bf.toString(), request);
-                }
+        }
-            }
+        if (null != insertedJson) {
-            this.batchDeleteMaterialExtendByIds(bf.toString(), request);
+            for (int i = 0; i < insertedJson.size(); i++) {
-        }
+                MaterialExtend materialExtend = new MaterialExtend();
-        if (null != insertedJson) {
+                JSONObject tempInsertedJson = JSONObject.parseObject(insertedJson.getString(i));
-            for (int i = 0; i < insertedJson.size(); i++) {
+                materialExtend.setMaterialId(materialId);
-                MaterialExtend materialExtend = new MaterialExtend();
+                if (StringUtils.isNotEmpty(tempInsertedJson.getString("barCode"))) {
-                JSONObject tempInsertedJson = JSONObject.parseObject(insertedJson.getString(i));
+                    int exist = checkIsBarCodeExist(0L, tempInsertedJson.getString("barCode"));
-                materialExtend.setMaterialId(materialId);
+                    if(exist>0) {
-                if (StringUtils.isNotEmpty(tempInsertedJson.getString("barCode"))) {
+                        throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_BARCODE_EXISTS_CODE,
-                    int exist = checkIsBarCodeExist(0L, tempInsertedJson.getString("barCode"));
+                                String.format(ExceptionConstants.MATERIAL_BARCODE_EXISTS_MSG,tempInsertedJson.getString("barCode")));
-                    if(exist>0) {
+                    } else {
-                        throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_BARCODE_EXISTS_CODE,
+                        materialExtend.setBarCode(tempInsertedJson.getString("barCode"));
-                                String.format(ExceptionConstants.MATERIAL_BARCODE_EXISTS_MSG,tempInsertedJson.getString("barCode")));
+                    }
-                    } else {
+                }
-                        materialExtend.setBarCode(tempInsertedJson.getString("barCode"));
+                if (StringUtils.isNotEmpty(tempInsertedJson.getString("commodityUnit"))) {
-                    }
+                    materialExtend.setCommodityUnit(tempInsertedJson.getString("commodityUnit"));
-                }
+                }
-                if (StringUtils.isNotEmpty(tempInsertedJson.getString("commodityUnit"))) {
+                if (tempInsertedJson.get("sku")!=null) {
-                    materialExtend.setCommodityUnit(tempInsertedJson.getString("commodityUnit"));
+                    materialExtend.setSku(tempInsertedJson.getString("sku"));
-                }
+                }
-                if (tempInsertedJson.get("sku")!=null) {
+                if (StringUtils.isNotEmpty(tempInsertedJson.getString("purchaseDecimal"))) {
-                    materialExtend.setSku(tempInsertedJson.getString("sku"));
+                    materialExtend.setPurchaseDecimal(tempInsertedJson.getBigDecimal("purchaseDecimal"));
-                }
+                }
-                if (StringUtils.isNotEmpty(tempInsertedJson.getString("purchaseDecimal"))) {
+                if (StringUtils.isNotEmpty(tempInsertedJson.getString("commodityDecimal"))) {
-                    materialExtend.setPurchaseDecimal(tempInsertedJson.getBigDecimal("purchaseDecimal"));
+                    materialExtend.setCommodityDecimal(tempInsertedJson.getBigDecimal("commodityDecimal"));
-                }
+                }
-                if (StringUtils.isNotEmpty(tempInsertedJson.getString("commodityDecimal"))) {
+                if (StringUtils.isNotEmpty(tempInsertedJson.getString("wholesaleDecimal"))) {
-                    materialExtend.setCommodityDecimal(tempInsertedJson.getBigDecimal("commodityDecimal"));
+                    materialExtend.setWholesaleDecimal(tempInsertedJson.getBigDecimal("wholesaleDecimal"));
-                }
+                }
-                if (StringUtils.isNotEmpty(tempInsertedJson.getString("wholesaleDecimal"))) {
+                if (StringUtils.isNotEmpty(tempInsertedJson.getString("lowDecimal"))) {
-                    materialExtend.setWholesaleDecimal(tempInsertedJson.getBigDecimal("wholesaleDecimal"));
+                    materialExtend.setLowDecimal(tempInsertedJson.getBigDecimal("lowDecimal"));
-                }
+                }
-                if (StringUtils.isNotEmpty(tempInsertedJson.getString("lowDecimal"))) {
+                this.insertMaterialExtend(materialExtend);
-                    materialExtend.setLowDecimal(tempInsertedJson.getBigDecimal("lowDecimal"));
+            }
-                }
+        }
-                this.insertMaterialExtend(materialExtend);
+        if (null != updatedJson) {
-            }
+            for (int i = 0; i < updatedJson.size(); i++) {
-        }
+                JSONObject tempUpdatedJson = JSONObject.parseObject(updatedJson.getString(i));
-        if (null != updatedJson) {
+                MaterialExtend materialExtend = new MaterialExtend();
-            for (int i = 0; i < updatedJson.size(); i++) {
+                materialExtend.setId(tempUpdatedJson.getLong("id"));
-                JSONObject tempUpdatedJson = JSONObject.parseObject(updatedJson.getString(i));
+                if (StringUtils.isNotEmpty(tempUpdatedJson.getString("barCode"))) {
-                MaterialExtend materialExtend = new MaterialExtend();
+                    int exist = checkIsBarCodeExist(tempUpdatedJson.getLong("id"), tempUpdatedJson.getString("barCode"));
-                materialExtend.setId(tempUpdatedJson.getLong("id"));
+                    if(exist>0) {
-                if (StringUtils.isNotEmpty(tempUpdatedJson.getString("barCode"))) {
+                        throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_BARCODE_EXISTS_CODE,
-                    int exist = checkIsBarCodeExist(tempUpdatedJson.getLong("id"), tempUpdatedJson.getString("barCode"));
+                                String.format(ExceptionConstants.MATERIAL_BARCODE_EXISTS_MSG,tempUpdatedJson.getString("barCode")));
-                    if(exist>0) {
+                    } else {
-                        throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_BARCODE_EXISTS_CODE,
+                        materialExtend.setBarCode(tempUpdatedJson.getString("barCode"));
-                                String.format(ExceptionConstants.MATERIAL_BARCODE_EXISTS_MSG,tempUpdatedJson.getString("barCode")));
+                    }
-                    } else {
+                }
-                        materialExtend.setBarCode(tempUpdatedJson.getString("barCode"));
+                if (StringUtils.isNotEmpty(tempUpdatedJson.getString("commodityUnit"))) {
-                    }
+                    materialExtend.setCommodityUnit(tempUpdatedJson.getString("commodityUnit"));
-                }
+                }
-                if (StringUtils.isNotEmpty(tempUpdatedJson.getString("commodityUnit"))) {
+                if (tempUpdatedJson.get("sku")!=null) {
-                    materialExtend.setCommodityUnit(tempUpdatedJson.getString("commodityUnit"));
+                    materialExtend.setSku(tempUpdatedJson.getString("sku"));
-                }
+                }
-                if (tempUpdatedJson.get("sku")!=null) {
+                if (StringUtils.isNotEmpty(tempUpdatedJson.getString("purchaseDecimal"))) {
-                    materialExtend.setSku(tempUpdatedJson.getString("sku"));
+                    materialExtend.setPurchaseDecimal(tempUpdatedJson.getBigDecimal("purchaseDecimal"));
-                }
+                }
-                if (StringUtils.isNotEmpty(tempUpdatedJson.getString("purchaseDecimal"))) {
+                if (StringUtils.isNotEmpty(tempUpdatedJson.getString("commodityDecimal"))) {
-                    materialExtend.setPurchaseDecimal(tempUpdatedJson.getBigDecimal("purchaseDecimal"));
+                    materialExtend.setCommodityDecimal(tempUpdatedJson.getBigDecimal("commodityDecimal"));
-                }
+                }
-                if (StringUtils.isNotEmpty(tempUpdatedJson.getString("commodityDecimal"))) {
+                if (StringUtils.isNotEmpty(tempUpdatedJson.getString("wholesaleDecimal"))) {
-                    materialExtend.setCommodityDecimal(tempUpdatedJson.getBigDecimal("commodityDecimal"));
+                    materialExtend.setWholesaleDecimal(tempUpdatedJson.getBigDecimal("wholesaleDecimal"));
-                }
+                }
-                if (StringUtils.isNotEmpty(tempUpdatedJson.getString("wholesaleDecimal"))) {
+                if (StringUtils.isNotEmpty(tempUpdatedJson.getString("lowDecimal"))) {
-                    materialExtend.setWholesaleDecimal(tempUpdatedJson.getBigDecimal("wholesaleDecimal"));
+                    materialExtend.setLowDecimal(tempUpdatedJson.getBigDecimal("lowDecimal"));
-                }
+                }
-                if (StringUtils.isNotEmpty(tempUpdatedJson.getString("lowDecimal"))) {
+                this.updateMaterialExtend(materialExtend);
-                    materialExtend.setLowDecimal(tempUpdatedJson.getBigDecimal("lowDecimal"));
+                //如果金额为空，此处单独置空
-                }
+                materialExtendMapperEx.specialUpdatePrice(materialExtend);
-                this.updateMaterialExtend(materialExtend);
+            }
-                //如果金额为空，此处单独置空
+        }
-                materialExtendMapperEx.specialUpdatePrice(materialExtend);
+        //处理条码的排序，基本单位排第一个
-            }
+        if (null != sortJson && sortJson.size()>0) {
-        }
+            //此处为更新的逻辑
-        //处理条码的排序，基本单位排第一个
+            for (int i = 0; i < sortJson.size(); i++) {
-        if (null != sortJson && sortJson.size()>0) {
+                JSONObject tempSortJson = JSONObject.parseObject(sortJson.getString(i));
-            //此处为更新的逻辑
+                MaterialExtend materialExtend = new MaterialExtend();
-            for (int i = 0; i < sortJson.size(); i++) {
+                if(StringUtil.isExist(tempSortJson.get("id"))) {
-                JSONObject tempSortJson = JSONObject.parseObject(sortJson.getString(i));
+                    materialExtend.setId(tempSortJson.getLong("id"));
-                MaterialExtend materialExtend = new MaterialExtend();
+                }
-                if(StringUtil.isExist(tempSortJson.get("id"))) {
+                if(StringUtil.isExist(tempSortJson.get("defaultFlag"))) {
-                    materialExtend.setId(tempSortJson.getLong("id"));
+                    materialExtend.setDefaultFlag(tempSortJson.getString("defaultFlag"));
-                }
+                }
-                if(StringUtil.isExist(tempSortJson.get("defaultFlag"))) {
+                this.updateMaterialExtend(materialExtend);
-                    materialExtend.setDefaultFlag(tempSortJson.getString("defaultFlag"));
+            }
-                }
+        } else {
-                this.updateMaterialExtend(materialExtend);
+            //新增的时候将第一条记录设置为默认基本单位
-            }
+            MaterialExtendExample example = new MaterialExtendExample();
-        } else {
+            example.createCriteria().andMaterialIdEqualTo(materialId).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-            //新增的时候将第一条记录设置为默认基本单位
+            List<MaterialExtend> meList = materialExtendMapper.selectByExample(example);
-            MaterialExtendExample example = new MaterialExtendExample();
+            if(meList!=null) {
-            example.createCriteria().andMaterialIdEqualTo(materialId).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+                for(int i=0; i<meList.size(); i++) {
-            List<MaterialExtend> meList = materialExtendMapper.selectByExample(example);
+                    MaterialExtend materialExtend = new MaterialExtend();
-            if(meList!=null) {
+                    materialExtend.setId(meList.get(i).getId());
-                for(int i=0; i<meList.size(); i++) {
+                    if(i==0) {
-                    MaterialExtend materialExtend = new MaterialExtend();
+                        materialExtend.setDefaultFlag("1"); //默认
-                    materialExtend.setId(meList.get(i).getId());
+                    } else {
-                    if(i==0) {
+                        materialExtend.setDefaultFlag("0"); //非默认
-                        materialExtend.setDefaultFlag("1"); //默认
+                    }
-                    } else {
+                    this.updateMaterialExtend(materialExtend);
-                        materialExtend.setDefaultFlag("0"); //非默认
+                }
-                    }
+            }
-                    this.updateMaterialExtend(materialExtend);
+        }
-                }
+        return null;
-            }
+    }
-        }
+
-        return null;
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    }
+    public int insertMaterialExtend(MaterialExtend materialExtend)throws Exception {
-
+        User user = userService.getCurrentUser();
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+        materialExtend.setDeleteFlag(BusinessConstants.DELETE_FLAG_EXISTS);
-    public int insertMaterialExtend(MaterialExtend materialExtend)throws Exception {
+        materialExtend.setCreateTime(new Date());
-        User user = userService.getCurrentUser();
+        materialExtend.setUpdateTime(new Date().getTime());
-        materialExtend.setDeleteFlag(BusinessConstants.DELETE_FLAG_EXISTS);
+        materialExtend.setCreateSerial(user.getLoginName());
-        materialExtend.setCreateTime(new Date());
+        materialExtend.setUpdateSerial(user.getLoginName());
-        materialExtend.setUpdateTime(new Date().getTime());
+        int result =0;
-        materialExtend.setCreateSerial(user.getLoginName());
+        try{
-        materialExtend.setUpdateSerial(user.getLoginName());
+            result= materialExtendMapper.insertSelective(materialExtend);
-        int result =0;
+        }catch(Exception e){
-        try{
+            JshException.writeFail(logger, e);
-            result= materialExtendMapper.insertSelective(materialExtend);
+        }
-        }catch(Exception e){
+        return result;
-            JshException.writeFail(logger, e);
+    }
-        }
+
-        return result;
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    }
+    public int updateMaterialExtend(MaterialExtend materialExtend) throws Exception{
-
+        User user = userService.getCurrentUser();
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+        materialExtend.setUpdateTime(System.currentTimeMillis());
-    public int updateMaterialExtend(MaterialExtend materialExtend) throws Exception{
+        materialExtend.setUpdateSerial(user.getLoginName());
-        User user = userService.getCurrentUser();
+        int res =0;
-        materialExtend.setUpdateTime(System.currentTimeMillis());
+        try{
-        materialExtend.setUpdateSerial(user.getLoginName());
+            res= materialExtendMapper.updateByPrimaryKeySelective(materialExtend);
-        int res =0;
+        }catch(Exception e){
-        try{
+            JshException.writeFail(logger, e);
-            res= materialExtendMapper.updateByPrimaryKeySelective(materialExtend);
+        }
-        }catch(Exception e){
+        return res;
-            JshException.writeFail(logger, e);
+    }
-        }
+
-        return res;
+    public int checkIsBarCodeExist(Long id, String barCode)throws Exception {
-    }
+        MaterialExtendExample example = new MaterialExtendExample();
-
+        MaterialExtendExample.Criteria criteria = example.createCriteria();
-    public int checkIsBarCodeExist(Long id, String barCode)throws Exception {
+        criteria.andBarCodeEqualTo(barCode);
-        MaterialExtendExample example = new MaterialExtendExample();
+        if (id > 0) {
-        MaterialExtendExample.Criteria criteria = example.createCriteria();
+            criteria.andIdNotEqualTo(id).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        criteria.andBarCodeEqualTo(barCode);
+        } else {
-        if (id > 0) {
+            criteria.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-            criteria.andIdNotEqualTo(id).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+        }
-        } else {
+        List<MaterialExtend> list =null;
-            criteria.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+        try{
-        }
+            list = materialExtendMapper.selectByExample(example);
-        List<MaterialExtend> list =null;
+        }catch(Exception e){
-        try{
+            JshException.readFail(logger, e);
-            list = materialExtendMapper.selectByExample(example);
+        }
-        }catch(Exception e){
+        return list==null?0:list.size();
-            JshException.readFail(logger, e);
+    }
-        }
+
-        return list==null?0:list.size();
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    }
+    public int deleteMaterialExtend(Long id, HttpServletRequest request)throws Exception {
-
+        int result =0;
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+        MaterialExtend materialExtend = new MaterialExtend();
-    public int deleteMaterialExtend(Long id, HttpServletRequest request)throws Exception {
+        materialExtend.setId(id);
-        int result =0;
+        materialExtend.setDeleteFlag(BusinessConstants.DELETE_FLAG_DELETED);
-        MaterialExtend materialExtend = new MaterialExtend();
+        Long userId = Long.parseLong(redisService.getObjectFromSessionByKey(request,"userId").toString());
-        materialExtend.setId(id);
+        User user = userService.getUser(userId);
-        materialExtend.setDeleteFlag(BusinessConstants.DELETE_FLAG_DELETED);
+        materialExtend.setUpdateTime(new Date().getTime());
-        Long userId = Long.parseLong(redisService.getObjectFromSessionByKey(request,"userId").toString());
+        materialExtend.setUpdateSerial(user.getLoginName());
-        User user = userService.getUser(userId);
+        try{
-        materialExtend.setUpdateTime(new Date().getTime());
+            result= materialExtendMapper.updateByPrimaryKeySelective(materialExtend);
-        materialExtend.setUpdateSerial(user.getLoginName());
+        }catch(Exception e){
-        try{
+            JshException.writeFail(logger, e);
-            result= materialExtendMapper.updateByPrimaryKeySelective(materialExtend);
+        }
-        }catch(Exception e){
+        return result;
-            JshException.writeFail(logger, e);
+    }
-        }
+
-        return result;
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    }
+    public int batchDeleteMaterialExtendByIds(String ids, HttpServletRequest request) throws Exception{
-
+        String [] idArray=ids.split(",");
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+        int result = 0;
-    public int batchDeleteMaterialExtendByIds(String ids, HttpServletRequest request) throws Exception{
+        try{
-        String [] idArray=ids.split(",");
+            result = materialExtendMapperEx.batchDeleteMaterialExtendByIds(idArray);
-        int result = 0;
+        }catch(Exception e){
-        try{
+            JshException.writeFail(logger, e);
-            result = materialExtendMapperEx.batchDeleteMaterialExtendByIds(idArray);
+        }
-        }catch(Exception e){
+        return result;
-            JshException.writeFail(logger, e);
+    }
-        }
+
-        return result;
+    public int insertMaterialExtend(JSONObject obj, HttpServletRequest request) throws Exception{
-    }
+        MaterialExtend materialExtend = JSONObject.parseObject(obj.toJSONString(), MaterialExtend.class);
-
+        int result=0;
-    public int insertMaterialExtend(JSONObject obj, HttpServletRequest request) throws Exception{
+        try{
-        MaterialExtend materialExtend = JSONObject.parseObject(obj.toJSONString(), MaterialExtend.class);
+            result = materialExtendMapper.insertSelective(materialExtend);
-        int result=0;
+        }catch(Exception e){
-        try{
+            JshException.writeFail(logger, e);
-            result = materialExtendMapper.insertSelective(materialExtend);
+        }
-        }catch(Exception e){
+        return result;
-            JshException.writeFail(logger, e);
+    }
-        }
+
-        return result;
+    public int updateMaterialExtend(JSONObject obj, HttpServletRequest request)throws Exception {
-    }
+        MaterialExtend materialExtend = JSONObject.parseObject(obj.toJSONString(), MaterialExtend.class);
-
+        int result=0;
-    public int updateMaterialExtend(JSONObject obj, HttpServletRequest request)throws Exception {
+        try{
-        MaterialExtend materialExtend = JSONObject.parseObject(obj.toJSONString(), MaterialExtend.class);
+            result = materialExtendMapper.updateByPrimaryKeySelective(materialExtend);
-        int result=0;
+        }catch(Exception e){
-        try{
+            JshException.writeFail(logger, e);
-            result = materialExtendMapper.updateByPrimaryKeySelective(materialExtend);
+        }
-        }catch(Exception e){
+        return result;
-            JshException.writeFail(logger, e);
+    }
-        }
+
-        return result;
+    public List<MaterialExtend> getMaterialExtendByTenantAndTime(Long tenantId, Long lastTime, Long syncNum)throws Exception {
-    }
+        List<MaterialExtend> list=new ArrayList<MaterialExtend>();
-
+        try{
-    public List<MaterialExtend> getMaterialExtendByTenantAndTime(Long tenantId, Long lastTime, Long syncNum)throws Exception {
+            //先获取最大的时间戳，再查两个时间戳之间的数据，这样同步能够防止丢失数据（应为时间戳有重复）
-        List<MaterialExtend> list=new ArrayList<MaterialExtend>();
+            Long maxTime = materialExtendMapperEx.getMaxTimeByTenantAndTime(tenantId, lastTime, syncNum);
-        try{
+            if(tenantId!=null && lastTime!=null && maxTime!=null) {
-            //先获取最大的时间戳，再查两个时间戳之间的数据，这样同步能够防止丢失数据（应为时间戳有重复）
+                MaterialExtendExample example = new MaterialExtendExample();
-            Long maxTime = materialExtendMapperEx.getMaxTimeByTenantAndTime(tenantId, lastTime, syncNum);
+                example.createCriteria().andTenantIdEqualTo(tenantId)
-            if(tenantId!=null && lastTime!=null && maxTime!=null) {
+                        .andUpdateTimeGreaterThan(lastTime)
-                MaterialExtendExample example = new MaterialExtendExample();
+                        .andUpdateTimeLessThanOrEqualTo(maxTime);
-                example.createCriteria().andTenantIdEqualTo(tenantId)
+                list=materialExtendMapper.selectByExample(example);
-                        .andUpdateTimeGreaterThan(lastTime)
+            }
-                        .andUpdateTimeLessThanOrEqualTo(maxTime);
+        }catch(Exception e){
-                list=materialExtendMapper.selectByExample(example);
+            JshException.readFail(logger, e);
-            }
+        }
-        }catch(Exception e){
+        return list;
-            JshException.readFail(logger, e);
+    }
-        }
+
-        return list;
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    }
+    public Long selectIdByMaterialIdAndDefaultFlag(Long materialId, String defaultFlag) {
-
+        Long id = 0L;
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+        MaterialExtendExample example = new MaterialExtendExample();
-    public Long selectIdByMaterialIdAndDefaultFlag(Long materialId, String defaultFlag) {
+        example.createCriteria().andMaterialIdEqualTo(materialId).andDefaultFlagEqualTo(defaultFlag)
-        Long id = 0L;
+                                .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        MaterialExtendExample example = new MaterialExtendExample();
+        List<MaterialExtend> list = materialExtendMapper.selectByExample(example);
-        example.createCriteria().andMaterialIdEqualTo(materialId).andDefaultFlagEqualTo(defaultFlag)
+        if(list!=null && list.size()>0) {
-                                .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+            id = list.get(0).getId();
-        List<MaterialExtend> list = materialExtendMapper.selectByExample(example);
+        }
-        if(list!=null && list.size()>0) {
+        return id;
-            id = list.get(0).getId();
+    }
-        }
+
-        return id;
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    }
+    public Long selectIdByMaterialIdAndBarCode(Long materialId, String barCode) {
-
+        Long id = 0L;
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+        MaterialExtendExample example = new MaterialExtendExample();
-    public Long selectIdByMaterialIdAndBarCode(Long materialId, String barCode) {
+        example.createCriteria().andMaterialIdEqualTo(materialId).andBarCodeEqualTo(barCode)
-        Long id = 0L;
+                .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        MaterialExtendExample example = new MaterialExtendExample();
+        List<MaterialExtend> list = materialExtendMapper.selectByExample(example);
-        example.createCriteria().andMaterialIdEqualTo(materialId).andBarCodeEqualTo(barCode)
+        if(list!=null && list.size()>0) {
-                .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+            id = list.get(0).getId();
-        List<MaterialExtend> list = materialExtendMapper.selectByExample(example);
+        }
-        if(list!=null && list.size()>0) {
+        return id;
-            id = list.get(0).getId();
+    }
-        }
+
-        return id;
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    }
+    public List<MaterialExtend> getListByMaterialIdAndDefaultFlagAndBarCode(Long materialId, String defaultFlag, String barCode) {
-
+        MaterialExtendExample example = new MaterialExtendExample();
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+        example.createCriteria().andMaterialIdEqualTo(materialId).andDefaultFlagEqualTo(defaultFlag).andBarCodeNotEqualTo(barCode)
-    public List<MaterialExtend> getListByMaterialIdAndDefaultFlagAndBarCode(Long materialId, String defaultFlag, String barCode) {
+                .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        MaterialExtendExample example = new MaterialExtendExample();
+        return materialExtendMapper.selectByExample(example);
-        example.createCriteria().andMaterialIdEqualTo(materialId).andDefaultFlagEqualTo(defaultFlag).andBarCodeNotEqualTo(barCode)
+    }
-                .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+
-        return materialExtendMapper.selectByExample(example);
+    public MaterialExtend getInfoByBarCode(String barCode)throws Exception {
-    }
+        MaterialExtendExample example = new MaterialExtendExample();
-
+        example.createCriteria().andBarCodeEqualTo(barCode)
-    public MaterialExtend getInfoByBarCode(String barCode)throws Exception {
+                .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        MaterialExtendExample example = new MaterialExtendExample();
+        List<MaterialExtend> list = materialExtendMapper.selectByExample(example);
-        example.createCriteria().andBarCodeEqualTo(barCode)
+        if(list!=null && list.size()>0) {
-                .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+            return list.get(0);
-        List<MaterialExtend> list = materialExtendMapper.selectByExample(example);
+        } else {
-        if(list!=null && list.size()>0) {
+            return null;
-            return list.get(0);
+        }
-        } else {
+    }
-            return null;
+
-        }
+    /**
-    }
+     * 商品的副条码和数据库里面的商品条码存在重复（除自身商品之外）
-
+     * @param manyBarCode
-    /**
+     * @param barCode
-     * 商品的副条码和数据库里面的商品条码存在重复（除自身商品之外）
+     * @return
-     * @param manyBarCode
+     */
-     * @param barCode
+    public int getCountByManyBarCodeWithoutUs(String manyBarCode, String barCode) {
-     * @return
+        MaterialExtendExample example = new MaterialExtendExample();
-     */
+        example.createCriteria().andBarCodeEqualTo(manyBarCode).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-    public int getCountByManyBarCodeWithoutUs(String manyBarCode, String barCode) {
+        List<MaterialExtend> list = materialExtendMapper.selectByExample(example);
-        MaterialExtendExample example = new MaterialExtendExample();
+        if(list!=null && list.size()>0) {
-        example.createCriteria().andBarCodeEqualTo(manyBarCode).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+            for(MaterialExtend me: list) {
-        List<MaterialExtend> list = materialExtendMapper.selectByExample(example);
+                List<MaterialExtend> basicMeList = materialExtendMapperEx.getBasicInfoByMid(me.getMaterialId());
-        if(list!=null && list.size()>0) {
+                for(MaterialExtend basicMe: basicMeList) {
-            for(MaterialExtend me: list) {
+                    if(basicMe!=null && !barCode.equals(basicMe.getBarCode())) {
-                List<MaterialExtend> basicMeList = materialExtendMapperEx.getBasicInfoByMid(me.getMaterialId());
+                        return 1;
-                for(MaterialExtend basicMe: basicMeList) {
+                    }
-                    if(basicMe!=null && !barCode.equals(basicMe.getBarCode())) {
+                }
-                        return 1;
+            }
-                    }
+        }
-                }
+        return 0;
-            }
+    }
-        }
+}
-        return 0;
-    }
-}

jshERP-boot/src/main/java/com/jsh/erp/service/MaterialPropertyService.java

@@ -1,19 +1,14 @@
-package com.jsh.erp.service.materialProperty;
+package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.constants.BusinessConstants;
-import com.jsh.erp.constants.ExceptionConstants;
 import com.jsh.erp.datasource.entities.MaterialProperty;
 import com.jsh.erp.datasource.entities.MaterialPropertyExample;
 import com.jsh.erp.datasource.entities.User;
 import com.jsh.erp.datasource.mappers.MaterialPropertyMapper;
 import com.jsh.erp.datasource.mappers.MaterialPropertyMapperEx;
-import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.exception.JshException;
-import com.jsh.erp.service.log.LogService;
-import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.PageUtils;
-import com.jsh.erp.utils.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

jshERP-boot/src/main/java/com/jsh/erp/service/MaterialService.java

@@ -1,4 +1,4 @@
-package com.jsh.erp.service.material;
+package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -10,14 +10,6 @@ import com.jsh.erp.datasource.mappers.*;
 import com.jsh.erp.datasource.vo.MaterialVoSearch;
 import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.exception.JshException;
-import com.jsh.erp.service.depot.DepotService;
-import com.jsh.erp.service.depotItem.DepotItemService;
-import com.jsh.erp.service.log.LogService;
-import com.jsh.erp.service.materialCategory.MaterialCategoryService;
-import com.jsh.erp.service.materialExtend.MaterialExtendService;
-import com.jsh.erp.service.systemConfig.SystemConfigService;
-import com.jsh.erp.service.unit.UnitService;
-import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.*;
 import jxl.Sheet;
 import jxl.Workbook;

jshERP-boot/src/main/java/com/jsh/erp/service/MsgService.java

@@ -1,4 +1,4 @@
-package com.jsh.erp.service.msg;
+package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.constants.BusinessConstants;
@@ -9,11 +9,7 @@ import com.jsh.erp.datasource.entities.MsgExample;
 import com.jsh.erp.datasource.entities.User;
 import com.jsh.erp.datasource.mappers.MsgMapper;
 import com.jsh.erp.datasource.mappers.MsgMapperEx;
-import com.jsh.erp.datasource.vo.DepotHeadVo4List;
 import com.jsh.erp.exception.BusinessRunTimeException;
-import com.jsh.erp.service.depotHead.DepotHeadService;
-import com.jsh.erp.service.log.LogService;
-import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.PageUtils;
 import com.jsh.erp.utils.StringUtil;
 import com.jsh.erp.utils.Tools;

jshERP-boot/src/main/java/com/jsh/erp/service/OrgaUserRelService.java

@@ -1,18 +1,13 @@
-package com.jsh.erp.service.orgaUserRel;
+package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.constants.BusinessConstants;
-import com.jsh.erp.constants.ExceptionConstants;
 import com.jsh.erp.datasource.entities.OrgaUserRel;
 import com.jsh.erp.datasource.entities.OrgaUserRelExample;
 import com.jsh.erp.datasource.entities.User;
 import com.jsh.erp.datasource.mappers.OrgaUserRelMapper;
 import com.jsh.erp.datasource.mappers.OrgaUserRelMapperEx;
-import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.exception.JshException;
-import com.jsh.erp.service.log.LogService;
-import com.jsh.erp.service.organization.OrganizationService;
-import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

jshERP-boot/src/main/java/com/jsh/erp/service/OrganizationService.java

@@ -1,4 +1,4 @@
-package com.jsh.erp.service.organization;
+package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.constants.BusinessConstants;
@@ -11,8 +11,6 @@ import com.jsh.erp.datasource.mappers.OrganizationMapperEx;
 import com.jsh.erp.datasource.vo.TreeNode;
 import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.exception.JshException;
-import com.jsh.erp.service.log.LogService;
-import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

jshERP-boot/src/main/java/com/jsh/erp/service/PersonService.java

@@ -1,4 +1,4 @@
-package com.jsh.erp.service.person;
+package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.constants.BusinessConstants;
@@ -13,8 +13,6 @@ import com.jsh.erp.datasource.mappers.PersonMapper;
 import com.jsh.erp.datasource.mappers.PersonMapperEx;
 import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.exception.JshException;
-import com.jsh.erp.service.log.LogService;
-import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.PageUtils;
 import com.jsh.erp.utils.StringUtil;
 import org.slf4j.Logger;

jshERP-boot/src/main/java/com/jsh/erp/service/PlatformConfigService.java

@@ -1,4 +1,4 @@
-package com.jsh.erp.service.platformConfig;
+package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.constants.BusinessConstants;
@@ -7,7 +7,6 @@ import com.jsh.erp.datasource.entities.PlatformConfigExample;
 import com.jsh.erp.datasource.mappers.PlatformConfigMapper;
 import com.jsh.erp.datasource.mappers.PlatformConfigMapperEx;
 import com.jsh.erp.exception.JshException;
-import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.PageUtils;
 import com.jsh.erp.utils.StringUtil;
 import org.slf4j.Logger;

jshERP-boot/src/main/java/com/jsh/erp/service/RedisService.java

@@ -1,4 +1,4 @@
-package com.jsh.erp.service.redis;
+package com.jsh.erp.service;
 
 import com.jsh.erp.constants.BusinessConstants;
 import com.jsh.erp.utils.StringUtil;

jshERP-boot/src/main/java/com/jsh/erp/service/RoleService.java

@@ -1,4 +1,4 @@
-package com.jsh.erp.service.role;
+package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.constants.BusinessConstants;
@@ -9,8 +9,6 @@ import com.jsh.erp.datasource.entities.User;
 import com.jsh.erp.datasource.mappers.RoleMapper;
 import com.jsh.erp.datasource.mappers.RoleMapperEx;
 import com.jsh.erp.exception.JshException;
-import com.jsh.erp.service.log.LogService;
-import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.PageUtils;
 import com.jsh.erp.utils.StringUtil;
 import org.slf4j.Logger;

jshERP-boot/src/main/java/com/jsh/erp/service/SequenceService.java

@@ -1,26 +1,17 @@
-package com.jsh.erp.service.sequence;
+package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.constants.BusinessConstants;
-import com.jsh.erp.constants.ExceptionConstants;
 import com.jsh.erp.datasource.entities.*;
 import com.jsh.erp.datasource.mappers.*;
-import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.exception.JshException;
-import com.jsh.erp.service.log.LogService;
-import com.jsh.erp.service.user.UserService;
-import com.jsh.erp.utils.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**

jshERP-boot/src/main/java/com/jsh/erp/service/SerialNumberService.java

@@ -1,4 +1,4 @@
-package com.jsh.erp.service.serialNumber;
+package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.constants.BusinessConstants;
@@ -7,9 +7,6 @@ import com.jsh.erp.datasource.entities.*;
 import com.jsh.erp.datasource.mappers.*;
 import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.exception.JshException;
-import com.jsh.erp.service.log.LogService;
-import com.jsh.erp.service.material.MaterialService;
-import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

jshERP-boot/src/main/java/com/jsh/erp/service/SupplierService.java

@@ -1,4 +1,4 @@
-package com.jsh.erp.service.supplier;
+package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.constants.BusinessConstants;
@@ -8,10 +8,6 @@ import com.jsh.erp.datasource.mappers.*;
 import com.jsh.erp.datasource.vo.DepotHeadVo4StatementAccount;
 import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.exception.JshException;
-import com.jsh.erp.service.depotHead.DepotHeadService;
-import com.jsh.erp.service.log.LogService;
-import com.jsh.erp.service.user.UserService;
-import com.jsh.erp.service.userBusiness.UserBusinessService;
 import com.jsh.erp.utils.*;
 import jxl.Sheet;
 import jxl.Workbook;

jshERP-boot/src/main/java/com/jsh/erp/service/SystemConfigService.java

@@ -1,4 +1,4 @@
-package com.jsh.erp.service.systemConfig;
+package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -15,9 +15,6 @@ import com.jsh.erp.datasource.entities.User;
 import com.jsh.erp.datasource.mappers.SystemConfigMapper;
 import com.jsh.erp.datasource.mappers.SystemConfigMapperEx;
 import com.jsh.erp.exception.JshException;
-import com.jsh.erp.service.log.LogService;
-import com.jsh.erp.service.platformConfig.PlatformConfigService;
-import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

jshERP-boot/src/main/java/com/jsh/erp/service/TenantService.java

@@ -1,7 +1,6 @@
-package com.jsh.erp.service.tenant;
+package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jsh.erp.constants.BusinessConstants;
 import com.jsh.erp.datasource.entities.Tenant;
 import com.jsh.erp.datasource.entities.TenantEx;
@@ -12,8 +11,6 @@ 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.exception.JshException;
-import com.jsh.erp.service.log.LogService;
-import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.PageUtils;
 import com.jsh.erp.utils.StringUtil;
 import com.jsh.erp.utils.Tools;

jshERP-boot/src/main/java/com/jsh/erp/service/UnitService.java

@@ -1,4 +1,4 @@
-package com.jsh.erp.service.unit;
+package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.constants.BusinessConstants;
@@ -12,8 +12,6 @@ import com.jsh.erp.datasource.mappers.UnitMapper;
 import com.jsh.erp.datasource.mappers.UnitMapperEx;
 import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.exception.JshException;
-import com.jsh.erp.service.log.LogService;
-import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.PageUtils;
 import com.jsh.erp.utils.StringUtil;
 import org.slf4j.Logger;

jshERP-boot/src/main/java/com/jsh/erp/service/UserBusinessService.java

@@ -1,4 +1,4 @@
-package com.jsh.erp.service.userBusiness;
+package com.jsh.erp.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.constants.BusinessConstants;
@@ -8,8 +8,6 @@ import com.jsh.erp.datasource.entities.UserBusinessExample;
 import com.jsh.erp.datasource.mappers.UserBusinessMapper;
 import com.jsh.erp.datasource.mappers.UserBusinessMapperEx;
 import com.jsh.erp.exception.JshException;
-import com.jsh.erp.service.log.LogService;
-import com.jsh.erp.service.user.UserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

jshERP-boot/src/main/java/com/jsh/erp/service/UserService.java

@@ -1,12 +1,8 @@
-package com.jsh.erp.service.user;
+package com.jsh.erp.service;
 
 import com.jsh.erp.datasource.entities.*;
 import com.jsh.erp.datasource.mappers.TenantMapper;
 import com.jsh.erp.exception.BusinessParamCheckingException;
-import com.jsh.erp.service.functions.FunctionService;
-import com.jsh.erp.service.platformConfig.PlatformConfigService;
-import com.jsh.erp.service.redis.RedisService;
-import com.jsh.erp.service.role.RoleService;
 import com.jsh.erp.utils.*;
 import org.springframework.util.StringUtils;
 import com.alibaba.fastjson.JSONArray;
@@ -18,10 +14,6 @@ import com.jsh.erp.datasource.mappers.UserMapperEx;
 import com.jsh.erp.datasource.vo.TreeNodeEx;
 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.tenant.TenantService;
-import com.jsh.erp.service.userBusiness.UserBusinessService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;